Merge changes from topic "am-492ad0fb-402d-4977-be93-b82e053bee6f" into nyc-dev

* changes:
  [automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd am: cd00b5307b am: 96f3a8ba91
  [automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd am: cd00b5307b
  [automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd
  [automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993
  Add limits check for depth hierarchy sps parameters
This commit is contained in:
TreeHugger Robot 2018-04-06 19:08:18 +00:00 committed by Android (Google) Code Review
commit b6584f925d

View file

@ -1420,9 +1420,17 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec)
ps_sps->i1_log2_diff_max_min_pcm_coding_block_size = 0;
UEV_PARSE("max_transform_hierarchy_depth_inter", value, ps_bitstrm);
if(value < 0 || value > (ps_sps->i1_log2_ctb_size - ps_sps->i1_log2_min_transform_block_size))
{
return IHEVCD_INVALID_PARAMETER;
}
ps_sps->i1_max_transform_hierarchy_depth_inter = value;
UEV_PARSE("max_transform_hierarchy_depth_intra", value, ps_bitstrm);
if(value < 0 || value > (ps_sps->i1_log2_ctb_size - ps_sps->i1_log2_min_transform_block_size))
{
return IHEVCD_INVALID_PARAMETER;
}
ps_sps->i1_max_transform_hierarchy_depth_intra = value;
/* String has a d (enabled) in order to match with HM */