ref: dfcf95162b6a1be91c771fb39f22a0116c802f41
parent: 7ff1e40a669b6ef2d239ba08467e1a09e905a396
parent: 539230a07587bbc2aeac0ce6ae52d20ffb56cc9b
author: Marco Paniconi <marpan@google.com>
date: Wed Feb 27 17:45:56 EST 2019
Merge "vp9-rtc: Add cyclic_refresh condition to segment reset"
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1813,7 +1813,8 @@
x->source_variance =
vp9_get_sby_perpixel_variance(cpi, &x->plane[0].src, bsize);
- if (cpi->oxcf.content == VP9E_CONTENT_SCREEN && mi->segment_id > 0 &&
+ if (cpi->oxcf.content == VP9E_CONTENT_SCREEN &&
+ cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && mi->segment_id > 0 &&
x->zero_temp_sad_source && x->source_variance == 0) {
mi->segment_id = 0;
vp9_init_plane_quantizers(cpi, x);