Commit 9923d1b6 authored by Sarah Parker's avatar Sarah Parker

Fix valgrind error caused by NONE_FRAME in ref list

This error was reintroduced by
in an attempt to fix 91eb798b
a mismatch introduced by the original bug fix at
72e2e982.

BUG=aomedia:412

Change-Id: Iffc16fe0f5f3f953b0604a7cf56433350673338c
parent ed69b09f
......@@ -1697,18 +1697,16 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
#else
zeromv[0].as_int = zeromv[1].as_int = 0;
#endif
for (ref = 0; ref < 1 + is_compound; ++ref) {
for (ref = 0; ref < 2; ++ref) {
if (rf[ref] == NONE_FRAME) continue;
lower_mv_precision(&ref_mvs[rf[ref]][0].as_mv, allow_hp);
lower_mv_precision(&ref_mvs[rf[ref]][1].as_mv, allow_hp);
}
if (ref_mvs[rf[0]][0].as_int != zeromv[0].as_int ||
ref_mvs[rf[0]][1].as_int != zeromv[0].as_int ||
(is_compound && (ref_mvs[rf[1]][0].as_int != zeromv[1].as_int ||
ref_mvs[rf[1]][1].as_int != zeromv[1].as_int)))
if (ref_mvs[rf[ref]][0].as_int != zeromv[ref].as_int ||
ref_mvs[rf[ref]][1].as_int != zeromv[ref].as_int)
inter_mode_ctx[ref_frame] &= ~(1 << ALL_ZERO_FLAG_OFFSET);
}
}
}
#if CONFIG_EXT_INTER
if (is_compound)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment