|
|
@ -1883,7 +1883,6 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, |
|
|
|
} else if (s->pps->tiles_enabled_flag) { |
|
|
|
} else if (s->pps->tiles_enabled_flag) { |
|
|
|
if (ctb_addr_ts && s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[ctb_addr_ts - 1]) { |
|
|
|
if (ctb_addr_ts && s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[ctb_addr_ts - 1]) { |
|
|
|
int idxX = s->pps->col_idxX[x_ctb >> s->sps->log2_ctb_size]; |
|
|
|
int idxX = s->pps->col_idxX[x_ctb >> s->sps->log2_ctb_size]; |
|
|
|
lc->start_of_tiles_x = x_ctb; |
|
|
|
|
|
|
|
lc->end_of_tiles_x = x_ctb + (s->pps->column_width[idxX] << s->sps->log2_ctb_size); |
|
|
|
lc->end_of_tiles_x = x_ctb + (s->pps->column_width[idxX] << s->sps->log2_ctb_size); |
|
|
|
lc->first_qp_group = 1; |
|
|
|
lc->first_qp_group = 1; |
|
|
|
} |
|
|
|
} |
|
|
@ -2236,7 +2235,6 @@ static int hevc_frame_start(HEVCContext *s) |
|
|
|
memset(s->is_pcm, 0, s->sps->min_pu_width * s->sps->min_pu_height); |
|
|
|
memset(s->is_pcm, 0, s->sps->min_pu_width * s->sps->min_pu_height); |
|
|
|
memset(s->tab_slice_address, -1, pic_size_in_ctb * sizeof(*s->tab_slice_address)); |
|
|
|
memset(s->tab_slice_address, -1, pic_size_in_ctb * sizeof(*s->tab_slice_address)); |
|
|
|
|
|
|
|
|
|
|
|
lc->start_of_tiles_x = 0; |
|
|
|
|
|
|
|
s->is_decoded = 0; |
|
|
|
s->is_decoded = 0; |
|
|
|
s->first_nal_type = s->nal_unit_type; |
|
|
|
s->first_nal_type = s->nal_unit_type; |
|
|
|
|
|
|
|
|
|
|
|