Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/cbs_h266: Add NumSlicesInTile to H266RawPPS

Browse Source 
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
master
Fei Wang 3 weeks ago committed by Haihao Xiang
parent e543a22c38
commit 6bb5dc2ae7
2 changed files with 11 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      libavcodec/cbs_h266.h
  2. 16
      libavcodec/cbs_h266_syntax_template.c

1
libavcodec/cbs_h266.h
Unescape View File

@ -594,6 +594,7 @@ typedef struct H266RawPPS {
uint16_t col_width_val[VVC_MAX_TILE_COLUMNS]; ///< ColWidthVal
uint16_t row_height_val[VVC_MAX_TILE_ROWS]; ///< RowHeightVal
uint16_t slice_top_left_tile_idx[VVC_MAX_SLICES];
uint16_t num_slices_in_tile[VVC_MAX_SLICES];
} H266RawPPS;
typedef struct H266RawAPS {

16
libavcodec/cbs_h266_syntax_template.c
Unescape View File

@ -2007,14 +2007,13 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
if (current->pps_slice_width_in_tiles_minus1[i] == 0 &&
current->pps_slice_height_in_tiles_minus1[i] == 0 &&
current->row_height_val[tile_y] > 1) {
int num_slices_in_tile,
uniform_slice_height, remaining_height_in_ctbs_y;
int uniform_slice_height, remaining_height_in_ctbs_y;
remaining_height_in_ctbs_y =
current->row_height_val[tile_y];
ues(pps_num_exp_slices_in_tile[i],
0, current->row_height_val[tile_y] - 1, 1, i);
if (current->pps_num_exp_slices_in_tile[i] == 0) {
num_slices_in_tile = 1;
current->num_slices_in_tile[i] = 1;
current->slice_height_in_ctus[i] = current->row_height_val[tile_y];
slice_top_left_ctu_x[i] = ctu_x;
slice_top_left_ctu_y[i] = ctu_y;
@ -2057,14 +2056,18 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
slice_top_left_ctu_y[i + j] = ctu_y;
j++;
}
num_slices_in_tile = j;
current->num_slices_in_tile[i] = j;
}
for (int k = 0; k < num_slices_in_tile; k++)
for (int k = 0; k < current->num_slices_in_tile[i]; k++)
current->slice_top_left_tile_idx[i + k] = tile_idx;
i += num_slices_in_tile - 1;
i += current->num_slices_in_tile[i] - 1;
} else {
uint16_t height = 0;
infer(pps_num_exp_slices_in_tile[i], 0);
if (current->pps_slice_width_in_tiles_minus1[i] == 0 &&
current->pps_slice_height_in_tiles_minus1[i] == 0)
current->num_slices_in_tile[i] = 1;
for (j = 0;
j <= current->pps_slice_height_in_tiles_minus1[i];
j++) {
@ -2105,6 +2108,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
uint16_t height = 0;
current->slice_top_left_tile_idx[i] = tile_idx;
current->num_slices_in_tile[i] = 1;
tile_x = tile_idx % current->num_tile_columns;
tile_y = tile_idx / current->num_tile_columns;
if (tile_y >= current->num_tile_rows)

Write Preview
Loading…
Cancel
Save