LineageOS/android_external_libvpx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up writing YUV files for debug purpose.

Browse Source 
Change legacy vp8/9_write_yuv_frame to vpx_write_yuv_files.
Delete some flags that can be enabled during build.

To enable writing denoised YUV, use the following command line:
CFLAGS='-DOUTPUT_YUV_DENOISED' ./configure
--enable-vp9-temporal-denoising

For skinmap, use CFLAGS='-DOUTPUT_YUV_SKINMAP'

Change-Id: I236974ac8b3cf279d20c4dc7f6162d8b480b6528
This commit is contained in:
Jerome Jiang
2017-08-14 13:57:51 -07:00
parent 2caff16151
commit a153080b55
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp8/encoder/onyx_if.c
View File

@@ -37,6 +37,7 @@
#include "vp8/common/threading.h" #include "vp8/common/threading.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "vpx_util/vpx_write_yuv_frame.h"
#if ARCH_ARM #if ARCH_ARM
#include "vpx_ports/arm.h" #include "vpx_ports/arm.h"
#endif #endif
@@ -3902,7 +3903,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, size_t *size,
#endif #endif
#ifdef OUTPUT_YUV_SRC #ifdef OUTPUT_YUV_SRC
vp8_write_yuv_frame(yuv_file, cpi->Source); vpx_write_yuv_frame(yuv_file, cpi->Source);
#endif #endif
do { do {
@@ -4483,7 +4484,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, size_t *size,
update_reference_frames(cpi); update_reference_frames(cpi);
#ifdef OUTPUT_YUV_DENOISED #ifdef OUTPUT_YUV_DENOISED
vp8_write_yuv_frame(yuv_denoised_file, vpx_write_yuv_frame(yuv_denoised_file,
&cpi->denoiser.yv12_running_avg[INTRA_FRAME]); &cpi->denoiser.yv12_running_avg[INTRA_FRAME]);
#endif #endif
@@ -4832,7 +4833,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, size_t *size,
#endif #endif
/* DEBUG */ /* DEBUG */
/* vp8_write_yuv_frame("encoder_recon.yuv", cm->frame_to_show); */ /* vpx_write_yuv_frame("encoder_recon.yuv", cm->frame_to_show); */
} }
#if !CONFIG_REALTIME_ONLY #if !CONFIG_REALTIME_ONLY
static void Pass2Encode(VP8_COMP *cpi, size_t *size, unsigned char *dest, static void Pass2Encode(VP8_COMP *cpi, size_t *size, unsigned char *dest,

2
vp9/encoder/vp9_denoiser.c
View File

@@ -21,8 +21,6 @@
#include "vp9/encoder/vp9_denoiser.h" #include "vp9/encoder/vp9_denoiser.h"
#include "vp9/encoder/vp9_encoder.h" #include "vp9/encoder/vp9_encoder.h"
// OUTPUT_YUV_DENOISED
#ifdef OUTPUT_YUV_DENOISED #ifdef OUTPUT_YUV_DENOISED
static void make_grayscale(YV12_BUFFER_CONFIG *yuv); static void make_grayscale(YV12_BUFFER_CONFIG *yuv);
#endif #endif

5
vp9/encoder/vp9_encoder.c
View File

@@ -71,7 +71,6 @@
// mv. Choose a very high value for // mv. Choose a very high value for
// now so that HIGH_PRECISION is always // now so that HIGH_PRECISION is always
// chosen. // chosen.
// #define OUTPUT_YUV_REC
#define FRAME_SIZE_FACTOR 128 // empirical params for context model threshold #define FRAME_SIZE_FACTOR 128 // empirical params for context model threshold
#define FRAME_RATE_FACTOR 8 #define FRAME_RATE_FACTOR 8
@@ -4396,8 +4395,8 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, size_t *size,
#if CONFIG_VP9_TEMPORAL_DENOISING #if CONFIG_VP9_TEMPORAL_DENOISING
#ifdef OUTPUT_YUV_DENOISED #ifdef OUTPUT_YUV_DENOISED
if (oxcf->noise_sensitivity > 0 && denoise_svc(cpi)) { if (oxcf->noise_sensitivity > 0 && denoise_svc(cpi)) {
vp9_write_yuv_frame_420(&cpi->denoiser.running_avg_y[INTRA_FRAME], vpx_write_yuv_frame(yuv_denoised_file,
yuv_denoised_file); &cpi->denoiser.running_avg_y[INTRA_FRAME]);
} }
#endif #endif
#endif #endif

2
vpx_dsp/skin_detection.h
View File

@@ -15,8 +15,6 @@
extern "C" { extern "C" {
#endif #endif
// #define OUTPUT_YUV_SKINMAP
int vpx_skin_pixel(const int y, const int cb, const int cr, int motion); int vpx_skin_pixel(const int y, const int cb, const int cr, int motion);
#ifdef __cplusplus #ifdef __cplusplus