generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Added CFLAG for outputting vp9 denoised signal"

Browse Source
This commit is contained in:
Tim Kopp
2014-06-20 07:16:08 -07:00
committed by Gerrit Code Review
parent 8a78dc4911 c9c4e13d09
commit 7820abe53c
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vp9/encoder/vp9_encoder.c
View File

@@ -64,6 +64,9 @@ void vp9_coef_tree_initialize();
// #define OUTPUT_YUV_REC // #define OUTPUT_YUV_REC
#ifdef OUTPUT_YUV_DENOISED
FILE *yuv_denoised_file;
#endif
#ifdef OUTPUT_YUV_SRC #ifdef OUTPUT_YUV_SRC
FILE *yuv_file; FILE *yuv_file;
#endif #endif
@@ -866,6 +869,9 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) {
cpi->mb.nmvsadcost_hp[1] = &cpi->mb.nmvsadcosts_hp[1][MV_MAX]; cpi->mb.nmvsadcost_hp[1] = &cpi->mb.nmvsadcosts_hp[1][MV_MAX];
cal_nmvsadcosts_hp(cpi->mb.nmvsadcost_hp); cal_nmvsadcosts_hp(cpi->mb.nmvsadcost_hp);
#ifdef OUTPUT_YUV_DENOISED
yuv_denoised_file = fopen("denoised.yuv", "ab");
#endif
#ifdef OUTPUT_YUV_SRC #ifdef OUTPUT_YUV_SRC
yuv_file = fopen("bd.yuv", "ab"); yuv_file = fopen("bd.yuv", "ab");
#endif #endif
@@ -1111,6 +1117,9 @@ void vp9_remove_compressor(VP9_COMP *cpi) {
vp9_remove_common(&cpi->common); vp9_remove_common(&cpi->common);
vpx_free(cpi); vpx_free(cpi);
#ifdef OUTPUT_YUV_DENOISED
fclose(yuv_denoised_file);
#endif
#ifdef OUTPUT_YUV_SRC #ifdef OUTPUT_YUV_SRC
fclose(yuv_file); fclose(yuv_file);
#endif #endif
@@ -1292,13 +1301,13 @@ int vp9_update_entropy(VP9_COMP * cpi, int update) {
} }
#ifdef OUTPUT_YUV_SRC #if defined(OUTPUT_YUV_SRC) || defined(OUTPUT_YUV_DENOISED)
void vp9_write_yuv_frame(YV12_BUFFER_CONFIG *s) { void vp9_write_yuv_frame(YV12_BUFFER_CONFIG *s, FILE *f) {
uint8_t *src = s->y_buffer; uint8_t *src = s->y_buffer;
int h = s->y_height; int h = s->y_height;
do { do {
fwrite(src, s->y_width, 1, yuv_file); fwrite(src, s->y_width, 1, f);
src += s->y_stride; src += s->y_stride;
} while (--h); } while (--h);
@@ -1306,7 +1315,7 @@ void vp9_write_yuv_frame(YV12_BUFFER_CONFIG *s) {
h = s->uv_height; h = s->uv_height;
do { do {
fwrite(src, s->uv_width, 1, yuv_file); fwrite(src, s->uv_width, 1, f);
src += s->uv_stride; src += s->uv_stride;
} while (--h); } while (--h);
@@ -1314,7 +1323,7 @@ void vp9_write_yuv_frame(YV12_BUFFER_CONFIG *s) {
h = s->uv_height; h = s->uv_height;
do { do {
fwrite(src, s->uv_width, 1, yuv_file); fwrite(src, s->uv_width, 1, f);
src += s->uv_stride; src += s->uv_stride;
} while (--h); } while (--h);
} }
@@ -2128,8 +2137,12 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
} }
#endif #endif
#ifdef OUTPUT_YUV_DENOISED
vp9_write_yuv_frame(&cpi->denoiser.running_avg_y[INTRA_FRAME],
yuv_denoised_file);
#endif
#ifdef OUTPUT_YUV_SRC #ifdef OUTPUT_YUV_SRC
vp9_write_yuv_frame(cpi->Source); vp9_write_yuv_frame(cpi->Source, yuv_file);
#endif #endif
set_speed_features(cpi); set_speed_features(cpi);