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

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index 8a837a5ab5dae91449a4fec049b3cf586937f3a9..ce440b54efc0440fc088e335f4059671f37b9d37 100644 (file)
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1828,7 +1828,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data,
 
     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;
     }