diff options
author | Marco Paniconi <marpan@google.com> | 2019-02-27 22:45:56 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-27 22:45:56 +0000 |
commit | dfcf95162b6a1be91c771fb39f22a0116c802f41 (patch) | |
tree | 57fdbdd161108566d1984ffb78a439ce1683a165 /vp9 | |
parent | 7ff1e40a669b6ef2d239ba08467e1a09e905a396 (diff) | |
parent | 539230a07587bbc2aeac0ce6ae52d20ffb56cc9b (diff) | |
download | libvpx-dfcf95162b6a1be91c771fb39f22a0116c802f41.tar libvpx-dfcf95162b6a1be91c771fb39f22a0116c802f41.tar.gz libvpx-dfcf95162b6a1be91c771fb39f22a0116c802f41.tar.bz2 libvpx-dfcf95162b6a1be91c771fb39f22a0116c802f41.zip |
Merge "vp9-rtc: Add cyclic_refresh condition to segment reset"
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_pickmode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 554f605b4..f72059083 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1813,7 +1813,8 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, 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); |