generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CR: Don't attempt to read qindex_delta for segments CR is unaware of.

Browse Source 
Found by the remoting VideoEncoderVpxTest.Vp9LossyUnchangedFrame unit
test under asan.

Change-Id: Icac63051bf37c7355e661837b57c257d58c764fc
This commit is contained in:
Alex Converse 2015-09-14 11:43:38 -07:00
parent 48f0168e95
commit 575e81f7c9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_aq_cyclicrefresh.c
View File

@ -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 // 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 reference frame isn't the previous frame, the previous value in
// the map for this spatial location is not entirely correct. // 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( cr->last_coded_q_map[map_offset] = clamp(
cm->base_qindex + cr->qindex_delta[mbmi->segment_id], 0, MAXQ); 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( cr->last_coded_q_map[map_offset] = VPXMIN(
clamp(cm->base_qindex + cr->qindex_delta[mbmi->segment_id], clamp(cm->base_qindex + cr->qindex_delta[mbmi->segment_id],
0, MAXQ), 0, MAXQ),