virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

cbs_h266: fix inference for sh_alf_enabled_flag

Browse Source 
if pps_alf_info_in_ph_flag is true
sh_alf_enabled_flag infered from ph

Failed clip:
LTRP_A_ERICSSON_3.bit

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Nuo Mi
2023-08-08 18:58:57 +08:00
committed by James Almer
parent fe745c2007
commit d7f851b8c4
1 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
libavcodec/cbs_h266_syntax_template.c
View File

@@ -3111,44 +3111,57 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
if (nal_unit_type == VVC_IDR_W_RADL || nal_unit_type == VVC_IDR_N_LP || if (nal_unit_type == VVC_IDR_W_RADL || nal_unit_type == VVC_IDR_N_LP ||
nal_unit_type == VVC_CRA_NUT || nal_unit_type == VVC_GDR_NUT) nal_unit_type == VVC_CRA_NUT || nal_unit_type == VVC_GDR_NUT)
flag(sh_no_output_of_prior_pics_flag); flag(sh_no_output_of_prior_pics_flag);
if (sps->sps_alf_enabled_flag && !pps->pps_alf_info_in_ph_flag) {
if (sps->sps_alf_enabled_flag) {
if (!pps->pps_alf_info_in_ph_flag) {
flag(sh_alf_enabled_flag); flag(sh_alf_enabled_flag);
if (current->sh_alf_enabled_flag) { if (current->sh_alf_enabled_flag) {
ub(3, sh_num_alf_aps_ids_luma); ub(3, sh_num_alf_aps_ids_luma);
for (i = 0; i < current->sh_num_alf_aps_ids_luma; i++) for (i = 0; i < current->sh_num_alf_aps_ids_luma; i++)
ubs(3, sh_alf_aps_id_luma[i], 1, i); ubs(3, sh_alf_aps_id_luma[i], 1, i);
if (sps->sps_chroma_format_idc != 0) { if (sps->sps_chroma_format_idc != 0) {
flag(sh_alf_cb_enabled_flag); flag(sh_alf_cb_enabled_flag);
flag(sh_alf_cr_enabled_flag); flag(sh_alf_cr_enabled_flag);
} else {
infer(sh_alf_cb_enabled_flag, ph->ph_alf_cb_enabled_flag);
infer(sh_alf_cr_enabled_flag, ph->ph_alf_cr_enabled_flag);
} }
if (current->sh_alf_cb_enabled_flag || if (current->sh_alf_cb_enabled_flag ||
current->sh_alf_cr_enabled_flag) current->sh_alf_cr_enabled_flag) {
ub(3, sh_alf_aps_id_chroma); ub(3, sh_alf_aps_id_chroma);
else }
infer(sh_alf_aps_id_chroma, ph->ph_alf_aps_id_chroma);
if (sps->sps_ccalf_enabled_flag) { if (sps->sps_ccalf_enabled_flag) {
flag(sh_alf_cc_cb_enabled_flag); flag(sh_alf_cc_cb_enabled_flag);
if (current->sh_alf_cc_cb_enabled_flag) if (current->sh_alf_cc_cb_enabled_flag)
ub(3, sh_alf_cc_cb_aps_id); ub(3, sh_alf_cc_cb_aps_id);
else
infer(sh_alf_cc_cb_aps_id, ph->ph_alf_cc_cb_aps_id);
flag(sh_alf_cc_cr_enabled_flag); flag(sh_alf_cc_cr_enabled_flag);
if (current->sh_alf_cc_cr_enabled_flag) if (current->sh_alf_cc_cr_enabled_flag)
ub(3, sh_alf_cc_cr_aps_id); ub(3, sh_alf_cc_cr_aps_id);
else }
infer(sh_alf_cc_cr_aps_id, ph->ph_alf_cc_cr_aps_id); }
} else { } else {
infer(sh_alf_enabled_flag, ph->ph_alf_enabled_flag);
if (current->sh_alf_enabled_flag) {
infer(sh_num_alf_aps_ids_luma, ph->ph_num_alf_aps_ids_luma);
for (i = 0; i < current->sh_num_alf_aps_ids_luma; i++)
infer(sh_alf_aps_id_luma[i], ph->ph_alf_aps_id_luma[i]);
infer(sh_alf_cb_enabled_flag, ph->ph_alf_cb_enabled_flag);
infer(sh_alf_cr_enabled_flag, ph->ph_alf_cr_enabled_flag);
if (current->sh_alf_cb_enabled_flag ||current->sh_alf_cr_enabled_flag)
infer(sh_alf_aps_id_chroma, ph->ph_alf_aps_id_chroma);
if (sps->sps_ccalf_enabled_flag) {
infer(sh_alf_cc_cb_enabled_flag, ph->ph_alf_cc_cb_enabled_flag); infer(sh_alf_cc_cb_enabled_flag, ph->ph_alf_cc_cb_enabled_flag);
infer(sh_alf_cc_cr_enabled_flag, ph->ph_alf_cc_cr_enabled_flag); if (current->sh_alf_cc_cb_enabled_flag)
infer(sh_alf_cc_cb_aps_id, ph->ph_alf_cc_cb_aps_id); infer(sh_alf_cc_cb_aps_id, ph->ph_alf_cc_cb_aps_id);
infer(sh_alf_cc_cr_enabled_flag, ph->ph_alf_cc_cr_enabled_flag);
if (current->sh_alf_cc_cr_enabled_flag)
infer(sh_alf_cc_cr_aps_id, ph->ph_alf_cc_cr_aps_id); infer(sh_alf_cc_cr_aps_id, ph->ph_alf_cc_cr_aps_id);
} }
} }
} else { }
infer(sh_alf_enabled_flag, 0);
} }
if (current->sh_picture_header_in_slice_header_flag) { if (current->sh_picture_header_in_slice_header_flag) {