vp9: Condition lighting change detection on CBR mode.

This feature is used for the CBR RTC encoding mode
at speed >= 6. This change will exclude it for VBR mode.

For speed 6 live encoding (VBR):
avgPSNR/SSIM metrics on ytlive set up by ~1% (few clips up by 2/3%).
No change in speed.

Change-Id: I1a0dd94c334f7df309ab5a48d477d7e25355b798
This commit is contained in:
Marco 2017-08-22 14:46:39 -07:00
parent 13eed991f9
commit a31461c853

View File

@ -1012,7 +1012,8 @@ static uint64_t avg_source_sad(VP9_COMP *cpi, MACROBLOCK *x, int shift,
// 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;