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

cbs_h266: fix inference for xh_deblocking_filter_disabled_flag

Browse Source 
if !ph_deblocking_params_present_flag is true, ph_deblocking_filter_disabled_flag infered from pps
if !sh_deblocking_params_present_flag is true, sh_deblocking_filter_disabled_flag infered from ph

Failed clips:
ENT444MAINTIER_C_Sony_3.bit
ENT444HIGHTIER_D_Sony_3.bit

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

76
libavcodec/cbs_h266_syntax_template.c
View File

@ -2938,20 +2938,14 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw,
infer(ph_sao_chroma_enabled_flag, 0); infer(ph_sao_chroma_enabled_flag, 0);
} }
if (pps->pps_dbf_info_in_ph_flag) { if (pps->pps_dbf_info_in_ph_flag)
flag(ph_deblocking_params_present_flag); flag(ph_deblocking_params_present_flag);
if (current->ph_deblocking_params_present_flag) { else
if (!pps->pps_deblocking_filter_disabled_flag) { infer(ph_deblocking_params_present_flag, 0);
flag(ph_deblocking_filter_disabled_flag);
} else { if (current->ph_deblocking_params_present_flag) {
if (pps->pps_deblocking_filter_disabled_flag && if (!pps->pps_deblocking_filter_disabled_flag) {
current->ph_deblocking_params_present_flag) { flag(ph_deblocking_filter_disabled_flag);
infer(ph_deblocking_filter_disabled_flag, 0);
} else {
infer(ph_deblocking_filter_disabled_flag,
pps->pps_deblocking_filter_disabled_flag);
}
}
if (!current->ph_deblocking_filter_disabled_flag) { if (!current->ph_deblocking_filter_disabled_flag) {
se(ph_luma_beta_offset_div2, -12, 12); se(ph_luma_beta_offset_div2, -12, 12);
se(ph_luma_tc_offset_div2, -12, 12); se(ph_luma_tc_offset_div2, -12, 12);
@ -2970,25 +2964,19 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw,
infer(ph_cr_tc_offset_div2, infer(ph_cr_tc_offset_div2,
current->ph_luma_tc_offset_div2); current->ph_luma_tc_offset_div2);
} }
} else {
infer(ph_luma_beta_offset_div2, pps->pps_luma_beta_offset_div2);
infer(ph_luma_tc_offset_div2, pps->pps_luma_tc_offset_div2);
if (pps->pps_chroma_tool_offsets_present_flag) {
infer(ph_cb_beta_offset_div2, pps->pps_cb_beta_offset_div2);
infer(ph_cb_tc_offset_div2, pps->pps_cb_tc_offset_div2);
infer(ph_cr_beta_offset_div2, pps->pps_cr_beta_offset_div2);
infer(ph_cr_tc_offset_div2, pps->pps_cr_tc_offset_div2);
} else {
infer(ph_cb_beta_offset_div2,
current->ph_luma_beta_offset_div2);
infer(ph_cb_tc_offset_div2,
current->ph_luma_tc_offset_div2);
infer(ph_cr_beta_offset_div2,
current->ph_luma_beta_offset_div2);
infer(ph_cr_tc_offset_div2,
current->ph_luma_tc_offset_div2);
}
} }
} else {
infer(ph_deblocking_filter_disabled_flag, 0);
}
} else {
infer(ph_deblocking_filter_disabled_flag, pps->pps_deblocking_filter_disabled_flag);
if (!current->ph_deblocking_filter_disabled_flag) {
infer(ph_luma_beta_offset_div2, pps->pps_luma_beta_offset_div2);
infer(ph_luma_tc_offset_div2, pps->pps_luma_tc_offset_div2);
infer(ph_cb_beta_offset_div2, pps->pps_cb_beta_offset_div2);
infer(ph_cb_tc_offset_div2, pps->pps_cb_tc_offset_div2);
infer(ph_cr_beta_offset_div2, pps->pps_cr_beta_offset_div2);
infer(ph_cr_tc_offset_div2, pps->pps_cr_tc_offset_div2);
} }
} }
@ -3321,9 +3309,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
if (!pps->pps_deblocking_filter_disabled_flag) if (!pps->pps_deblocking_filter_disabled_flag)
flag(sh_deblocking_filter_disabled_flag); flag(sh_deblocking_filter_disabled_flag);
else else
infer(sh_deblocking_filter_disabled_flag, infer(sh_deblocking_filter_disabled_flag, 0);
!(pps->pps_deblocking_filter_disabled_flag &&
current->sh_deblocking_params_present_flag));
if (!current->sh_deblocking_filter_disabled_flag) { if (!current->sh_deblocking_filter_disabled_flag) {
se(sh_luma_beta_offset_div2, -12, 12); se(sh_luma_beta_offset_div2, -12, 12);
se(sh_luma_tc_offset_div2, -12, 12); se(sh_luma_tc_offset_div2, -12, 12);
@ -3340,22 +3326,16 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
current->sh_luma_beta_offset_div2); current->sh_luma_beta_offset_div2);
infer(sh_cr_tc_offset_div2, current->sh_luma_tc_offset_div2); infer(sh_cr_tc_offset_div2, current->sh_luma_tc_offset_div2);
} }
} else { }
} else {
infer(sh_deblocking_filter_disabled_flag, ph->ph_deblocking_filter_disabled_flag);
if (!current->sh_deblocking_filter_disabled_flag) {
infer(sh_luma_beta_offset_div2, ph->ph_luma_beta_offset_div2); infer(sh_luma_beta_offset_div2, ph->ph_luma_beta_offset_div2);
infer(sh_luma_tc_offset_div2, ph->ph_luma_tc_offset_div2); infer(sh_luma_tc_offset_div2, ph->ph_luma_tc_offset_div2);
if (pps->pps_chroma_tool_offsets_present_flag) { infer(sh_cb_beta_offset_div2, ph->ph_cb_beta_offset_div2);
infer(sh_cb_beta_offset_div2, ph->ph_cb_beta_offset_div2); infer(sh_cb_tc_offset_div2, ph->ph_cb_tc_offset_div2);
infer(sh_cb_tc_offset_div2, ph->ph_cb_tc_offset_div2); infer(sh_cr_beta_offset_div2, ph->ph_cr_beta_offset_div2);
infer(sh_cr_beta_offset_div2, ph->ph_cr_beta_offset_div2); infer(sh_cr_tc_offset_div2, ph->ph_cr_tc_offset_div2);
infer(sh_cr_tc_offset_div2, ph->ph_cr_beta_offset_div2);
} else {
infer(sh_cb_beta_offset_div2,
current->sh_luma_beta_offset_div2);
infer(sh_cb_tc_offset_div2, current->sh_luma_tc_offset_div2);
infer(sh_cr_beta_offset_div2,
current->sh_luma_beta_offset_div2);
infer(sh_cr_tc_offset_div2, current->sh_luma_tc_offset_div2);
}
} }
} }