Commit 70f9a1f9 authored by Hui Su's avatar Hui Su
Browse files

Terminate decoding at invalid mode and ref frame combo

BUG=b/69488541

Change-Id: I2113bba4589f61a09d0dd07c64a522f4d0ae304b
(cherry picked from commit cccda0db727c2282375b174104294b40911d1447)
parent c9c78b50
......@@ -1914,6 +1914,12 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
read_drl_idx(ec_ctx, xd, mbmi, r);
}
if (is_compound != is_inter_compound_mode(mbmi->mode)) {
aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
"Prediction mode %d invalid with ref frame %d %d",
mbmi->mode, mbmi->ref_frame[0], mbmi->ref_frame[1]);
}
if (mbmi->mode != GLOBALMV && mbmi->mode != GLOBAL_GLOBALMV) {
for (ref = 0; ref < 1 + is_compound; ++ref) {
#if CONFIG_AMVR
......
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