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

Merge "Ensure CTB size > 16 for clips with tiles and width/height >= 4096" into lmp-dev am: db15dd7102 am: 419fd4b745 am: 8e6cf47bf1 am: 61f3fbfe13 am: 107cdf1c41

Browse source 
am: 334f59340c

Change-Id: I04d29c17cfdcba3e946bdb9e461bf910e9f7ea0f
This commit is contained in:
Harish Mahendrakar 2017-08-03 19:10:09 +00:00 • committed by android-build-merger
commit 9b2d0a5137
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
decoder/ihevcd_parse_headers.c
View file

@ -1811,6 +1811,19 @@ IHEVCD_ERROR_T ihevcd_parse_pps(codec_t *ps_codec)
BITS_PARSE("tiles_enabled_flag", value, ps_bitstrm, 1);
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,
* 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)))
{
return IHEVCD_INVALID_HEADER;
}
BITS_PARSE("entropy_coding_sync_enabled_flag", value, ps_bitstrm, 1);
ps_pps->i1_entropy_coding_sync_enabled_flag = value;