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

Merge changes Iec2941f1,I38be0e4c into mnc-dev

Browse source 
* changes:
  Decoder: Add supported width check for MBaff streams
  Decoder: Added a check for unsupported resolutions
This commit is contained in:
Marco Nelissen 2017-02-14 21:30:39 +00:00 • committed by Android (Google) Code Review
commit 3654ad0da5
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
decoder/ih264d_parse_headers.c
View file

@ -933,6 +933,21 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
return IVD_RES_CHANGED;
}
/* Check for unsupported resolutions */
if((u2_pic_wd > H264_MAX_FRAME_WIDTH) || (u2_pic_ht > H264_MAX_FRAME_HEIGHT))
{
return IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED;
}
/* If MBAff is enabled, decoder support is limited to streams with
* width less than half of H264_MAX_FRAME_WIDTH.
* In case of MBAff decoder processes two rows at a time
*/
if((u2_pic_wd << ps_seq->u1_mb_aff_flag) > H264_MAX_FRAME_WIDTH)
{
return IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED;
}
ps_dec->u2_disp_height = i4_cropped_ht;
ps_dec->u2_disp_width = i4_cropped_wd;