ref: f781cc8a4688e1ef68cb5804335369b6081966ed
parent: 1e3a93e72e9fe9048bcff1deeb86afebdbc04921
parent: 2290898ac7d0abfcf1eaf3be147e6b419380f0eb
author: Jerome Jiang <jianj@google.com>
date: Fri Jun 30 17:55:00 EDT 2017
Merge "vp9: Adjust condition for checking intra mode."
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -2096,7 +2096,8 @@
// Perform intra prediction search, if the best SAD is above a certain
// threshold.
if (best_rdc.rdcost == INT64_MAX ||
- ((!force_skip_low_temp_var || bsize < BLOCK_32X32) &&
+ ((!force_skip_low_temp_var || bsize < BLOCK_32X32 ||
+ x->content_state_sb == kVeryHighSad) &&
perform_intra_pred && !x->skip && best_rdc.rdcost > inter_mode_thresh &&
bsize <= cpi->sf.max_intra_bsize && !x->skip_low_source_sad &&
!x->lowvar_highsumdiff)) {