wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mvc: corrected handling of incorrect bitstreams in refIdxActive parsing"

Browse source
This commit is contained in:
Treehugger Robot 2022-08-19 15:20:56 +00:00 • committed by Gerrit Code Review
commit eda6e822bd
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
decoder/mvc/imvcd_slice_functions.c
View file

@ -221,15 +221,16 @@ static WORD32 imvcd_set_ref_idx_override_flag(dec_struct_t *ps_view_ctxt)
static WORD32 imvcd_set_num_ref_idx_active(dec_struct_t *ps_view_ctxt, UWORD8 *pu1_num_ref_idx) static WORD32 imvcd_set_num_ref_idx_active(dec_struct_t *ps_view_ctxt, UWORD8 *pu1_num_ref_idx)
{ {
dec_bit_stream_t *ps_bitstrm = ps_view_ctxt->ps_bitstrm; dec_bit_stream_t *ps_bitstrm = ps_view_ctxt->ps_bitstrm;
UWORD32 u4_num_ref_idx_m1 = ih264d_uev(&ps_bitstrm->u4_ofst, ps_bitstrm->pu4_buffer);
pu1_num_ref_idx[0] = 1 + ih264d_uev(&ps_bitstrm->u4_ofst, ps_bitstrm->pu4_buffer); if(u4_num_ref_idx_m1 >= H264_MAX_REF_PICS)
if(pu1_num_ref_idx[0] > H264_MAX_REF_PICS)
{ {
return ERROR_NUM_REF; return ERROR_NUM_REF;
} }
COPYTHECONTEXT("SH: num_ref_idx_lx_active_minus1", pu1_num_ref_idx[0] - 1); pu1_num_ref_idx[0] = 1 + u4_num_ref_idx_m1;
COPYTHECONTEXT("SH: num_ref_idx_lx_active_minus1", u4_num_ref_idx_m1);
return OK; return OK;
} }