ref: 0207f17144f213a52512cfd8287e26946e30d7ad
parent: 103e4e50a889376ba6c4f1db5ea52bb135d32f30
parent: a31461c853f65e5fd9c20dfdeb82b18d6590eff8
author: Marco Paniconi <marpan@google.com>
date: Tue Aug 22 18:52:05 EDT 2017
Merge "vp9: Condition lighting change detection on CBR mode."
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1012,7 +1012,8 @@
// Detect large lighting change.
if (cpi->oxcf.content != VP9E_CONTENT_SCREEN &&
- tmp_variance < (tmp_sse >> 3) && (tmp_sse - tmp_variance) > 10000)
+ cpi->oxcf.rc_mode == VPX_CBR && tmp_variance < (tmp_sse >> 3) &&
+ (tmp_sse - tmp_variance) > 10000)
x->content_state_sb = kLowVarHighSumdiff;
else if (tmp_sad > (avg_source_sad_threshold << 1))
x->content_state_sb = kVeryHighSad;