From 248e72c7a8c7c382ff4397868a6c7453a6453141 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Wed, 3 May 2017 15:12:46 +0530 Subject: [PATCH] Ensure CTB size > 16 for clips with tiles and width/height >= 4096 For clips with tiles and dimensions >= 4096, CTB size of 16 can result in tile position > 255. This is not supported by the decoder Bug: 37930177 Test: ran poc w/o crashing Change-Id: I2f223a124c4ea9bfd98343343fd010d80a5dd8bd --- decoder/ihevcd_parse_headers.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index 8ee7785..90e4f9b 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1789,6 +1789,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;