ref: a153080b5522da7cdb8040abaeeeba13c5af3ed6
parent: 2caff16151bc0450142aaab5bc44dcf7ef603e11
author: Jerome Jiang <jianj@google.com>
date: Mon Aug 14 09:57:51 EDT 2017
Clean up writing YUV files for debug purpose. 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
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -37,6 +37,7 @@
#include "vp8/common/threading.h"
#include "vpx_ports/system_state.h"
#include "vpx_ports/vpx_timer.h"
+#include "vpx_util/vpx_write_yuv_frame.h"
#if ARCH_ARM
#include "vpx_ports/arm.h"
#endif
@@ -3902,7 +3903,7 @@
#endif
#ifdef OUTPUT_YUV_SRC
- vp8_write_yuv_frame(yuv_file, cpi->Source);
+ vpx_write_yuv_frame(yuv_file, cpi->Source);
#endif
do {
@@ -4483,7 +4484,7 @@
update_reference_frames(cpi);
#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]);
#endif
@@ -4832,7 +4833,7 @@
#endif
/* 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
static void Pass2Encode(VP8_COMP *cpi, size_t *size, unsigned char *dest,
--- a/vp9/encoder/vp9_denoiser.c
+++ b/vp9/encoder/vp9_denoiser.c
@@ -21,8 +21,6 @@
#include "vp9/encoder/vp9_denoiser.h"
#include "vp9/encoder/vp9_encoder.h"
-// OUTPUT_YUV_DENOISED
-
#ifdef OUTPUT_YUV_DENOISED
static void make_grayscale(YV12_BUFFER_CONFIG *yuv);
#endif
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -71,7 +71,6 @@
// mv. Choose a very high value for
// now so that HIGH_PRECISION is always
// chosen.
-// #define OUTPUT_YUV_REC
#define FRAME_SIZE_FACTOR 128 // empirical params for context model threshold
#define FRAME_RATE_FACTOR 8
@@ -4396,8 +4395,8 @@
#if CONFIG_VP9_TEMPORAL_DENOISING
#ifdef OUTPUT_YUV_DENOISED
if (oxcf->noise_sensitivity > 0 && denoise_svc(cpi)) {
- vp9_write_yuv_frame_420(&cpi->denoiser.running_avg_y[INTRA_FRAME],
- yuv_denoised_file);
+ vpx_write_yuv_frame(yuv_denoised_file,
+ &cpi->denoiser.running_avg_y[INTRA_FRAME]);
}
#endif
#endif
--- a/vpx_dsp/skin_detection.h
+++ b/vpx_dsp/skin_detection.h
@@ -15,8 +15,6 @@
extern "C" {
#endif
-// #define OUTPUT_YUV_SKINMAP
-
int vpx_skin_pixel(const int y, const int cb, const int cr, int motion);
#ifdef __cplusplus