From: Marco Paniconi <marpan@google.com>
Date: Mon, 23 Jul 2018 23:24:15 +0000 (-0700)
Subject: vp9: Adjust reset segment for real-time screen-content
X-Git-Tag: v1.8.0~499^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d72cd51d83947064ef6354f02b1df59d2d3f1317;p=libvpx

vp9: Adjust reset segment for real-time screen-content

For real-time screen content mode when the short_circuit
flat_blocks feauture is enabled: reset segment to 0 for
coding block if its flat, regardless of temporal source_sad.
Reduces some artifacts on flat areas.

Change-Id: I9620e424bedc5a13f87cc4f66af7c0e86043c89c
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index bbbd3e837..8248d12e6 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1615,7 +1615,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data,
           vp9_get_sby_perpixel_variance(cpi, &x->plane[0].src, bsize);
 
     if (cpi->oxcf.content == VP9E_CONTENT_SCREEN && mi->segment_id > 0 &&
-        x->zero_temp_sad_source && x->source_variance == 0) {
+        x->source_variance == 0) {
       mi->segment_id = 0;
       vp9_init_plane_quantizers(cpi, x);
     }