Merge cherrypicks of [2688425, 2689040, 2689041, 2689042, 2688662, 2688663, 2688664, 2688426, 2688427, 2688428, 2688665, 2688666, 2688667, 2688668, 2688669, 2688670, 2688671, 2688429, 2688672, 2689043, 2688673, 2688674, 2688675, 2688676, 2688677, 2688678, 2688679, 2688430, 2688431] into oc-release
Change-Id: Ie5ca65578777760065bc424dbb45f3358c5a3de4
diff --git a/common/ihevc_structs.h b/common/ihevc_structs.h
index 0205582..52dda76 100644
--- a/common/ihevc_structs.h
+++ b/common/ihevc_structs.h
@@ -644,33 +644,33 @@
* if 1, , for the highest temporal sub-layers, the temporal distance between the HRD output times
* of consecutive pictures in output order is constrained refer to Table E-6
*/
- UWORD8 au1_fixed_pic_rate_general_flag[6];
+ UWORD8 au1_fixed_pic_rate_general_flag[VPS_MAX_SUB_LAYERS];
- UWORD8 au1_fixed_pic_rate_within_cvs_flag[6];
+ UWORD8 au1_fixed_pic_rate_within_cvs_flag[VPS_MAX_SUB_LAYERS];
/**
* if 1, , for the highest temporal sub-layers, the temporal distance (in clock ticks) between the
* element units that specify HRD output times of consecutive pictures in output order is constrained
* refer to Table E-6
*/
- UWORD8 au1_elemental_duration_in_tc_minus1[6];
+ UWORD8 au1_elemental_duration_in_tc_minus1[VPS_MAX_SUB_LAYERS];
/**
* specifies the HRD operational mode
*/
- UWORD8 au1_low_delay_hrd_flag[6];
+ UWORD8 au1_low_delay_hrd_flag[VPS_MAX_SUB_LAYERS];
/**
* 1 specifies the number of alternative CPB specifications in the
* bitstream of the cvs when HighestTid is equal to i
*/
- UWORD8 au1_cpb_cnt_minus1[6];
+ UWORD8 au1_cpb_cnt_minus1[VPS_MAX_SUB_LAYERS];
/**
* VUI level Sub-layer HRD parameters
*/
- sub_lyr_hrd_params_t as_sub_layer_hrd_params[6];
+ sub_lyr_hrd_params_t as_sub_layer_hrd_params[VPS_MAX_SUB_LAYERS];
}hrd_params_t;
diff --git a/decoder/ihevcd_parse_slice.c b/decoder/ihevcd_parse_slice.c
index 126b14c..9f92a0d 100644
--- a/decoder/ihevcd_parse_slice.c
+++ b/decoder/ihevcd_parse_slice.c
@@ -2708,6 +2708,17 @@
{
tu_t *ps_tu = ps_codec->s_parse.ps_tu;
pu_t *ps_pu = ps_codec->s_parse.ps_pu;
+ WORD32 pu_skip_wd, pu_skip_ht;
+ WORD32 rows_remaining, cols_remaining;
+
+ /* Set pu wd and ht based on whether the ctb is complete or not */
+ rows_remaining = ps_sps->i2_pic_height_in_luma_samples
+ - (ps_codec->s_parse.i4_ctb_y << ps_sps->i1_log2_ctb_size);
+ pu_skip_ht = MIN(ctb_size, rows_remaining);
+
+ cols_remaining = ps_sps->i2_pic_width_in_luma_samples
+ - (ps_codec->s_parse.i4_ctb_x << ps_sps->i1_log2_ctb_size);
+ pu_skip_wd = MIN(ctb_size, cols_remaining);
ps_tu->b1_cb_cbf = 0;
ps_tu->b1_cr_cbf = 0;
@@ -2731,8 +2742,8 @@
ps_pu->b2_part_idx = 0;
ps_pu->b4_pos_x = 0;
ps_pu->b4_pos_y = 0;
- ps_pu->b4_wd = (ctb_size >> 2) - 1;
- ps_pu->b4_ht = (ctb_size >> 2) - 1;
+ ps_pu->b4_wd = (pu_skip_wd >> 2) - 1;
+ ps_pu->b4_ht = (pu_skip_ht >> 2) - 1;
ps_pu->b1_intra_flag = 0;
ps_pu->b3_part_mode = ps_codec->s_parse.s_cu.i4_part_mode;
ps_pu->b1_merge_flag = 1;
