wrapper/libhevc-mirror
1
0
Fork 0
mirror of https://github.com/ittiam-systems/libhevc.git synced 2026-08-15 15:22:36 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[automerger] Add limits check for the CTB position in a frame am: 5a3dafc324 am: 1b95d7fa97

Browse source 
Change-Id: Ib9be76bf8afe7279353e366c71ec545858e02107
This commit is contained in:
Android Build Merger (Role) 2018-10-05 21:54:04 +00:00
commit 0a5e519fc7
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
decoder/ihevcd_parse_headers.c
View file

@ -1826,16 +1826,32 @@ IHEVCD_ERROR_T ihevcd_parse_pps(codec_t *ps_codec)
ps_pps->i1_tiles_enabled_flag = value;
/* When tiles are enabled and width or height is >= 4096,
* CTB Size should at least be 32. 16x16 CTBs can result
* in tile position greater than 255 for 4096,
* CTB Size should at least be 32 while if width or height is >= 8192,
* CTB Size should at least be 64 and so on. 16x16 CTBs can result
* in tile position greater than 255 for 4096 while 32x32 CTBs can result
* in tile position greater than 255 for 8192,
* which decoder does not support.
*/
if((ps_pps->i1_tiles_enabled_flag) &&
(ps_sps->i1_log2_ctb_size == 4) &&
((ps_sps->i2_pic_width_in_luma_samples >= 4096) ||
(ps_sps->i2_pic_height_in_luma_samples >= 4096)))
if (ps_pps->i1_tiles_enabled_flag)
{
return IHEVCD_INVALID_HEADER;
if((ps_sps->i1_log2_ctb_size == 4) &&
((ps_sps->i2_pic_width_in_luma_samples >= 4096) ||
(ps_sps->i2_pic_height_in_luma_samples >= 4096)))
{
return IHEVCD_INVALID_HEADER;
}
if((ps_sps->i1_log2_ctb_size == 5) &&
((ps_sps->i2_pic_width_in_luma_samples >= 8192) ||
(ps_sps->i2_pic_height_in_luma_samples >= 8192)))
{
return IHEVCD_INVALID_HEADER;
}
if((ps_sps->i1_log2_ctb_size == 6) &&
((ps_sps->i2_pic_width_in_luma_samples >= 16384) ||
(ps_sps->i2_pic_height_in_luma_samples >= 16384)))
{
return IHEVCD_INVALID_HEADER;
}
}
BITS_PARSE("entropy_coding_sync_enabled_flag", value, ps_bitstrm, 1);