we have to infer sh_collocated_from_l0_flag and sh_collocated_ref_idx from
picture head if pps_rpl_info_in_ph_flag is true
---
libavcodec/cbs_h266_syntax_template.c | 32 +++++++++++++++++----------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/libavcodec/cbs_h266_syntax_template.c
b/libavcodec/cbs_h266_syntax_template.c
index 49fb12ba77..15368502d7 100644
--- a/libavcodec/cbs_h266_syntax_template.c
+++ b/libavcodec/cbs_h266_syntax_template.c
@@ -3219,19 +3219,27 @@ static int FUNC(slice_header) (CodedBitstreamContext
*ctx, RWContext *rw,
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)
{
- 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 &&
- current->num_ref_idx_active[0] > 1) ||
- (!current->sh_collocated_from_l0_flag &&
- current->num_ref_idx_active[1] > 1)) {
- unsigned int idx = current->sh_collocated_from_l0_flag ? 0 : 1;
- ue(sh_collocated_ref_idx, 0, current->num_ref_idx_active[idx]
- 1);
+ if (ph->ph_temporal_mvp_enabled_flag) {
+ if (!pps->pps_rpl_info_in_ph_flag) {
+ 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 &&
+ current->num_ref_idx_active[0] > 1) ||
+ (!current->sh_collocated_from_l0_flag &&
+ current->num_ref_idx_active[1] > 1)) {
+ unsigned int idx = current->sh_collocated_from_l0_flag ? 0
: 1;
+ ue(sh_collocated_ref_idx, 0,
current->num_ref_idx_active[idx] - 1);
+ } else {
+ infer(sh_collocated_ref_idx, 0);
+ }
} else {
- infer(sh_collocated_ref_idx, 0);
+ if (current->sh_slice_type == VVC_SLICE_TYPE_B)
+ infer(sh_collocated_from_l0_flag,
ph->ph_collocated_from_l0_flag);
+ else
+ infer(sh_collocated_from_l0_flag, 1);
+ infer(sh_collocated_ref_idx, ph->ph_collocated_ref_idx);
}
}
if (!pps->pps_wp_info_in_ph_flag &&
--
2.25.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
