diff options
author | Tim Kopp <tkopp@google.com> | 2014-07-22 14:48:42 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-22 14:48:42 -0700 |
commit | 75441e1e0844647b099a41cff804b3854acd3817 (patch) | |
tree | dcb6707b73413ae7b9330df0e833121b5b531606 /vp9 | |
parent | f0f428e9ba3d3ecf09916aa3b562e90e5d5eec1a (diff) | |
parent | 1fe18acb920417792a6d2dba8f185b9c508aa4dc (diff) | |
download | libvpx-75441e1e0844647b099a41cff804b3854acd3817.tar libvpx-75441e1e0844647b099a41cff804b3854acd3817.tar.gz libvpx-75441e1e0844647b099a41cff804b3854acd3817.tar.bz2 libvpx-75441e1e0844647b099a41cff804b3854acd3817.zip |
Merge "VP9 denoiser bugfix in debugging code."
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_encoder.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 1815d5da3..5c5d99408 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -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 |