virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

avcodec/cbs_h266: check subpicture slices number

Browse Source 
According to section 6.3.3, 'Spatial or component-wise partitionings,'
Subpictures must cover the entire picture.
Therefore, the total number of subpicture slices should equal the number of picture slices

Co-authored-by: Frank Plowman <post@frankplowman.com>
This commit is contained in:
Nuo Mi 2024-11-23 17:32:31 +08:00
parent 4100a2da29
commit 46006529a1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/cbs_h266_syntax_template.c
View File

@ -1966,7 +1966,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
infer(pps_single_slice_per_subpic_flag, 1);
if (current->pps_rect_slice_flag &&
!current->pps_single_slice_per_subpic_flag) {
int j;
int j, num_slices = 0;
uint16_t tile_idx = 0, tile_x, tile_y, ctu_x, ctu_y;
uint16_t slice_top_left_ctu_x[VVC_MAX_SLICES];
uint16_t slice_top_left_ctu_y[VVC_MAX_SLICES];
@ -2155,7 +2155,10 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
current->num_slices_in_subpic[i]++;
}
}
num_slices += current->num_slices_in_subpic[i];
}
if (current->pps_num_slices_in_pic_minus1 + 1 != num_slices)
return AVERROR_INVALIDDATA;
} else {
if (current->pps_no_pic_partition_flag)
infer(pps_num_slices_in_pic_minus1, 0);