eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavc/cbs_h266: Add SliceTopLeftTileIdx to H266RawPPS

Browse Source 
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
This commit is contained in:
Fei Wang
2024-10-28 16:55:20 +08:00
committed by Haihao Xiang
parent f42978fe29
commit e543a22c38
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/cbs_h266.h
View File

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

4
libavcodec/cbs_h266_syntax_template.c
View File

@@ -1976,6 +1976,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
else else
infer(pps_tile_idx_delta_present_flag, 0); infer(pps_tile_idx_delta_present_flag, 0);
for (i = 0; i < current->pps_num_slices_in_pic_minus1; i++) { for (i = 0; i < current->pps_num_slices_in_pic_minus1; i++) {
current->slice_top_left_tile_idx[i] = tile_idx;
tile_x = tile_idx % current->num_tile_columns; tile_x = tile_idx % current->num_tile_columns;
tile_y = tile_idx / current->num_tile_columns; tile_y = tile_idx / current->num_tile_columns;
if (tile_x != current->num_tile_columns - 1) { if (tile_x != current->num_tile_columns - 1) {
@@ -2058,6 +2059,8 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
} }
num_slices_in_tile = j; num_slices_in_tile = j;
} }
for (int k = 0; k < num_slices_in_tile; k++)
current->slice_top_left_tile_idx[i + k] = tile_idx;
i += num_slices_in_tile - 1; i += num_slices_in_tile - 1;
} else { } else {
uint16_t height = 0; uint16_t height = 0;
@@ -2101,6 +2104,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
if (i == current->pps_num_slices_in_pic_minus1) { if (i == current->pps_num_slices_in_pic_minus1) {
uint16_t height = 0; uint16_t height = 0;
current->slice_top_left_tile_idx[i] = tile_idx;
tile_x = tile_idx % current->num_tile_columns; tile_x = tile_idx % current->num_tile_columns;
tile_y = tile_idx / current->num_tile_columns; tile_y = tile_idx / current->num_tile_columns;
if (tile_y >= current->num_tile_rows) if (tile_y >= current->num_tile_rows)