mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-27 20:01:50 +02:00
hevc : update hls_decode_neighbour(cherry picked from commit 14341c6d9a6885657ba365807223e96a67d6c0ed)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
0afa254d4e
commit
81d0252dac
@ -1793,26 +1793,26 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb,
|
||||
lc->end_of_tiles_y = FFMIN(y_ctb + ctb_size, s->sps->height);
|
||||
|
||||
if (s->pps->tiles_enabled_flag) {
|
||||
tile_left_boundary = x_ctb > 0 &&
|
||||
s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs - 1]];
|
||||
tile_left_boundary = x_ctb > 0 &&
|
||||
s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs-1]];
|
||||
slice_left_boundary = x_ctb > 0 &&
|
||||
s->tab_slice_address[ctb_addr_rs] == s->tab_slice_address[ctb_addr_rs - 1];
|
||||
s->tab_slice_address[ctb_addr_rs] != s->tab_slice_address[ctb_addr_rs - 1];
|
||||
tile_up_boundary = y_ctb > 0 &&
|
||||
s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs - s->sps->ctb_width]];
|
||||
s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs - s->sps->ctb_width]];
|
||||
slice_up_boundary = y_ctb > 0 &&
|
||||
s->tab_slice_address[ctb_addr_rs] == s->tab_slice_address[ctb_addr_rs - s->sps->ctb_width];
|
||||
s->tab_slice_address[ctb_addr_rs] != s->tab_slice_address[ctb_addr_rs - s->sps->ctb_width];
|
||||
} else {
|
||||
tile_left_boundary =
|
||||
tile_up_boundary = 1;
|
||||
slice_left_boundary = ctb_addr_in_slice > 0;
|
||||
slice_up_boundary = ctb_addr_in_slice >= s->sps->ctb_width;
|
||||
tile_left_boundary =
|
||||
tile_up_boundary = 0;
|
||||
slice_left_boundary = ctb_addr_in_slice <= 0;
|
||||
slice_up_boundary = ctb_addr_in_slice < s->sps->ctb_width;
|
||||
}
|
||||
lc->slice_or_tiles_left_boundary = (!slice_left_boundary) + (!tile_left_boundary << 1);
|
||||
lc->slice_or_tiles_up_boundary = (!slice_up_boundary + (!tile_up_boundary << 1));
|
||||
lc->ctb_left_flag = ((x_ctb > 0) && (ctb_addr_in_slice > 0) && tile_left_boundary);
|
||||
lc->ctb_up_flag = ((y_ctb > 0) && (ctb_addr_in_slice >= s->sps->ctb_width) && tile_up_boundary);
|
||||
lc->ctb_up_right_flag = ((y_ctb > 0) && (ctb_addr_in_slice+1 >= s->sps->ctb_width) && (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs+1 - s->sps->ctb_width]]));
|
||||
lc->ctb_up_left_flag = ((x_ctb > 0) && (y_ctb > 0) && (ctb_addr_in_slice-1 >= s->sps->ctb_width) && (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs-1 - s->sps->ctb_width]]));
|
||||
lc->slice_or_tiles_left_boundary = slice_left_boundary + (tile_left_boundary << 1);
|
||||
lc->slice_or_tiles_up_boundary = slice_up_boundary + (tile_up_boundary << 1);
|
||||
lc->ctb_left_flag = ((x_ctb > 0) && (ctb_addr_in_slice > 0) && !tile_left_boundary);
|
||||
lc->ctb_up_flag = ((y_ctb > 0) && (ctb_addr_in_slice >= s->sps->ctb_width) && !tile_up_boundary);
|
||||
lc->ctb_up_right_flag = ((y_ctb > 0) && (ctb_addr_in_slice+1 >= s->sps->ctb_width) && (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs+1 - s->sps->ctb_width]]));
|
||||
lc->ctb_up_left_flag = ((x_ctb > 0) && (y_ctb > 0) && (ctb_addr_in_slice-1 >= s->sps->ctb_width) && (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs-1 - s->sps->ctb_width]]));
|
||||
}
|
||||
|
||||
static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread)
|
||||
|
Loading…
Reference in New Issue
Block a user