diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2019-09-28 01:20:58 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-28 01:20:58 -0700 |
| commit | b33562f6248193223115df2ff63e0ff91d7ac254 (patch) | |
| tree | 205f7c79e5f5618c6be38ec80372a06668c10644 | |
| parent | 824c19e4ca414635b6115a4f79f6915d2e6a885a (diff) | |
| parent | ea503e636b50bba52f48fdf02fc319ac5c2c0569 (diff) | |
| download | libhevc-b33562f6248193223115df2ff63e0ff91d7ac254.tar.gz | |
Check change in CTB size when decoding multiple SPS with same id am: 072f9084f4 am: c5fcb41d08
am: ea503e636b
Change-Id: Ie9442c562168487f860c05826c1c4d190f6bf7a3
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index 47edb1f..09f343c 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1473,7 +1473,19 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) ps_sps->i1_log2_diff_max_min_coding_block_size = value; ctb_log2_size_y = ps_sps->i1_log2_min_coding_block_size + ps_sps->i1_log2_diff_max_min_coding_block_size; - + /* Check if CTB size is different in case of multiple SPS with same ID */ + { + sps_t *ps_sps_old = (ps_codec->s_parse.ps_sps_base + sps_id); + if(ps_sps_old->i1_sps_valid && ps_sps_old->i1_log2_ctb_size != ctb_log2_size_y) + { + if(0 == ps_codec->i4_first_pic_done) + { + return IHEVCD_INVALID_PARAMETER; + } + ps_codec->i4_reset_flag = 1; + return (IHEVCD_ERROR_T)IVD_RES_CHANGED; + } + } UEV_PARSE("log2_min_transform_block_size_minus2", value, ps_bitstrm); if(value > (LOG2_MAX_TU_SIZE - 2)) { |