ref: 5d0bef4763b7e87451b4176771d344d4172960df
parent: e48dfcead1b8b2e1dcf363c7e5a14c96821d626c
parent: ac211fe23efac5fcba6d3f26953c4fa737d053ec
author: Marco Paniconi <marpan@google.com>
date: Fri Jul 28 21:46:58 EDT 2017
Merge "vp9: Adjust logic in source sad for screen content."
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1011,7 +1011,8 @@
: kHighSadHighSumdiff;
// Detect large lighting change.
- if (tmp_variance < (tmp_sse >> 3) && (tmp_sse - tmp_variance) > 10000)
+ if (cpi->oxcf.content != VP9E_CONTENT_SCREEN &&
+ 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;