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

cbs_h266: slice_header, fix inference for pred_weight_table

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Nuo Mi 2023-08-08 18:59:03 +08:00 committed by James Almer
parent 763eb59187
commit 81a48d96e2
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/cbs_h266_syntax_template.c
View File

@ -3226,17 +3226,16 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
} else {
infer(sh_collocated_ref_idx, 0);
}
if (!pps->pps_wp_info_in_ph_flag &&
((pps->pps_weighted_pred_flag &&
current->sh_slice_type == VVC_SLICE_TYPE_P) ||
(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,
current->num_ref_idx_active,
&current->sh_pred_weight_table));
}
}
if (!pps->pps_wp_info_in_ph_flag &&
((pps->pps_weighted_pred_flag &&
current->sh_slice_type == VVC_SLICE_TYPE_P) ||
(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,
current->num_ref_idx_active,
&current->sh_pred_weight_table));
}
}
qp_bd_offset = 6 * sps->sps_bitdepth_minus8;
if (!pps->pps_qp_delta_info_in_ph_flag)