diff options
| author | Alex Converse <aconverse@google.com> | 2015-03-24 09:43:24 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-03-24 09:43:24 -0700 |
| commit | 02697e35dcaa274affc1f1882d261df4601e5e0b (patch) | |
| tree | ead5d65c6a4af37328c29edeb183b717264575a7 | |
| parent | 8ea7bafdaa5785bb916106a5a47105828c7836ad (diff) | |
| parent | 31f1563a925418fa864441f34f3ccd222a89b9f5 (diff) | |
| download | libvpx-02697e35dcaa274affc1f1882d261df4601e5e0b.tar libvpx-02697e35dcaa274affc1f1882d261df4601e5e0b.tar.gz libvpx-02697e35dcaa274affc1f1882d261df4601e5e0b.tar.bz2 libvpx-02697e35dcaa274affc1f1882d261df4601e5e0b.zip | |
Merge "A tiny cyclic refresh / active map fix."
| -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 dc1e407d1..10a62ef69 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1105,8 +1105,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); } @@ -2879,7 +2880,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) |