diff options
| author | Marco <marpan@google.com> | 2017-04-06 10:25:55 -0700 |
|---|---|---|
| committer | Marco <marpan@google.com> | 2017-04-06 11:03:04 -0700 |
| commit | 3227a9be5fe1fdf662fe397e6abddce3c702e671 (patch) | |
| tree | 1cfcf3ac7e6b07b62aaea41ce857e0670bac4394 /vp9/encoder/vp9_pickmode.c | |
| parent | c9fbb1881a1323272d9afac23a4988c6905a6322 (diff) | |
| download | libvpx-3227a9be5fe1fdf662fe397e6abddce3c702e671.tar libvpx-3227a9be5fe1fdf662fe397e6abddce3c702e671.tar.gz libvpx-3227a9be5fe1fdf662fe397e6abddce3c702e671.tar.bz2 libvpx-3227a9be5fe1fdf662fe397e6abddce3c702e671.zip | |
vp9; Move the denoising condition for speed 5.
Move the condition for effectively disabling the denoising
for speed 5 into the vp9_denoiser_denoise().
This is cleaner, and also moving the condition into vp9_denoiser_denoise
will keep the denoiser buffer updated with the current source.
This allows for more consistent behavior if speed is changed midstream.
Change-Id: Ia001f591c56e454bf724c3ae73c024badb183ef8
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index e3c718d06..db2bbe7c2 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1974,7 +1974,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, #if CONFIG_VP9_TEMPORAL_DENOISING if (cpi->oxcf.noise_sensitivity > 0 && denoise_svc_pickmode && - cpi->denoiser.denoising_level > kDenLowLow && cpi->oxcf.speed > 5) { + cpi->denoiser.denoising_level > kDenLowLow) { vp9_denoiser_update_frame_stats(mi, sse_y, this_mode, ctx); // Keep track of zero_last cost. if (ref_frame == LAST_FRAME && frame_mv[this_mode][ref_frame].as_int == 0) @@ -2178,7 +2178,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, #if CONFIG_VP9_TEMPORAL_DENOISING if (cpi->oxcf.noise_sensitivity > 0 && cpi->resize_pending == 0 && denoise_svc_pickmode && cpi->denoiser.denoising_level > kDenLowLow && - cpi->denoiser.reset == 0 && cpi->oxcf.speed > 5) { + cpi->denoiser.reset == 0) { VP9_DENOISER_DECISION decision = COPY_BLOCK; vp9_pickmode_ctx_den_update(&ctx_den, zero_last_cost_orig, ref_frame_cost, frame_mv, reuse_inter_pred, best_tx_size, |