shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Fix for denoising with SVC."

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -3174,7 +3174,8 @@

        (cpi->oxcf.pass == 0 && cpi->oxcf.rc_mode == VPX_VBR &&

         cpi->oxcf.mode == REALTIME && cpi->oxcf.speed >= 5) ||

        cpi->sf.partition_search_type == SOURCE_VAR_BASED_PARTITION ||

-       cpi->noise_estimate.enabled || cpi->sf.use_source_sad))

+       (cpi->noise_estimate.enabled && !cpi->oxcf.noise_sensitivity) ||

+       cpi->sf.use_source_sad))

     cpi->Last_Source =

         vp9_scale_if_required(cm, cpi->unscaled_last_source,

                               &cpi->scaled_last_source, (cpi->oxcf.pass == 0));