| Message ID | TYSPR06MB64332D86739228F739BFE313AA0DA@TYSPR06MB6433.apcprd06.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v2,1/8] cbs_h266: fix inference for sh_lmcs_used_flag and sh_explicit_scaling_list_used_flag | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 8/8/2023 7:58 AM, Nuo Mi wrote: > if sh_picture_header_in_slice_header_flag is true > sh_lmcs_used_flag and sh_explicit_scaling_list_used_flag are infered from ph > > Failed clips: > LMCS: CLM_A_KDDI_2.bit STILL444_A_KDDI_1.bit > Scaling: SCALING_B_InterDigital_1.bit SCALING_A_InterDigital_1.bit > --- > libavcodec/cbs_h266_syntax_template.c | 24 ++++++++++++++---------- > 1 file changed, 14 insertions(+), 10 deletions(-) > > diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c > index 98a8e033bf..857882655b 100644 > --- a/libavcodec/cbs_h266_syntax_template.c > +++ b/libavcodec/cbs_h266_syntax_template.c > @@ -3151,17 +3151,21 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, > infer(sh_alf_enabled_flag, 0); > } > > - if (ph->ph_lmcs_enabled_flag && > - !current->sh_picture_header_in_slice_header_flag) > - flag(sh_lmcs_used_flag); > - else > - infer(sh_lmcs_used_flag, 0); > + if (current->sh_picture_header_in_slice_header_flag) { > + infer(sh_lmcs_used_flag, ph->ph_lmcs_enabled_flag); > + infer(sh_explicit_scaling_list_used_flag, > + ph->ph_explicit_scaling_list_enabled_flag); > + } else { > + if (ph->ph_lmcs_enabled_flag) > + flag(sh_lmcs_used_flag); > + else > + infer(sh_lmcs_used_flag, 0); > > - if (ph->ph_explicit_scaling_list_enabled_flag && > - !current->sh_picture_header_in_slice_header_flag) > - flag(sh_explicit_scaling_list_used_flag); > - else > - infer(sh_explicit_scaling_list_used_flag, 0); > + if (ph->ph_explicit_scaling_list_enabled_flag) > + flag(sh_explicit_scaling_list_used_flag); > + else > + infer(sh_explicit_scaling_list_used_flag, 0); > + } > > if (!pps->pps_rpl_info_in_ph_flag && > ((nal_unit_type != VVC_IDR_W_RADL && Set applied. Thanks.
diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 98a8e033bf..857882655b 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -3151,17 +3151,21 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, infer(sh_alf_enabled_flag, 0); } - if (ph->ph_lmcs_enabled_flag && - !current->sh_picture_header_in_slice_header_flag) - flag(sh_lmcs_used_flag); - else - infer(sh_lmcs_used_flag, 0); + if (current->sh_picture_header_in_slice_header_flag) { + infer(sh_lmcs_used_flag, ph->ph_lmcs_enabled_flag); + infer(sh_explicit_scaling_list_used_flag, + ph->ph_explicit_scaling_list_enabled_flag); + } else { + if (ph->ph_lmcs_enabled_flag) + flag(sh_lmcs_used_flag); + else + infer(sh_lmcs_used_flag, 0); - if (ph->ph_explicit_scaling_list_enabled_flag && - !current->sh_picture_header_in_slice_header_flag) - flag(sh_explicit_scaling_list_used_flag); - else - infer(sh_explicit_scaling_list_used_flag, 0); + if (ph->ph_explicit_scaling_list_enabled_flag) + flag(sh_explicit_scaling_list_used_flag); + else + infer(sh_explicit_scaling_list_used_flag, 0); + } if (!pps->pps_rpl_info_in_ph_flag && ((nal_unit_type != VVC_IDR_W_RADL &&