From: Marco <marpan@google.com>
Date: Fri, 11 Mar 2016 20:15:27 +0000 (-0800)
Subject: vp9: Fix issue in scene/content change detection.
X-Git-Tag: v1.6.0~301^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15be44a58fb6148f24f60ccb51683301dd7ecd20;p=libvpx

vp9: Fix issue in scene/content change detection.

The change https://chromium-review.googlesource.com/#/c/329181/
also changed behavior for cbr mode, which causes some regression
in screenshare test in webrtc.

Resetting the specific change to leave the cbr behavior
unchanged for now.

Change-Id: I52df158806422f86398e1d2f522e92067d8325eb
---

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 4ffbe9307..06f955b23 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -2056,7 +2056,7 @@ void vp9_avg_source_sad(VP9_COMP *cpi) {
       rc->high_source_sad = 1;
     else
       rc->high_source_sad = 0;
-    if (avg_sad > 0)
+    if (avg_sad > 0 || cpi->oxcf.rc_mode == VPX_CBR)
       rc->avg_source_sad = (rc->avg_source_sad + avg_sad) >> 1;
     // For VBR, under scene change/high content change, force golden refresh.
     if (cpi->oxcf.rc_mode == VPX_VBR &&