RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cbs_h266: H266RawSliceHeader, expose NumRefIdxActive[] 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Nuo Mi 2023-08-08 18:59:02 +08:00 committed by James Almer
parent 088bda0f8e
commit 763eb59187
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/cbs_h266.h
View File

@ -833,6 +833,7 @@ typedef struct H266RawSliceHeader {
// derived values
uint32_t num_entry_points; ///< NumEntryPoints
uint8_t num_ref_idx_active[2]; ///< NumRefIdxActive[]
} H266RawSliceHeader;

41
libavcodec/cbs_h266_syntax_template.c
View File

@ -3191,39 +3191,38 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
} else {
infer(sh_num_ref_idx_active_override_flag, 1);
}
for (i = 0; i < 2; i++) {
if (current->sh_slice_type == VVC_SLICE_TYPE_B ||
(current->sh_slice_type == VVC_SLICE_TYPE_P && i == 0)) {
if (current->sh_num_ref_idx_active_override_flag) {
current->num_ref_idx_active[i] = current->sh_num_ref_idx_active_minus1[i] + 1;
} else {
current->num_ref_idx_active[i] =
FFMIN(ref_pic_lists->rpl_ref_list[i].num_ref_entries,
pps->pps_num_ref_idx_default_active_minus1[i] + 1);
}
} else {
current->num_ref_idx_active[i] = 0;
}
}
if (current->sh_slice_type != VVC_SLICE_TYPE_I) {
if (pps->pps_cabac_init_present_flag)
flag(sh_cabac_init_flag);
else
infer(sh_cabac_init_flag, 0);
if (ph->ph_temporal_mvp_enabled_flag && !pps->pps_rpl_info_in_ph_flag) {
uint8_t num_ref_idx_active[2];
for (i = 0; i < 2; i++) {
if (current->sh_slice_type == VVC_SLICE_TYPE_B ||
(current->sh_slice_type == VVC_SLICE_TYPE_P && i == 0)) {
if (current->sh_num_ref_idx_active_override_flag) {
num_ref_idx_active[i] =
current->sh_num_ref_idx_active_minus1[i] + 1;
} else {
num_ref_idx_active[i] =
FFMIN(ref_pic_lists->rpl_ref_list[i].num_ref_entries,
pps->pps_num_ref_idx_default_active_minus1[i] + 1);
}
} else {
num_ref_idx_active[i] = 0;
}
}
if (current->sh_slice_type == VVC_SLICE_TYPE_B)
flag(sh_collocated_from_l0_flag);
else
infer(sh_collocated_from_l0_flag, 1);
if ((current->sh_collocated_from_l0_flag &&
num_ref_idx_active[0] > 1) ||
current->num_ref_idx_active[0] > 1) ||
(!current->sh_collocated_from_l0_flag &&
num_ref_idx_active[1] > 1)) {
current->num_ref_idx_active[1] > 1)) {
unsigned int idx = current->sh_collocated_from_l0_flag ? 0 : 1;
ue(sh_collocated_ref_idx, 0, num_ref_idx_active[idx] - 1);
ue(sh_collocated_ref_idx, 0, current->num_ref_idx_active[idx] - 1);
} else {
infer(sh_collocated_ref_idx, 0);
}
@ -3233,7 +3232,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
(pps->pps_weighted_bipred_flag &&
current->sh_slice_type == VVC_SLICE_TYPE_B))) {
CHECK(FUNC(pred_weight_table) (ctx, rw, sps, pps, ref_pic_lists,
num_ref_idx_active,
current->num_ref_idx_active,
&current->sh_pred_weight_table));
}
}