support 4K max dimension

This is required for handling 4K thumbnails that may be rotated.

Bug: 64939294
Change-Id: Ia33d8e1ce7fb07b5ec6bf604d30cd8f75c3228ae
This commit is contained in:
Lajos Molnar 2017-08-24 17:19:29 -07:00
parent 4bd04b1b0c
commit 8a7f15c3d4
2 changed files with 6 additions and 3 deletions

View file

@ -34,8 +34,9 @@
*
************************************************************************
*/
#define H264_MAX_FRAME_WIDTH 3840
#define H264_MAX_FRAME_HEIGHT 2176
#define H264_MAX_FRAME_WIDTH 4096
#define H264_MAX_FRAME_HEIGHT 4096
#define H264_MAX_FRAME_SIZE (4096 * 2048)
#define H264_MIN_FRAME_WIDTH 16
#define H264_MIN_FRAME_HEIGHT 16

View file

@ -917,7 +917,9 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
}
/* Check for unsupported resolutions */
if((u2_pic_wd > H264_MAX_FRAME_WIDTH) || (u2_pic_ht > H264_MAX_FRAME_HEIGHT))
if((u2_pic_wd > H264_MAX_FRAME_WIDTH) || (u2_pic_ht > H264_MAX_FRAME_HEIGHT)
|| (u2_pic_wd < H264_MIN_FRAME_WIDTH) || (u2_pic_ht < H264_MIN_FRAME_HEIGHT)
|| (u2_pic_wd * (UWORD32)u2_pic_ht > H264_MAX_FRAME_SIZE))
{
return IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED;
}