ref: 16b03220227637b52f7e702da8db1eda9664c3ae
parent: a365f3fc2b73b185bb1ad04c172472763efb027a
author: Marco Paniconi <marpan@google.com>
date: Wed Jul 25 13:51:35 EDT 2018
vp9: Modify condition for force test of intra For real-time/nonrd_pickmode: under some conditions force check of intra modes for flat blocks with motion. Reduces artifacts for screen-content mode. Change-Id: If320f41a90982b14c48d91150f59f048a62982b1
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1828,7 +1828,7 @@
if (sf->short_circuit_flat_blocks && x->source_variance == 0 &&
(frame_mv[this_mode][ref_frame].as_int != 0 ||
- (svc->spatial_layer_id == 0 && cpi->rc.re_encode_maxq_scene_change &&
+ (cpi->oxcf.content == VP9E_CONTENT_SCREEN && !svc->spatial_layer_id &&
!x->zero_temp_sad_source))) {
continue;
}