From: Marco <marpan@google.com>
Date: Wed, 8 Mar 2017 01:35:45 +0000 (-0800)
Subject: vp9: Fix for denoising with SVC.
X-Git-Tag: v1.7.0~653^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45de35fc587ad38777c9f9b6bdbae11389ee599a;p=libvpx

vp9: Fix for denoising with SVC.

Fix the conditon for getting last_source when denoising is on.
This avoids unneeded scaling in the case of SVC.

No change in quality.

Change-Id: I32c1c2c9085104da51af8535716bcc4d55fb0f42
---

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index bb0ffcb67..3c926f134 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3174,7 +3174,8 @@ static void encode_without_recode_loop(VP9_COMP *cpi, size_t *size,
        (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));