commit e86d886a3902e4cc3f4803093eb8ea0bcd7560e0
author Marco Paniconi <marpan@google.com> Fri Mar 11 23:24:16 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 11 23:24:16 2016 +0000
tree 3655e0e4959776aa4b40f1ea79c7c4ecf21d184b
parent 26e5014567ffa08a6486da10b0283b88b378cc27
parent 15be44a58fb6148f24f60ccb51683301dd7ecd20

Merge "vp9: Fix issue in scene/content change detection."

vp9/encoder/vp9_ratectrl.c

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 4ffbe93..06f955b 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -2056,7 +2056,7 @@
       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 &&