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

Merge "Decoder: Add missing error checks for parsing sps or pps" into qt-dev

Browse source
This commit is contained in:
TreeHugger Robot 2019-05-04 19:37:30 +00:00 • committed by Android (Google) Code Review
commit a09be99800
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
decoder/ih264d_api.c
View file

@ -2432,16 +2432,10 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
} }
//Report if header (sps and pps) has not been decoded yet //Report if header (sps and pps) has not been decoded yet
if(ps_dec->i4_header_decoded != 3)
{
ps_dec_op->u4_error_code |= (1 << IVD_INSUFFICIENTDATA);
}
if(ps_dec->i4_decode_header == 1 && ps_dec->i4_header_decoded != 3) if(ps_dec->i4_decode_header == 1 && ps_dec->i4_header_decoded != 3)
{ {
ps_dec_op->u4_error_code |= (1 << IVD_INSUFFICIENTDATA); ps_dec_op->u4_error_code |= (1 << IVD_INSUFFICIENTDATA);
api_ret_value = IV_FAIL;
} }
if(ps_dec->u4_prev_nal_skipped) if(ps_dec->u4_prev_nal_skipped)
{ {

6
decoder/ih264d_parse_headers.c
View file

@ -205,6 +205,9 @@ WORD32 ih264d_parse_pps(dec_struct_t * ps_dec, dec_bit_stream_t * ps_bitstrm)
UWORD8 u1_more_data_flag; UWORD8 u1_more_data_flag;
WORD32 i4_i; WORD32 i4_i;
if(!(ps_dec->i4_header_decoded & 1))
return ERROR_INV_SPS_PPS_T;
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
/* Decode pic_parameter_set_id and find corresponding pic params */ /* Decode pic_parameter_set_id and find corresponding pic params */
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
@ -230,6 +233,9 @@ WORD32 ih264d_parse_pps(dec_struct_t * ps_dec, dec_bit_stream_t * ps_bitstrm)
return ERROR_INV_SPS_PPS_T; return ERROR_INV_SPS_PPS_T;
COPYTHECONTEXT("PPS: seq_parameter_set_id",u4_temp); COPYTHECONTEXT("PPS: seq_parameter_set_id",u4_temp);
ps_sps = &ps_dec->ps_sps[u4_temp]; ps_sps = &ps_dec->ps_sps[u4_temp];
if(FALSE == ps_sps->u1_is_valid)
return ERROR_INV_SPS_PPS_T;
ps_pps->ps_sps = ps_sps; ps_pps->ps_sps = ps_sps;
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/