highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/cbs_h266: store SubpicIdVal in the context

Browse Source 
And use it to derive CurrSubpicIdx

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2023-06-30 22:20:28 -03:00
parent e7f152a8c2
commit a77f5019f5
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/cbs_h266.h
View File

@ -552,6 +552,7 @@ typedef struct H266RawPPS {
uint16_t num_tiles_in_pic; uint16_t num_tiles_in_pic;
uint16_t slice_height_in_ctus[VVC_MAX_SLICES]; uint16_t slice_height_in_ctus[VVC_MAX_SLICES];
uint16_t num_slices_in_subpic[VVC_MAX_SLICES]; uint16_t num_slices_in_subpic[VVC_MAX_SLICES];
uint16_t sub_pic_id_val[VVC_MAX_SLICES];
} H266RawPPS; } H266RawPPS;
typedef struct H266RawAUD { typedef struct H266RawAUD {

34
libavcodec/cbs_h266_syntax_template.c
View File

@ -1706,6 +1706,15 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
} }
} }
for (i = 0; i <= sps->sps_num_subpics_minus1; i++) {
if (sps->sps_subpic_id_mapping_explicitly_signalled_flag)
current->sub_pic_id_val[i] = current->pps_subpic_id_mapping_present_flag
? current->pps_subpic_id[i]
: sps->sps_subpic_id[i];
else
current->sub_pic_id_val[i] = i;
}
pic_width_in_ctbs_y = AV_CEIL_RSHIFT pic_width_in_ctbs_y = AV_CEIL_RSHIFT
(current->pps_pic_width_in_luma_samples, (sps->sps_log2_ctu_size_minus5 + 5)); (current->pps_pic_width_in_luma_samples, (sps->sps_log2_ctu_size_minus5 + 5));
pic_height_in_ctbs_y = AV_CEIL_RSHIFT( pic_height_in_ctbs_y = AV_CEIL_RSHIFT(
@ -2697,25 +2706,16 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
if (sps->sps_subpic_info_present_flag) { if (sps->sps_subpic_info_present_flag) {
ub(sps->sps_subpic_id_len_minus1 + 1, sh_subpic_id); ub(sps->sps_subpic_id_len_minus1 + 1, sh_subpic_id);
if (sps->sps_subpic_id_mapping_explicitly_signalled_flag) { for (i = 0; i <= sps->sps_num_subpics_minus1; i++) {
for (i = 0; i <= sps->sps_num_subpics_minus1; i++) { if (pps->sub_pic_id_val[i] == current->sh_subpic_id) {
uint16_t subpic_id_val = curr_subpic_idx = i;
pps->pps_subpic_id_mapping_present_flag ? break;
pps->pps_subpic_id[i] : sps->sps_subpic_id[i];
if (subpic_id_val == current->sh_subpic_id) {
curr_subpic_idx = i;
break;
}
}
} else {
curr_subpic_idx = current->sh_subpic_id;
if (curr_subpic_idx > sps->sps_num_subpics_minus1) {
av_log(ctx->log_ctx, AV_LOG_ERROR,
"sh_subpic_id(%d) should in range [0, %d]\n",
curr_subpic_idx, sps->sps_num_subpics_minus1);
return AVERROR_INVALIDDATA;
} }
} }
if (i > sps->sps_num_subpics_minus1) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "invalid CurrSubpicIdx %d\n", i);
return AVERROR_INVALIDDATA;
}
} else { } else {
curr_subpic_idx = 0; curr_subpic_idx = 0;
} }