diff options
| author | Alex Converse <aconverse@google.com> | 2015-03-23 18:20:35 -0700 |
|---|---|---|
| committer | Alex Converse <aconverse@google.com> | 2015-03-23 18:51:00 -0700 |
| commit | 31f1563a925418fa864441f34f3ccd222a89b9f5 (patch) | |
| tree | 175977da64bbec76efaf0d125ed7439877256e4c | |
| parent | 7cc3e703940b5c659795dcb0d099d7dfbbcfe75e (diff) | |
| download | libvpx-31f1563a925418fa864441f34f3ccd222a89b9f5.tar libvpx-31f1563a925418fa864441f34f3ccd222a89b9f5.tar.gz libvpx-31f1563a925418fa864441f34f3ccd222a89b9f5.tar.bz2 libvpx-31f1563a925418fa864441f34f3ccd222a89b9f5.zip | |
A tiny cyclic refresh / active map fix.
Change-Id: I198727461455c8c198a0c892d02ed3cb1673aa50
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 9aeb9f8f7..45918ecc9 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1103,8 +1103,9 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, } else if (aq_mode == CYCLIC_REFRESH_AQ) { const uint8_t *const map = cm->seg.update_map ? cpi->segmentation_map : cm->last_frame_seg_map; - // If segment 1, use rdmult for that segment. - if (vp9_get_segment_id(cm, map, bsize, mi_row, mi_col)) + // If segment is boosted, use rdmult for that segment. + if (cyclic_refresh_segment_id_boosted( + vp9_get_segment_id(cm, map, bsize, mi_row, mi_col))) x->rdmult = vp9_cyclic_refresh_get_rdmult(cpi->cyclic_refresh); } @@ -2877,7 +2878,7 @@ static void nonrd_pick_sb_modes(VP9_COMP *cpi, mbmi->sb_type = bsize; if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled) - if (mbmi->segment_id) + if (cyclic_refresh_segment_id_boosted(mbmi->segment_id)) x->rdmult = vp9_cyclic_refresh_get_rdmult(cpi->cyclic_refresh); if (cm->frame_type == KEY_FRAME) |