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

resolve merge conflicts of 3654ad0 to mnc-dr-dev

Browse source 
am: 37345554fe

Change-Id: I7117544d1e2c909e353b7df3c42cfc25a9919ecf
This commit is contained in:
Marco Nelissen 2017-02-14 22:55:05 +00:00 • committed by android-build-merger
commit 33d9d00a3c
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
decoder/ih264d_parse_headers.c
View file

@ -894,6 +894,15 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
return IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED; 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_height = i4_cropped_ht;
ps_dec->u2_disp_width = i4_cropped_wd; ps_dec->u2_disp_width = i4_cropped_wd;