Merge "VP9 denoiser bugfix in debugging code."

This commit is contained in:
Tim Kopp 2014-07-22 14:48:42 -07:00 committed by Gerrit Code Review
commit 75441e1e08

View File

@ -2226,15 +2226,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
set_speed_features(cpi);
#if CONFIG_DENOISING
#ifdef OUTPUT_YUV_DENOISED
if (cpi->oxcf.noise_sensitivity > 0) {
vp9_write_yuv_frame_420(&cpi->denoiser.running_avg_y[INTRA_FRAME],
yuv_denoised_file);
}
#endif
#endif
// Decide q and q bounds.
q = vp9_rc_pick_q_and_bounds(cpi, &bottom_index, &top_index);
@ -2250,6 +2241,16 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
encode_with_recode_loop(cpi, size, dest, q, bottom_index, top_index);
}
#if CONFIG_DENOISING
#ifdef OUTPUT_YUV_DENOISED
if (cpi->oxcf.noise_sensitivity > 0) {
vp9_write_yuv_frame_420(&cpi->denoiser.running_avg_y[INTRA_FRAME],
yuv_denoised_file);
}
#endif
#endif
// Special case code to reduce pulsing when key frames are forced at a
// fixed interval. Note the reconstruction error if it is the frame before
// the force key frame