diff options
| author | Alex Converse <aconverse@google.com> | 2015-09-14 22:59:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-14 22:59:24 +0000 |
| commit | 0b762e0c0c8496f6b560b6f4727b1ee04b920141 (patch) | |
| tree | e2179e5ac96a9a5d029fa1e4dffbcf27bb5a9d9a /vp9 | |
| parent | bb581f4e831c9afd1f50cd33c38168669a72301a (diff) | |
| parent | 575e81f7c9c39ea0e5d4a61485a5f88073784dc9 (diff) | |
| download | libvpx-0b762e0c0c8496f6b560b6f4727b1ee04b920141.tar libvpx-0b762e0c0c8496f6b560b6f4727b1ee04b920141.tar.gz libvpx-0b762e0c0c8496f6b560b6f4727b1ee04b920141.tar.bz2 libvpx-0b762e0c0c8496f6b560b6f4727b1ee04b920141.zip | |
Merge "CR: Don't attempt to read qindex_delta for segments CR is unaware of."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_aq_cyclicrefresh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_aq_cyclicrefresh.c b/vp9/encoder/vp9_aq_cyclicrefresh.c index ebef1a202..625c3d060 100644 --- a/vp9/encoder/vp9_aq_cyclicrefresh.c +++ b/vp9/encoder/vp9_aq_cyclicrefresh.c @@ -232,10 +232,12 @@ void vp9_cyclic_refresh_update_segment(VP9_COMP *const cpi, // don't update the map for them. For cases where motion is non-zero or // the reference frame isn't the previous frame, the previous value in // the map for this spatial location is not entirely correct. - if (!is_inter_block(mbmi) || !skip) + if ((!is_inter_block(mbmi) || !skip) && + mbmi->segment_id <= CR_SEGMENT_ID_BOOST2) { cr->last_coded_q_map[map_offset] = clamp( cm->base_qindex + cr->qindex_delta[mbmi->segment_id], 0, MAXQ); - else if (is_inter_block(mbmi) && skip) { + } else if (is_inter_block(mbmi) && skip && + mbmi->segment_id <= CR_SEGMENT_ID_BOOST2) { cr->last_coded_q_map[map_offset] = VPXMIN( clamp(cm->base_qindex + cr->qindex_delta[mbmi->segment_id], 0, MAXQ), |