From 904589ba93f88140bec280f4c7dbffa4bade3ad4 Mon Sep 17 00:00:00 2001 From: Marco Paniconi Date: Wed, 25 Jul 2018 18:23:25 +0000 Subject: [PATCH] Revert "vp9: Adjust reset segment for real-time screen-content" This reverts commit d72cd51d83947064ef6354f02b1df59d2d3f1317. Reason for revert: Doesn't seem to really remove the artifact that was the cause for this change. Reverting for now. Original change's description: > 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 TBR=marpan@google.com,builds@webmproject.org,jianj@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I83ee9fd75bfb621a4f3e9afbcc07e7c6ca5c51d6 --- vp9/encoder/vp9_pickmode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 8248d12e6..bbbd3e837 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->source_variance == 0) { + x->zero_temp_sad_source && x->source_variance == 0) { mi->segment_id = 0; vp9_init_plane_quantizers(cpi, x); } -- 2.40.0