* [FFmpeg-devel] [PR] avcodec/vvc/inter: Remove always-false/true checks, deduplicate applying averaging (PR #22232)
@ 2026-02-20 19:09 mkver via ffmpeg-devel
0 siblings, 0 replies; only message in thread
From: mkver via ffmpeg-devel @ 2026-02-20 19:09 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: mkver
PR #22232 opened by mkver
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22232
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22232.patch
Further improvements will have to wait for #21790.
>From 97b68f56bcc5e07e4ba7e7815a5a74c93830b8aa Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Fri, 20 Feb 2026 19:49:38 +0100
Subject: [PATCH 1/3] avcodec/vvc/inter: Remove always-false/true checks
derive_weight() is only called when pred_flag is PF_BI,
which only happens in B slices.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/vvc/inter.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c
index 64a9dd1e46..98997837ae 100644
--- a/libavcodec/vvc/inter.c
+++ b/libavcodec/vvc/inter.c
@@ -224,8 +224,8 @@ static int derive_weight(int *denom, int *w0, int *w1, int *o0, int *o1,
const VVCPPS *pps = fc->ps.pps;
const VVCSH *sh = &lc->sc->sh;
const int bcw_idx = mvf->bcw_idx;
- const int weight_flag = (IS_P(sh->r) && pps->r->pps_weighted_pred_flag) ||
- (IS_B(sh->r) && pps->r->pps_weighted_bipred_flag && !dmvr_flag);
+ av_assert2(IS_B(sh->r));
+ const int weight_flag = pps->r->pps_weighted_bipred_flag && !dmvr_flag;
if ((!weight_flag && !bcw_idx) || (bcw_idx && lc->cu->ciip_flag))
return 0;
--
2.52.0
>From fa7d8b976ee44ebd347b39c3fbbb85cdbcd29bb1 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Fri, 20 Feb 2026 19:51:42 +0100
Subject: [PATCH 2/3] avcodec/vvc/inter: Remove redundant variable, fix
shadowing
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/vvc/inter.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c
index 98997837ae..c259414f56 100644
--- a/libavcodec/vvc/inter.c
+++ b/libavcodec/vvc/inter.c
@@ -235,7 +235,6 @@ static int derive_weight(int *denom, int *w0, int *w1, int *o0, int *o1,
*w0 = 8 - *w1;
*o0 = *o1 = 0;
} else {
- const VVCPPS *pps = fc->ps.pps;
const PredWeightTable *w = pps->r->pps_wp_info_in_ph_flag ? &fc->ps.ph.pwt : &sh->pwt;
*denom = w->log2_denom[c_idx > 0];
--
2.52.0
>From 9ce7420a9fc1d93d64b66be48b9d74eecfa8d6d1 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Fri, 20 Feb 2026 20:02:01 +0100
Subject: [PATCH 3/3] avcodec/vvc/inter: Deduplicate applying averaging
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/vvc/inter.c | 56 +++++++++++++++++-------------------------
1 file changed, 23 insertions(+), 33 deletions(-)
diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c
index c259414f56..85e0665a75 100644
--- a/libavcodec/vvc/inter.c
+++ b/libavcodec/vvc/inter.c
@@ -217,8 +217,9 @@ static int derive_weight_uni(int *denom, int *wx, int *ox,
}
// part of 8.5.6.6 Weighted sample prediction process
-static int derive_weight(int *denom, int *w0, int *w1, int *o0, int *o1,
- const VVCLocalContext *lc, const MvField *mvf, const int c_idx, const int dmvr_flag)
+static void apply_averaging(uint8_t *dst, const ptrdiff_t dst_stride,
+ const int16_t *src0, const int16_t *src1, int width, int height,
+ const VVCLocalContext *lc, const MvField *mvf, const int c_idx, const int dmvr_flag)
{
const VVCFrameContext *fc = lc->fc;
const VVCPPS *pps = fc->ps.pps;
@@ -226,24 +227,27 @@ static int derive_weight(int *denom, int *w0, int *w1, int *o0, int *o1,
const int bcw_idx = mvf->bcw_idx;
av_assert2(IS_B(sh->r));
const int weight_flag = pps->r->pps_weighted_bipred_flag && !dmvr_flag;
- if ((!weight_flag && !bcw_idx) || (bcw_idx && lc->cu->ciip_flag))
- return 0;
+ if ((!weight_flag && !bcw_idx) || (bcw_idx && lc->cu->ciip_flag)) {
+ fc->vvcdsp.inter.avg(dst, dst_stride, src0, src1, width, height);
+ return;
+ }
+ int denom, w0, w1, o1, o2;
if (bcw_idx) {
- *denom = 2;
- *w1 = bcw_w_lut[bcw_idx];
- *w0 = 8 - *w1;
- *o0 = *o1 = 0;
+ denom = 2;
+ w1 = bcw_w_lut[bcw_idx];
+ w0 = 8 - w1;
+ o1 = o2 = 0;
} else {
const PredWeightTable *w = pps->r->pps_wp_info_in_ph_flag ? &fc->ps.ph.pwt : &sh->pwt;
- *denom = w->log2_denom[c_idx > 0];
- *w0 = w->weight[L0][c_idx][mvf->ref_idx[L0]];
- *w1 = w->weight[L1][c_idx][mvf->ref_idx[L1]];
- *o0 = w->offset[L0][c_idx][mvf->ref_idx[L0]];
- *o1 = w->offset[L1][c_idx][mvf->ref_idx[L1]];
+ denom = w->log2_denom[c_idx > 0];
+ w0 = w->weight[L0][c_idx][mvf->ref_idx[L0]];
+ w1 = w->weight[L1][c_idx][mvf->ref_idx[L1]];
+ o1 = w->offset[L0][c_idx][mvf->ref_idx[L0]];
+ o2 = w->offset[L1][c_idx][mvf->ref_idx[L1]];
}
- return 1;
+ fc->vvcdsp.inter.w_avg(dst, dst_stride, src0, src1, width, height, denom, w0, w1, o1, o2);
}
#define INTER_FILTER(t, frac) (is_chroma ? ff_vvc_inter_chroma_filters[t][frac] : ff_vvc_inter_luma_filters[t][frac])
@@ -320,8 +324,6 @@ static void mc_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride,
const int idx = av_log2(block_w) - 1;
const VVCFrame *refs[] = { ref0, ref1 };
int16_t *tmp[] = { lc->tmp + sb_bdof_flag * PROF_TEMP_OFFSET, lc->tmp1 + sb_bdof_flag * PROF_TEMP_OFFSET };
- int denom, w0, w1, o0, o1;
- const int weight_flag = derive_weight(&denom, &w0, &w1, &o0, &o1, lc, mvf, c_idx, pu->dmvr_flag);
const int is_chroma = !!c_idx;
const int hpel_if_idx = is_chroma ? 0 : pu->mi.hpel_if_idx;
@@ -352,10 +354,9 @@ static void mc_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride,
}
if (sb_bdof_flag)
fc->vvcdsp.inter.apply_bdof(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h);
- else if (weight_flag)
- fc->vvcdsp.inter.w_avg(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h, denom, w0, w1, o0, o1);
else
- fc->vvcdsp.inter.avg(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h);
+ apply_averaging(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h,
+ lc, mvf, c_idx, pu->dmvr_flag);
}
static const int8_t* inter_filter_scaled(const int scale, const int is_chroma, const int is_affine)
@@ -468,9 +469,6 @@ static void mc_bi_scaled(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_
const VVCRefPic *refp0, const VVCRefPic *refp1, const MvField *mvf,
const int x_off, const int y_off, const int block_w, const int block_h, const int c_idx)
{
- int denom, w0, w1, o0, o1;
- const VVCFrameContext *fc = lc->fc;
- const int weight_flag = derive_weight(&denom, &w0, &w1, &o0, &o1, lc, mvf, c_idx, lc->cu->pu.dmvr_flag);
const VVCRefPic *refps[] = { refp0, refp1 };
int16_t *tmp[] = { lc->tmp, lc->tmp1 };
@@ -483,10 +481,8 @@ static void mc_bi_scaled(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_
else
mc(lc, tmp[i], refp->ref, mv, x_off, y_off, block_w, block_h, c_idx);
}
- if (weight_flag)
- fc->vvcdsp.inter.w_avg(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h, denom, w0, w1, o0, o1);
- else
- fc->vvcdsp.inter.avg(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h);
+ apply_averaging(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h,
+ lc, mvf, c_idx, lc->cu->pu.dmvr_flag);
}
static void luma_prof_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride,
@@ -560,11 +556,8 @@ static void luma_prof_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_
const VVCRefPic *ref0, const VVCRefPic *ref1, const MvField *mvf, const int x_off, const int y_off,
const int block_w, const int block_h)
{
- const VVCFrameContext *fc = lc->fc;
const VVCRefPic *refps[] = { ref0, ref1 };
int16_t *tmp[] = { lc->tmp, lc->tmp1 };
- int denom, w0, w1, o0, o1;
- const int weight_flag = derive_weight(&denom, &w0, &w1, &o0, &o1, lc, mvf, LUMA, 0);
for (int i = L0; i <= L1; i++) {
const VVCRefPic *refp = refps[i];
@@ -576,10 +569,7 @@ static void luma_prof_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_
luma_prof(lc, tmp[i], refp->ref, mv, x_off, y_off, block_w, block_h, i);
}
- if (weight_flag)
- fc->vvcdsp.inter.w_avg(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h, denom, w0, w1, o0, o1);
- else
- fc->vvcdsp.inter.avg(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h);
+ apply_averaging(dst, dst_stride, tmp[L0], tmp[L1], block_w, block_h, lc, mvf, LUMA, 0);
}
static int pred_get_refs(const VVCLocalContext *lc, VVCRefPic *refp[2], const MvField *mv)
--
2.52.0
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-02-20 19:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-02-20 19:09 [FFmpeg-devel] [PR] avcodec/vvc/inter: Remove always-false/true checks, deduplicate applying averaging (PR #22232) mkver via ffmpeg-devel
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git