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 "Check if luma wd and ht are multiple of min cb size" into lmp-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-12-04 22:47:22 +00:00 • committed by Android (Google) Code Review
commit 6a587c6be7
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
decoder/ihevcd_parse_headers.c
View file

@ -1270,12 +1270,6 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec)
if((0 >= ps_sps->i2_pic_width_in_luma_samples) || (0 >= ps_sps->i2_pic_height_in_luma_samples))
return IHEVCD_INVALID_PARAMETER;
/* i2_pic_width_in_luma_samples and i2_pic_height_in_luma_samples
should be multiples of min_cb_size. Here these are aligned to 8,
i.e. smallest CB size */
ps_sps->i2_pic_width_in_luma_samples = ALIGN8(ps_sps->i2_pic_width_in_luma_samples);
ps_sps->i2_pic_height_in_luma_samples = ALIGN8(ps_sps->i2_pic_height_in_luma_samples);
if((ps_sps->i2_pic_width_in_luma_samples > ps_codec->i4_max_wd) ||
(ps_sps->i2_pic_width_in_luma_samples * ps_sps->i2_pic_height_in_luma_samples >
ps_codec->i4_max_wd * ps_codec->i4_max_ht) ||
@ -1397,7 +1391,9 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec)
(ps_sps->i1_log2_diff_max_min_transform_block_size < 0) ||
(ps_sps->i1_log2_max_transform_block_size > ps_sps->i1_log2_ctb_size) ||
(ps_sps->i1_log2_ctb_size < 4) ||
(ps_sps->i1_log2_ctb_size > 6))
(ps_sps->i1_log2_ctb_size > 6) ||
(ps_sps->i2_pic_width_in_luma_samples % (1 << ps_sps->i1_log2_min_coding_block_size) != 0) ||
(ps_sps->i2_pic_height_in_luma_samples % (1 << ps_sps->i1_log2_min_coding_block_size) != 0))
{
return IHEVCD_INVALID_PARAMETER;
}