* [FFmpeg-devel] [PATCH 2/5] avcodec/vvcdec: misc, move src offset inside emulated_edge
[not found] <20240603125117.10791-1-nuomi2021@gmail.com>
@ 2024-06-03 12:51 ` Nuo Mi
2024-06-03 12:51 ` [FFmpeg-devel] [PATCH 3/5] avcodec/vvcdec: refact out emulated_edge_no_wrap Nuo Mi
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Nuo Mi @ 2024-06-03 12:51 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: benjamin.bross, Nuo Mi
---
libavcodec/vvc/inter.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c
index 0843c99eb6..07b55c4bac 100644
--- a/libavcodec/vvc/inter.c
+++ b/libavcodec/vvc/inter.c
@@ -57,6 +57,8 @@ static void emulated_edge(const VVCLocalContext *lc, uint8_t *dst,
const int dmvr_clip = x_sb != x_off || y_sb != y_off;
int pic_width, pic_height;
+ *src += y_off * *src_stride + (x_off * (1 << fc->ps.sps->pixel_shift));
+
subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_chroma);
subpic_offset(&x_sb, &y_sb, sps, pps, subpic_idx, is_chroma);
subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_chroma);
@@ -170,7 +172,6 @@ static void mc(VVCLocalContext *lc, int16_t *dst, const VVCFrame *ref, const Mv
x_off += mv->x >> (4 + hs);
y_off += mv->y >> (4 + vs);
- src += y_off * src_stride + (x_off * (1 << fc->ps.sps->pixel_shift));
MC_EMULATED_EDGE(lc->edge_emu_buffer, &src, &src_stride, x_off, y_off);
fc->vvcdsp.inter.put[is_chroma][idx][!!my][!!mx](dst, src, src_stride, block_h, hf, vf, block_w);
@@ -199,7 +200,6 @@ static void mc_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride
x_off += mv->x >> (4 + hs);
y_off += mv->y >> (4 + vs);
- src += y_off * src_stride + (x_off * (1 << fc->ps.sps->pixel_shift));
MC_EMULATED_EDGE(lc->edge_emu_buffer, &src, &src_stride, x_off, y_off);
if (derive_weight_uni(&denom, &wx, &ox, lc, mvf, c_idx)) {
@@ -236,7 +236,7 @@ static void mc_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride,
const int oy = y_off + (mv->y >> (4 + vs));
const VVCFrame *ref = refs[i];
ptrdiff_t src_stride = ref->frame->linesize[c_idx];
- const uint8_t *src = ref->frame->data[c_idx] + oy * src_stride + (ox * (1 << fc->ps.sps->pixel_shift));
+ const uint8_t *src = ref->frame->data[c_idx];
const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
@@ -306,7 +306,6 @@ static void scaled_ref_pos_and_step(const VVCLocalContext *lc, const VVCRefPic *
static void emulated_edge_scaled(VVCLocalContext *lc, const uint8_t **src, ptrdiff_t *src_stride, int *src_height,
const VVCFrame *ref, const int x, const int y, const int dx, const int dy, const int w, const int h, const int is_chroma)
{
- const VVCFrameContext *fc = lc->fc;
const int x_off = SCALED_INT(x);
const int y_off = SCALED_INT(y);
const int x_end = SCALED_INT(x + w * dx);
@@ -316,8 +315,6 @@ static void emulated_edge_scaled(VVCLocalContext *lc, const uint8_t **src, ptrdi
const int block_w = x_end - x_off + (x_end == x_last);
const int block_h = *src_height = y_end - y_off + (y_end == y_last);
- *src += y_off * *src_stride + (x_off * (1 << fc->ps.sps->pixel_shift));
-
MC_EMULATED_EDGE(lc->edge_emu_buffer, src, src_stride, x_off, y_off);
}
@@ -414,7 +411,6 @@ static void luma_prof_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst
x_off += mv->x >> 4;
y_off += mv->y >> 4;
- src += y_off * src_stride + (x_off * (1 << fc->ps.sps->pixel_shift));
MC_EMULATED_EDGE(lc->edge_emu_buffer, &src, &src_stride, x_off, y_off);
if (cb_prof_flag) {
@@ -444,8 +440,8 @@ static void luma_prof(VVCLocalContext *lc, int16_t *dst, const VVCFrame *ref,
const int idx = av_log2(block_w) - 1;
const int is_chroma = 0;
uint16_t *prof_tmp = lc->tmp2 + PROF_TEMP_OFFSET;
- ptrdiff_t src_stride = ref->frame->linesize[0];
- const uint8_t *src = ref->frame->data[0] + oy * src_stride + (ox * (1 << fc->ps.sps->pixel_shift));
+ ptrdiff_t src_stride = ref->frame->linesize[LUMA];
+ const uint8_t *src = ref->frame->data[LUMA];
const int8_t *hf = ff_vvc_inter_luma_filters[VVC_INTER_LUMA_FILTER_TYPE_AFFINE][mx];
const int8_t *vf = ff_vvc_inter_luma_filters[VVC_INTER_LUMA_FILTER_TYPE_AFFINE][my];
@@ -704,7 +700,7 @@ static void dmvr_mv_refine(VVCLocalContext *lc, MvField *mvf, MvField *orig_mv,
const int oy = y_off + (mv->y >> 4) - sr_range;
const VVCFrame *ref = refs[i];
ptrdiff_t src_stride = ref->frame->linesize[LUMA];
- const uint8_t *src = ref->frame->data[LUMA] + oy * src_stride + (ox * (1 << fc->ps.sps->pixel_shift));
+ const uint8_t *src = ref->frame->data[LUMA];
MC_EMULATED_EDGE_BILINEAR(lc->edge_emu_buffer, &src, &src_stride, ox, oy);
fc->vvcdsp.inter.dmvr[!!my][!!mx](tmp[i], src, src_stride, pred_h, mx, my, pred_w);
}
--
2.34.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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread* [FFmpeg-devel] [PATCH 3/5] avcodec/vvcdec: refact out emulated_edge_no_wrap
[not found] <20240603125117.10791-1-nuomi2021@gmail.com>
2024-06-03 12:51 ` [FFmpeg-devel] [PATCH 2/5] avcodec/vvcdec: misc, move src offset inside emulated_edge Nuo Mi
@ 2024-06-03 12:51 ` Nuo Mi
2024-06-03 12:51 ` [FFmpeg-devel] [PATCH 4/5] avcodec/vvcdec: misc, reindent inter.c Nuo Mi
2024-06-03 12:51 ` [FFmpeg-devel] [PATCH 5/5] avcodec/vvcdec: support mv wraparound Nuo Mi
3 siblings, 0 replies; 6+ messages in thread
From: Nuo Mi @ 2024-06-03 12:51 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: benjamin.bross, Nuo Mi
prepare for refrence wraparound
---
libavcodec/vvc/inter.c | 91 ++++++++++++++++++++++++++++--------------
1 file changed, 61 insertions(+), 30 deletions(-)
diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c
index 07b55c4bac..aacd5d8da0 100644
--- a/libavcodec/vvc/inter.c
+++ b/libavcodec/vvc/inter.c
@@ -30,46 +30,53 @@
#define PROF_TEMP_OFFSET (MAX_PB_SIZE + 32)
static const int bcw_w_lut[] = {4, 5, 3, 10, -2};
-static void subpic_offset(int *x_off, int *y_off,
- const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_chroma)
+typedef struct VVCRect {
+ int l; // left
+ int t; // top
+ int r; // right
+ int b; // bottom
+} VVCRect;
+
+static void subpic_get_rect(VVCRect *r, const VVCFrame *src_frame, const int subpic_idx, const int is_chroma)
{
- *x_off -= pps->subpic_x[subpic_idx] >> sps->hshift[is_chroma];
- *y_off -= pps->subpic_y[subpic_idx] >> sps->vshift[is_chroma];
+ const VVCSPS *sps = src_frame->sps;
+ const VVCPPS *pps = src_frame->pps;
+ const int hs = sps->hshift[is_chroma];
+ const int vs = sps->vshift[is_chroma];
+
+ r->l = pps->subpic_x[subpic_idx] >> hs;
+ r->t = pps->subpic_y[subpic_idx] >> vs;
+ r->r = r->l + (pps->subpic_width[subpic_idx] >> hs);
+ r->b = r->t + (pps->subpic_height[subpic_idx] >> vs);
}
-static void subpic_width_height(int *pic_width, int *pic_height,
- const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_chroma)
+// clip to subblock and subpicture process in 8.5.6.3.2 Luma sample interpolation filtering process
+static void clip_to_subpic(int *x_off, int *y_off, int *pic_width, int *pic_height, const VVCRect *subpic, const VVCRect *sb, const int dmvr_clip)
{
- *pic_width = pps->subpic_width[subpic_idx] >> sps->hshift[is_chroma];
- *pic_height = pps->subpic_height[subpic_idx] >> sps->vshift[is_chroma];
+ const int l = dmvr_clip ? FFMIN(FFMAX(subpic->l, sb->l), subpic->r - 1) : subpic->l;
+ const int t = dmvr_clip ? FFMIN(FFMAX(subpic->t, sb->t), subpic->b - 1) : subpic->t;
+ const int r = dmvr_clip ? FFMAX(FFMIN(subpic->r, sb->r), subpic->l + 1) : subpic->r;
+ const int b = dmvr_clip ? FFMAX(FFMIN(subpic->b, sb->b), subpic->t + 1) : subpic->b;
+
+ *x_off -= l;
+ *y_off -= t;
+ *pic_width = r - l;
+ *pic_height = b - t;
}
-static void emulated_edge(const VVCLocalContext *lc, uint8_t *dst,
- const uint8_t **src, ptrdiff_t *src_stride, const VVCFrame *src_frame,
- int x_sb, int y_sb, int x_off, int y_off, const int block_w, const int block_h,
- const int is_chroma, const int extra_before, const int extra_after)
+static void emulated_edge_no_wrap(const VVCLocalContext *lc, uint8_t *dst,
+ const uint8_t **src, ptrdiff_t *src_stride,
+ int x_off, int y_off, const int block_w, const int block_h,
+ const int extra_before, const int extra_after,
+ const VVCRect *subpic, const VVCRect *sb, const int dmvr_clip)
{
const VVCFrameContext *fc = lc->fc;
- const VVCSPS *sps = src_frame->sps;
- const VVCPPS *pps = src_frame->pps;
- const int subpic_idx = lc->sc->sh.r->curr_subpic_idx;
const int extra = extra_before + extra_after;
- const int dmvr_clip = x_sb != x_off || y_sb != y_off;
int pic_width, pic_height;
*src += y_off * *src_stride + (x_off * (1 << fc->ps.sps->pixel_shift));
- subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_chroma);
- subpic_offset(&x_sb, &y_sb, sps, pps, subpic_idx, is_chroma);
- subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_chroma);
- if (dmvr_clip) {
- const int start_x = FFMIN(FFMAX(x_sb - extra_before, 0), pic_width - 1);
- const int start_y = FFMIN(FFMAX(y_sb - extra_before, 0), pic_height - 1);
- pic_width = FFMAX(FFMIN(pic_width, x_sb + block_w + extra_after) - start_x, 1);
- pic_height = FFMAX(FFMIN(pic_height, y_sb + block_h + extra_after) - start_y, 1);
- x_off -= start_x;
- y_off -= start_y;
- }
+ clip_to_subpic(&x_off, &y_off, &pic_width, &pic_height, subpic, sb, dmvr_clip);
if (dmvr_clip || x_off < extra_before || y_off < extra_before ||
x_off >= pic_width - block_w - extra_after ||
@@ -88,16 +95,32 @@ static void emulated_edge(const VVCLocalContext *lc, uint8_t *dst,
}
}
+static void emulated_edge(const VVCLocalContext *lc, uint8_t *dst,
+ const uint8_t **src, ptrdiff_t *src_stride, const VVCFrame *src_frame,
+ int x_sb, int y_sb, int x_off, int y_off, int block_w, int block_h, const int wrap_enabled,
+ const int is_chroma, const int extra_before, const int extra_after)
+{
+ const int subpic_idx = lc->sc->sh.r->curr_subpic_idx;
+ const int dmvr_clip = x_sb != x_off || y_sb != y_off;
+ VVCRect sb = { x_sb - extra_before, y_sb - extra_before, x_sb + block_w + extra_after, y_sb + block_h + extra_after };
+ VVCRect subpic;
+
+ subpic_get_rect(&subpic, src_frame, subpic_idx, is_chroma);
+
+ return emulated_edge_no_wrap(lc, dst, src, src_stride,
+ x_off, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip);
+}
+
#define MC_EMULATED_EDGE(dst, src, src_stride, x_off, y_off) \
- emulated_edge(lc, dst, src, src_stride, ref, x_off, y_off, x_off, y_off, block_w, block_h, is_chroma, \
+ emulated_edge(lc, dst, src, src_stride, ref, x_off, y_off, x_off, y_off, block_w, block_h, wrap_enabled, is_chroma, \
is_chroma ? CHROMA_EXTRA_BEFORE : LUMA_EXTRA_BEFORE, is_chroma ? CHROMA_EXTRA_AFTER : LUMA_EXTRA_AFTER)
#define MC_EMULATED_EDGE_DMVR(dst, src, src_stride, x_sb, y_sb, x_off, y_off) \
- emulated_edge(lc, dst, src, src_stride, ref, x_sb, y_sb, x_off, y_off, block_w, block_h, is_chroma, \
+ emulated_edge(lc, dst, src, src_stride, ref, x_sb, y_sb, x_off, y_off, block_w, block_h, wrap_enabled, is_chroma, \
is_chroma ? CHROMA_EXTRA_BEFORE : LUMA_EXTRA_BEFORE, is_chroma ? CHROMA_EXTRA_AFTER : LUMA_EXTRA_AFTER)
#define MC_EMULATED_EDGE_BILINEAR(dst, src, src_stride, x_off, y_off) \
- emulated_edge(lc, dst, src, src_stride, ref, x_off, y_off, x_off, y_off, pred_w, pred_h, 0, \
+ emulated_edge(lc, dst, src, src_stride, ref, x_off, y_off, x_off, y_off, pred_w, pred_h, wrap_enabled, 0, \
BILINEAR_EXTRA_BEFORE, BILINEAR_EXTRA_AFTER)
// part of 8.5.6.6 Weighted sample prediction process
@@ -169,6 +192,7 @@ static void mc(VVCLocalContext *lc, int16_t *dst, const VVCFrame *ref, const Mv
const int hpel_if_idx = (is_chroma || pu->merge_gpm_flag) ? 0 : pu->mi.hpel_if_idx;
const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
x_off += mv->x >> (4 + hs);
y_off += mv->y >> (4 + vs);
@@ -196,6 +220,7 @@ static void mc_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride
const int hpel_if_idx = is_chroma ? 0 : pu->mi.hpel_if_idx;
const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
int denom, wx, ox;
x_off += mv->x >> (4 + hs);
@@ -239,6 +264,7 @@ static void mc_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride,
const uint8_t *src = ref->frame->data[c_idx];
const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
if (pu->dmvr_flag) {
const int x_sb = x_off + (orig_mv->mv[i].x >> (4 + hs));
@@ -314,6 +340,7 @@ static void emulated_edge_scaled(VVCLocalContext *lc, const uint8_t **src, ptrdi
const int y_last = SCALED_INT(y + (h - 1) * dy);
const int block_w = x_end - x_off + (x_end == x_last);
const int block_h = *src_height = y_end - y_off + (y_end == y_last);
+ const int wrap_enabled = 0;
MC_EMULATED_EDGE(lc->edge_emu_buffer, src, src_stride, x_off, y_off);
}
@@ -407,6 +434,7 @@ static void luma_prof_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst
const int8_t *vf = ff_vvc_inter_luma_filters[VVC_INTER_LUMA_FILTER_TYPE_AFFINE][my];
int denom, wx, ox;
const int weight_flag = derive_weight_uni(&denom, &wx, &ox, lc, mvf, LUMA);
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
const int is_chroma = 0;
x_off += mv->x >> 4;
@@ -444,6 +472,7 @@ static void luma_prof(VVCLocalContext *lc, int16_t *dst, const VVCFrame *ref,
const uint8_t *src = ref->frame->data[LUMA];
const int8_t *hf = ff_vvc_inter_luma_filters[VVC_INTER_LUMA_FILTER_TYPE_AFFINE][mx];
const int8_t *vf = ff_vvc_inter_luma_filters[VVC_INTER_LUMA_FILTER_TYPE_AFFINE][my];
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
MC_EMULATED_EDGE(lc->edge_emu_buffer, &src, &src_stride, ox, oy);
if (!pu->cb_prof_flag[lx]) {
@@ -701,6 +730,8 @@ static void dmvr_mv_refine(VVCLocalContext *lc, MvField *mvf, MvField *orig_mv,
const VVCFrame *ref = refs[i];
ptrdiff_t src_stride = ref->frame->linesize[LUMA];
const uint8_t *src = ref->frame->data[LUMA];
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
+
MC_EMULATED_EDGE_BILINEAR(lc->edge_emu_buffer, &src, &src_stride, ox, oy);
fc->vvcdsp.inter.dmvr[!!my][!!mx](tmp[i], src, src_stride, pred_h, mx, my, pred_w);
}
--
2.34.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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread* [FFmpeg-devel] [PATCH 4/5] avcodec/vvcdec: misc, reindent inter.c
[not found] <20240603125117.10791-1-nuomi2021@gmail.com>
2024-06-03 12:51 ` [FFmpeg-devel] [PATCH 2/5] avcodec/vvcdec: misc, move src offset inside emulated_edge Nuo Mi
2024-06-03 12:51 ` [FFmpeg-devel] [PATCH 3/5] avcodec/vvcdec: refact out emulated_edge_no_wrap Nuo Mi
@ 2024-06-03 12:51 ` Nuo Mi
2024-06-03 12:51 ` [FFmpeg-devel] [PATCH 5/5] avcodec/vvcdec: support mv wraparound Nuo Mi
3 siblings, 0 replies; 6+ messages in thread
From: Nuo Mi @ 2024-06-03 12:51 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: benjamin.bross, Nuo Mi
---
libavcodec/vvc/inter.c | 278 ++++++++++++++++++++---------------------
1 file changed, 139 insertions(+), 139 deletions(-)
diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c
index aacd5d8da0..09575eb2b4 100644
--- a/libavcodec/vvc/inter.c
+++ b/libavcodec/vvc/inter.c
@@ -127,14 +127,14 @@ static void emulated_edge(const VVCLocalContext *lc, uint8_t *dst,
static int derive_weight_uni(int *denom, int *wx, int *ox,
const VVCLocalContext *lc, const MvField *mvf, const int c_idx)
{
- const VVCFrameContext *fc = lc->fc;
- const VVCPPS *pps = fc->ps.pps;
- const VVCSH *sh = &lc->sc->sh;
- const int weight_flag = (IS_P(sh->r) && pps->r->pps_weighted_pred_flag) ||
+ const VVCFrameContext *fc = lc->fc;
+ const VVCPPS *pps = fc->ps.pps;
+ const VVCSH *sh = &lc->sc->sh;
+ const int weight_flag = (IS_P(sh->r) && pps->r->pps_weighted_pred_flag) ||
(IS_B(sh->r) && pps->r->pps_weighted_bipred_flag);
if (weight_flag) {
- const int lx = mvf->pred_flag - PF_L0;
- const PredWeightTable *w = pps->r->pps_wp_info_in_ph_flag ? &fc->ps.ph.pwt : &sh->pwt;
+ const int lx = mvf->pred_flag - PF_L0;
+ const PredWeightTable *w = pps->r->pps_wp_info_in_ph_flag ? &fc->ps.ph.pwt : &sh->pwt;
*denom = w->log2_denom[c_idx > 0];
*wx = w->weight[lx][c_idx][mvf->ref_idx[lx]];
@@ -147,11 +147,11 @@ static int derive_weight_uni(int *denom, int *wx, int *ox,
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)
{
- const VVCFrameContext *fc = lc->fc;
- 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) ||
+ const VVCFrameContext *fc = lc->fc;
+ 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);
if ((!weight_flag && !bcw_idx) || (bcw_idx && lc->cu->ciip_flag))
return 0;
@@ -162,7 +162,7 @@ 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 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];
@@ -179,20 +179,20 @@ static int derive_weight(int *denom, int *w0, int *w1, int *o0, int *o1,
static void mc(VVCLocalContext *lc, int16_t *dst, const VVCFrame *ref, const Mv *mv,
int x_off, int y_off, const int block_w, const int block_h, const int c_idx)
{
- const VVCFrameContext *fc = lc->fc;
- const PredictionUnit *pu = &lc->cu->pu;
- const uint8_t *src = ref->frame->data[c_idx];
- ptrdiff_t src_stride = ref->frame->linesize[c_idx];
- const int is_chroma = !!c_idx;
- const int hs = fc->ps.sps->hshift[c_idx];
- const int vs = fc->ps.sps->vshift[c_idx];
- const int idx = av_log2(block_w) - 1;
- const intptr_t mx = av_mod_uintp2(mv->x, 4 + hs) << (is_chroma - hs);
- const intptr_t my = av_mod_uintp2(mv->y, 4 + vs) << (is_chroma - vs);
- const int hpel_if_idx = (is_chroma || pu->merge_gpm_flag) ? 0 : pu->mi.hpel_if_idx;
- const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
- const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
- const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
+ const VVCFrameContext *fc = lc->fc;
+ const PredictionUnit *pu = &lc->cu->pu;
+ const uint8_t *src = ref->frame->data[c_idx];
+ ptrdiff_t src_stride = ref->frame->linesize[c_idx];
+ const int is_chroma = !!c_idx;
+ const int hs = fc->ps.sps->hshift[c_idx];
+ const int vs = fc->ps.sps->vshift[c_idx];
+ const int idx = av_log2(block_w) - 1;
+ const intptr_t mx = av_mod_uintp2(mv->x, 4 + hs) << (is_chroma - hs);
+ const intptr_t my = av_mod_uintp2(mv->y, 4 + vs) << (is_chroma - vs);
+ const int hpel_if_idx = (is_chroma || pu->merge_gpm_flag) ? 0 : pu->mi.hpel_if_idx;
+ const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
+ const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
x_off += mv->x >> (4 + hs);
y_off += mv->y >> (4 + vs);
@@ -205,22 +205,22 @@ static void mc_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride
const VVCFrame *ref, const MvField *mvf, int x_off, int y_off, const int block_w, const int block_h,
const int c_idx)
{
- const VVCFrameContext *fc = lc->fc;
- const PredictionUnit *pu = &lc->cu->pu;
- const uint8_t *src = ref->frame->data[c_idx];
- ptrdiff_t src_stride = ref->frame->linesize[c_idx];
- const int lx = mvf->pred_flag - PF_L0;
- const int hs = fc->ps.sps->hshift[c_idx];
- const int vs = fc->ps.sps->vshift[c_idx];
- const int idx = av_log2(block_w) - 1;
- const Mv *mv = &mvf->mv[lx];
- const int is_chroma = !!c_idx;
- const intptr_t mx = av_mod_uintp2(mv->x, 4 + hs) << (is_chroma - hs);
- const intptr_t my = av_mod_uintp2(mv->y, 4 + vs) << (is_chroma - vs);
- const int hpel_if_idx = is_chroma ? 0 : pu->mi.hpel_if_idx;
- const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
- const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
- const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
+ const VVCFrameContext *fc = lc->fc;
+ const PredictionUnit *pu = &lc->cu->pu;
+ const uint8_t *src = ref->frame->data[c_idx];
+ ptrdiff_t src_stride = ref->frame->linesize[c_idx];
+ const int lx = mvf->pred_flag - PF_L0;
+ const int hs = fc->ps.sps->hshift[c_idx];
+ const int vs = fc->ps.sps->vshift[c_idx];
+ const int idx = av_log2(block_w) - 1;
+ const Mv *mv = &mvf->mv[lx];
+ const int is_chroma = !!c_idx;
+ const intptr_t mx = av_mod_uintp2(mv->x, 4 + hs) << (is_chroma - hs);
+ const intptr_t my = av_mod_uintp2(mv->y, 4 + vs) << (is_chroma - vs);
+ const int hpel_if_idx = is_chroma ? 0 : pu->mi.hpel_if_idx;
+ const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
+ const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
int denom, wx, ox;
x_off += mv->x >> (4 + hs);
@@ -241,30 +241,30 @@ static void mc_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride,
const int x_off, const int y_off, const int block_w, const int block_h, const int c_idx,
const int sb_bdof_flag)
{
- const VVCFrameContext *fc = lc->fc;
- const PredictionUnit *pu = &lc->cu->pu;
- const int hs = fc->ps.sps->hshift[c_idx];
- const int vs = fc->ps.sps->vshift[c_idx];
- 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 };
+ const VVCFrameContext *fc = lc->fc;
+ const PredictionUnit *pu = &lc->cu->pu;
+ const int hs = fc->ps.sps->hshift[c_idx];
+ const int vs = fc->ps.sps->vshift[c_idx];
+ 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;
+ 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;
for (int i = L0; i <= L1; i++) {
- const Mv *mv = mvf->mv + i;
- const int mx = av_mod_uintp2(mv->x, 4 + hs) << (is_chroma - hs);
- const int my = av_mod_uintp2(mv->y, 4 + vs) << (is_chroma - vs);
- const int ox = x_off + (mv->x >> (4 + hs));
- const int oy = y_off + (mv->y >> (4 + vs));
- const VVCFrame *ref = refs[i];
- ptrdiff_t src_stride = ref->frame->linesize[c_idx];
- const uint8_t *src = ref->frame->data[c_idx];
- const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
- const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
- const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
+ const Mv *mv = mvf->mv + i;
+ const int mx = av_mod_uintp2(mv->x, 4 + hs) << (is_chroma - hs);
+ const int my = av_mod_uintp2(mv->y, 4 + vs) << (is_chroma - vs);
+ const int ox = x_off + (mv->x >> (4 + hs));
+ const int oy = y_off + (mv->y >> (4 + vs));
+ const VVCFrame *ref = refs[i];
+ ptrdiff_t src_stride = ref->frame->linesize[c_idx];
+ const uint8_t *src = ref->frame->data[c_idx];
+ const int8_t *hf = INTER_FILTER(hpel_if_idx, mx);
+ const int8_t *vf = INTER_FILTER(hpel_if_idx, my);
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
if (pu->dmvr_flag) {
const int x_sb = x_off + (orig_mv->mv[i].x >> (4 + hs));
@@ -332,15 +332,15 @@ static void scaled_ref_pos_and_step(const VVCLocalContext *lc, const VVCRefPic *
static void emulated_edge_scaled(VVCLocalContext *lc, const uint8_t **src, ptrdiff_t *src_stride, int *src_height,
const VVCFrame *ref, const int x, const int y, const int dx, const int dy, const int w, const int h, const int is_chroma)
{
- const int x_off = SCALED_INT(x);
- const int y_off = SCALED_INT(y);
- const int x_end = SCALED_INT(x + w * dx);
- const int y_end = SCALED_INT(y + h * dy);
- const int x_last = SCALED_INT(x + (w - 1) * dx);
- const int y_last = SCALED_INT(y + (h - 1) * dy);
- const int block_w = x_end - x_off + (x_end == x_last);
- const int block_h = *src_height = y_end - y_off + (y_end == y_last);
- const int wrap_enabled = 0;
+ const int x_off = SCALED_INT(x);
+ const int y_off = SCALED_INT(y);
+ const int x_end = SCALED_INT(x + w * dx);
+ const int y_end = SCALED_INT(y + h * dy);
+ const int x_last = SCALED_INT(x + (w - 1) * dx);
+ const int y_last = SCALED_INT(y + (h - 1) * dy);
+ const int block_w = x_end - x_off + (x_end == x_last);
+ const int block_h = *src_height = y_end - y_off + (y_end == y_last);
+ const int wrap_enabled = 0;
MC_EMULATED_EDGE(lc->edge_emu_buffer, src, src_stride, x_off, y_off);
}
@@ -421,21 +421,21 @@ static void luma_prof_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst
const VVCFrame *ref, const MvField *mvf, int x_off, int y_off, const int block_w, const int block_h,
const int cb_prof_flag, const int16_t *diff_mv_x, const int16_t *diff_mv_y)
{
- const VVCFrameContext *fc = lc->fc;
- const uint8_t *src = ref->frame->data[LUMA];
- ptrdiff_t src_stride = ref->frame->linesize[LUMA];
- uint16_t *prof_tmp = lc->tmp + PROF_TEMP_OFFSET;
- const int idx = av_log2(block_w) - 1;
- const int lx = mvf->pred_flag - PF_L0;
- const Mv *mv = mvf->mv + lx;
- const int mx = mv->x & 0xf;
- const int my = mv->y & 0xf;
- const int8_t *hf = ff_vvc_inter_luma_filters[VVC_INTER_LUMA_FILTER_TYPE_AFFINE][mx];
- const int8_t *vf = ff_vvc_inter_luma_filters[VVC_INTER_LUMA_FILTER_TYPE_AFFINE][my];
+ const VVCFrameContext *fc = lc->fc;
+ const uint8_t *src = ref->frame->data[LUMA];
+ ptrdiff_t src_stride = ref->frame->linesize[LUMA];
+ uint16_t *prof_tmp = lc->tmp + PROF_TEMP_OFFSET;
+ const int idx = av_log2(block_w) - 1;
+ const int lx = mvf->pred_flag - PF_L0;
+ const Mv *mv = mvf->mv + lx;
+ const int mx = mv->x & 0xf;
+ const int my = mv->y & 0xf;
+ const int8_t *hf = ff_vvc_inter_luma_filters[VVC_INTER_LUMA_FILTER_TYPE_AFFINE][mx];
+ const int8_t *vf = ff_vvc_inter_luma_filters[VVC_INTER_LUMA_FILTER_TYPE_AFFINE][my];
int denom, wx, ox;
- const int weight_flag = derive_weight_uni(&denom, &wx, &ox, lc, mvf, LUMA);
- const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
- const int is_chroma = 0;
+ const int weight_flag = derive_weight_uni(&denom, &wx, &ox, lc, mvf, LUMA);
+ const int wrap_enabled = fc->ps.pps->r->pps_ref_wraparound_enabled_flag;
+ const int is_chroma = 0;
x_off += mv->x >> 4;
y_off += mv->y >> 4;
@@ -488,11 +488,11 @@ 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 };
+ 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);
+ 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];
@@ -531,16 +531,16 @@ static int pred_get_refs(const VVCLocalContext *lc, VVCRefPic *refp[2], const Mv
static void pred_gpm_blk(VVCLocalContext *lc)
{
- const VVCFrameContext *fc = lc->fc;
- const CodingUnit *cu = lc->cu;
- const PredictionUnit *pu = &cu->pu;
+ const VVCFrameContext *fc = lc->fc;
+ const CodingUnit *cu = lc->cu;
+ const PredictionUnit *pu = &cu->pu;
const uint8_t angle_idx = ff_vvc_gpm_angle_idx[pu->gpm_partition_idx];
const uint8_t weights_idx = ff_vvc_gpm_angle_to_weights_idx[angle_idx];
- const int w = av_log2(cu->cb_width) - 3;
- const int h = av_log2(cu->cb_height) - 3;
- const uint8_t off_x = ff_vvc_gpm_weights_offset_x[pu->gpm_partition_idx][h][w];
- const uint8_t off_y = ff_vvc_gpm_weights_offset_y[pu->gpm_partition_idx][h][w];
+ const int w = av_log2(cu->cb_width) - 3;
+ const int h = av_log2(cu->cb_height) - 3;
+ const uint8_t off_x = ff_vvc_gpm_weights_offset_x[pu->gpm_partition_idx][h][w];
+ const uint8_t off_y = ff_vvc_gpm_weights_offset_y[pu->gpm_partition_idx][h][w];
const uint8_t mirror_type = ff_vvc_gpm_angle_to_mirror[angle_idx];
const uint8_t *weights;
@@ -549,13 +549,13 @@ static void pred_gpm_blk(VVCLocalContext *lc)
int16_t *tmp[2] = {lc->tmp, lc->tmp1};
for (int c_idx = 0; c_idx < c_end; c_idx++) {
- const int hs = fc->ps.sps->hshift[c_idx];
- const int vs = fc->ps.sps->vshift[c_idx];
- const int x = lc->cu->x0 >> hs;
- const int y = lc->cu->y0 >> vs;
- const int width = cu->cb_width >> hs;
- const int height = cu->cb_height >> vs;
- uint8_t *dst = POS(c_idx, lc->cu->x0, lc->cu->y0);
+ const int hs = fc->ps.sps->hshift[c_idx];
+ const int vs = fc->ps.sps->vshift[c_idx];
+ const int x = lc->cu->x0 >> hs;
+ const int y = lc->cu->y0 >> vs;
+ const int width = cu->cb_width >> hs;
+ const int height = cu->cb_height >> vs;
+ uint8_t *dst = POS(c_idx, lc->cu->x0, lc->cu->y0);
ptrdiff_t dst_stride = fc->frame->linesize[c_idx];
int step_x = 1 << hs;
@@ -572,8 +572,9 @@ static void pred_gpm_blk(VVCLocalContext *lc)
for (int i = 0; i < 2; i++) {
const MvField *mv = pu->gpm_mv + i;
- const int lx = mv->pred_flag - PF_L0;
- VVCRefPic *refp = lc->sc->rpl[lx].refs + mv->ref_idx[lx];
+ const int lx = mv->pred_flag - PF_L0;
+ VVCRefPic *refp = lc->sc->rpl[lx].refs + mv->ref_idx[lx];
+
if (!refp->ref)
return;
if (refp->is_scaled)
@@ -589,15 +590,14 @@ static void pred_gpm_blk(VVCLocalContext *lc)
static int ciip_derive_intra_weight(const VVCLocalContext *lc, const int x0, const int y0,
const int width, const int height)
{
- const VVCFrameContext *fc = lc->fc;
- const VVCSPS *sps = fc->ps.sps;
- const int x0b = av_mod_uintp2(x0, sps->ctb_log2_size_y);
- const int y0b = av_mod_uintp2(y0, sps->ctb_log2_size_y);
- const int available_l = lc->ctb_left_flag || x0b;
- const int available_u = lc->ctb_up_flag || y0b;
- const int min_pu_width = fc->ps.pps->min_pu_width;
-
- int w = 1;
+ const VVCFrameContext *fc = lc->fc;
+ const VVCSPS *sps = fc->ps.sps;
+ const int x0b = av_mod_uintp2(x0, sps->ctb_log2_size_y);
+ const int y0b = av_mod_uintp2(y0, sps->ctb_log2_size_y);
+ const int available_l = lc->ctb_left_flag || x0b;
+ const int available_u = lc->ctb_up_flag || y0b;
+ const int min_pu_width = fc->ps.pps->min_pu_width;
+ int w = 1;
if (available_u &&fc->tab.mvf[((y0 - 1) >> MIN_PU_LOG2) * min_pu_width + ((x0 - 1 + width)>> MIN_PU_LOG2)].pred_flag == PF_INTRA)
w++;
@@ -709,10 +709,10 @@ static int parametric_mv_refine(const int *sad, const int stride)
static void dmvr_mv_refine(VVCLocalContext *lc, MvField *mvf, MvField *orig_mv, int *sb_bdof_flag,
const VVCFrame *ref0, const VVCFrame *ref1, const int x_off, const int y_off, const int block_w, const int block_h)
{
- const VVCFrameContext *fc = lc->fc;
- const int sr_range = 2;
- const VVCFrame *refs[] = { ref0, ref1 };
- int16_t *tmp[] = { lc->tmp, lc->tmp1 };
+ const VVCFrameContext *fc = lc->fc;
+ const int sr_range = 2;
+ const VVCFrame *refs[] = { ref0, ref1 };
+ int16_t *tmp[] = { lc->tmp, lc->tmp1 };
int sad[SAD_ARRAY_SIZE][SAD_ARRAY_SIZE];
int min_dx, min_dy, min_sad, dx, dy;
@@ -808,9 +808,9 @@ static void derive_sb_mv(VVCLocalContext *lc, MvField *mv, MvField *orig_mv, int
static void pred_regular_blk(VVCLocalContext *lc, const int skip_ciip)
{
- const CodingUnit *cu = lc->cu;
- PredictionUnit *pu = &lc->cu->pu;
- const MotionInfo *mi = &pu->mi;
+ const CodingUnit *cu = lc->cu;
+ PredictionUnit *pu = &lc->cu->pu;
+ const MotionInfo *mi = &pu->mi;
MvField mv, orig_mv;
int sbw, sbh, sb_bdof_flag = 0;
@@ -854,17 +854,17 @@ static void derive_affine_mvc(MvField *mvc, const VVCFrameContext *fc, const MvF
static void pred_affine_blk(VVCLocalContext *lc)
{
- const VVCFrameContext *fc = lc->fc;
- const CodingUnit *cu = lc->cu;
- const PredictionUnit *pu = &cu->pu;
- const MotionInfo *mi = &pu->mi;
- const int x0 = cu->x0;
- const int y0 = cu->y0;
- const int sbw = cu->cb_width / mi->num_sb_x;
- const int sbh = cu->cb_height / mi->num_sb_y;
- const int hs = fc->ps.sps->hshift[1];
- const int vs = fc->ps.sps->vshift[1];
- const int dst_stride = fc->frame->linesize[LUMA];
+ const VVCFrameContext *fc = lc->fc;
+ const CodingUnit *cu = lc->cu;
+ const PredictionUnit *pu = &cu->pu;
+ const MotionInfo *mi = &pu->mi;
+ const int x0 = cu->x0;
+ const int y0 = cu->y0;
+ const int sbw = cu->cb_width / mi->num_sb_x;
+ const int sbh = cu->cb_height / mi->num_sb_y;
+ const int hs = fc->ps.sps->hshift[1];
+ const int vs = fc->ps.sps->vshift[1];
+ const int dst_stride = fc->frame->linesize[LUMA];
for (int sby = 0; sby < mi->num_sb_y; sby++) {
for (int sbx = 0; sbx < mi->num_sb_x; sbx++) {
@@ -905,9 +905,9 @@ static void pred_affine_blk(VVCLocalContext *lc)
static void predict_inter(VVCLocalContext *lc)
{
- const VVCFrameContext *fc = lc->fc;
- const CodingUnit *cu = lc->cu;
- const PredictionUnit *pu = &cu->pu;
+ const VVCFrameContext *fc = lc->fc;
+ const CodingUnit *cu = lc->cu;
+ const PredictionUnit *pu = &cu->pu;
if (pu->merge_gpm_flag)
pred_gpm_blk(lc);
@@ -929,9 +929,9 @@ static int has_inter_luma(const CodingUnit *cu)
int ff_vvc_predict_inter(VVCLocalContext *lc, const int rs)
{
- const VVCFrameContext *fc = lc->fc;
- const CTU *ctu = fc->tab.ctus + rs;
- CodingUnit *cu = ctu->cus;
+ const VVCFrameContext *fc = lc->fc;
+ const CTU *ctu = fc->tab.ctus + rs;
+ CodingUnit *cu = ctu->cus;
while (cu) {
lc->cu = cu;
--
2.34.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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread* [FFmpeg-devel] [PATCH 5/5] avcodec/vvcdec: support mv wraparound
[not found] <20240603125117.10791-1-nuomi2021@gmail.com>
` (2 preceding siblings ...)
2024-06-03 12:51 ` [FFmpeg-devel] [PATCH 4/5] avcodec/vvcdec: misc, reindent inter.c Nuo Mi
@ 2024-06-03 12:51 ` Nuo Mi
2024-06-04 0:40 ` Michael Niedermayer
3 siblings, 1 reply; 6+ messages in thread
From: Nuo Mi @ 2024-06-03 12:51 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: benjamin.bross, Nuo Mi
A 360 video specific tool
see https://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=9503377
passed files:
DMVR_A_Huawei_3.bit
WRAP_D_InterDigital_4.bit
WRAP_A_InterDigital_4.bit
WRAP_B_InterDigital_4.bit
WRAP_C_InterDigital_4.bit
ERP_A_MediaTek_3.bit
---
libavcodec/vvc/inter.c | 81 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 79 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c
index 09575eb2b4..98cb43322f 100644
--- a/libavcodec/vvc/inter.c
+++ b/libavcodec/vvc/inter.c
@@ -95,20 +95,97 @@ static void emulated_edge_no_wrap(const VVCLocalContext *lc, uint8_t *dst,
}
}
+static void emulated_half(const VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride,
+ const uint8_t *src, const ptrdiff_t src_stride, const int ps,
+ int x_off, int y_off, const int block_w, const int block_h,
+ const VVCRect *subpic,const VVCRect *half_sb, const int dmvr_clip)
+{
+ const VVCFrameContext *fc = lc->fc;
+ int pic_width, pic_height;
+
+ src += y_off * src_stride + x_off * (1 << ps);
+
+ clip_to_subpic(&x_off, &y_off, &pic_width, &pic_height, subpic, half_sb, dmvr_clip);
+
+ fc->vdsp.emulated_edge_mc(dst, src, dst_stride, src_stride,
+ block_w, block_h, x_off, y_off, pic_width, pic_height);
+}
+
+static void sb_set_lr(VVCRect *sb, const int l, const int r)
+{
+ sb->l = l;
+ sb->r = r;
+}
+
+static void sb_wrap(VVCRect *sb, const int wrap)
+{
+ sb_set_lr(sb, sb->l + wrap, sb->r + wrap);
+}
+
static void emulated_edge(const VVCLocalContext *lc, uint8_t *dst,
const uint8_t **src, ptrdiff_t *src_stride, const VVCFrame *src_frame,
int x_sb, int y_sb, int x_off, int y_off, int block_w, int block_h, const int wrap_enabled,
const int is_chroma, const int extra_before, const int extra_after)
{
+ const VVCSPS *sps = src_frame->sps;
+ const VVCPPS *pps = src_frame->pps;
+ const int ps = sps->pixel_shift;
const int subpic_idx = lc->sc->sh.r->curr_subpic_idx;
+ const int extra = extra_before + extra_after;
const int dmvr_clip = x_sb != x_off || y_sb != y_off;
+ const int dmvr_left = FFMAX(x_off, x_sb) - extra_before;
+ const int dmvr_right = FFMIN(x_off, x_sb) + block_w + extra_after;
+ const int left = x_off - extra_before;
+ const int top = y_off - extra_before;
+ const int pic_width = pps->width >> sps->hshift[is_chroma];
+ const int wrap = pps->ref_wraparound_offset << (sps->min_cb_log2_size_y - sps->hshift[is_chroma]);
+ const ptrdiff_t dst_stride = EDGE_EMU_BUFFER_STRIDE << ps;
VVCRect sb = { x_sb - extra_before, y_sb - extra_before, x_sb + block_w + extra_after, y_sb + block_h + extra_after };
VVCRect subpic;
subpic_get_rect(&subpic, src_frame, subpic_idx, is_chroma);
- return emulated_edge_no_wrap(lc, dst, src, src_stride,
- x_off, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip);
+ if (!wrap_enabled || (dmvr_left >= 0 && dmvr_right <= pic_width)) {
+ return emulated_edge_no_wrap(lc, dst, src, src_stride,
+ x_off, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip);
+ }
+ if (dmvr_right <= 0) {
+ sb_wrap(&sb, wrap);
+ return emulated_edge_no_wrap(lc, dst, src, src_stride,
+ x_off + wrap, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip);
+ }
+ if (dmvr_left >= pic_width) {
+ sb_wrap(&sb, -wrap);
+ return emulated_edge_no_wrap(lc, dst, src, src_stride,
+ x_off - wrap, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip);
+ }
+
+ block_w += extra;
+ block_h += extra;
+
+ // half block are wrapped
+ if (dmvr_left < 0 ) {
+ const int w = -left;
+ VVCRect half_sb = { sb.l + wrap, sb.t, 0 + wrap, sb.b };
+ emulated_half(lc, dst, dst_stride, *src, *src_stride, ps,
+ left + wrap, top, w, block_h, &subpic, &half_sb, dmvr_clip);
+
+ sb_set_lr(&half_sb, 0, sb.r);
+ emulated_half(lc, dst + (w << ps), dst_stride, *src, *src_stride, ps,
+ 0, top, block_w - w, block_h, &subpic, &half_sb, dmvr_clip);
+ } else {
+ const int w = pic_width - left;
+ VVCRect half_sb = { sb.l, sb.t, pic_width, sb.b };
+ emulated_half(lc, dst, dst_stride, *src, *src_stride, ps,
+ left, top, w, block_h, &subpic, &half_sb, dmvr_clip);
+
+ sb_set_lr(&half_sb, pic_width - wrap, sb.r - wrap);
+ emulated_half(lc, dst + (w << ps), dst_stride, *src, *src_stride, ps,
+ pic_width - wrap , top, block_w - w, block_h, &subpic, &half_sb, dmvr_clip);
+ }
+
+ *src = dst + extra_before * dst_stride + (extra_before << ps);
+ *src_stride = dst_stride;
}
#define MC_EMULATED_EDGE(dst, src, src_stride, x_off, y_off) \
--
2.34.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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [FFmpeg-devel] [PATCH 5/5] avcodec/vvcdec: support mv wraparound
2024-06-03 12:51 ` [FFmpeg-devel] [PATCH 5/5] avcodec/vvcdec: support mv wraparound Nuo Mi
@ 2024-06-04 0:40 ` Michael Niedermayer
2024-06-04 12:11 ` Nuo Mi
0 siblings, 1 reply; 6+ messages in thread
From: Michael Niedermayer @ 2024-06-04 0:40 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 2291 bytes --]
On Mon, Jun 03, 2024 at 08:51:16PM +0800, Nuo Mi wrote:
> A 360 video specific tool
> see https://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=9503377
>
> passed files:
> DMVR_A_Huawei_3.bit
> WRAP_D_InterDigital_4.bit
> WRAP_A_InterDigital_4.bit
> WRAP_B_InterDigital_4.bit
> WRAP_C_InterDigital_4.bit
> ERP_A_MediaTek_3.bit
> ---
> libavcodec/vvc/inter.c | 81 ++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 79 insertions(+), 2 deletions(-)
seems to break fate-vvc-conformance-WRAP_A_4, maybe the fate checksums need to be updated ?
TEST vvc-conformance-WRAP_A_4
--- ./tests/ref/fate/vvc-conformance-WRAP_A_4 2024-06-03 22:55:42.173081332 +0200
+++ tests/data/fate/vvc-conformance-WRAP_A_4 2024-06-04 02:39:44.835650168 +0200
@@ -4,11 +4,11 @@
#dimensions 0: 1680x832
#sar 0: 0/1
0, 0, 0, 1, 4193280, 0xbd70f1b3
-0, 1, 1, 1, 4193280, 0x64e160d5
-0, 2, 2, 1, 4193280, 0xd20722ea
-0, 3, 3, 1, 4193280, 0xa1d00055
-0, 4, 4, 1, 4193280, 0xe3dcb9cd
-0, 5, 5, 1, 4193280, 0xcf97b6cf
-0, 6, 6, 1, 4193280, 0xd87b73d0
-0, 7, 7, 1, 4193280, 0x0f8ee2bc
-0, 8, 8, 1, 4193280, 0x76607ca4
+0, 1, 1, 1, 4193280, 0x491104c9
+0, 2, 2, 1, 4193280, 0xf600c2c1
+0, 3, 3, 1, 4193280, 0x1e3c8e2b
+0, 4, 4, 1, 4193280, 0xad275e45
+0, 5, 5, 1, 4193280, 0xcd6103d7
+0, 6, 6, 1, 4193280, 0x0ec8cfbd
+0, 7, 7, 1, 4193280, 0x2f664486
+0, 8, 8, 1, 4193280, 0x543eb3fc
Test vvc-conformance-WRAP_A_4 failed. Look at tests/data/fate/vvc-conformance-WRAP_A_4.err for details.
make: *** [tests/Makefile:311: fate-vvc-conformance-WRAP_A_4] Error 1
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Some people wanted to paint the bikeshed green, some blue and some pink.
People argued and fought, when they finally agreed, only rust was left.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 5/5] avcodec/vvcdec: support mv wraparound
2024-06-04 0:40 ` Michael Niedermayer
@ 2024-06-04 12:11 ` Nuo Mi
0 siblings, 0 replies; 6+ messages in thread
From: Nuo Mi @ 2024-06-04 12:11 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Tue, Jun 4, 2024 at 8:41 AM Michael Niedermayer <michael@niedermayer.cc>
wrote:
> On Mon, Jun 03, 2024 at 08:51:16PM +0800, Nuo Mi wrote:
> > A 360 video specific tool
> > see https://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=9503377
> >
> > passed files:
> > DMVR_A_Huawei_3.bit
> > WRAP_D_InterDigital_4.bit
> > WRAP_A_InterDigital_4.bit
> > WRAP_B_InterDigital_4.bit
> > WRAP_C_InterDigital_4.bit
> > ERP_A_MediaTek_3.bit
> > ---
> > libavcodec/vvc/inter.c | 81 ++++++++++++++++++++++++++++++++++++++++--
> > 1 file changed, 79 insertions(+), 2 deletions(-)
>
> seems to break fate-vvc-conformance-WRAP_A_4, maybe the fate checksums
> need to be updated ?
>
Hi Michael,
Sorry for missing the fate test
Yes, we need to update the reference. v2 will fix it
thank you.
>
> TEST vvc-conformance-WRAP_A_4
> --- ./tests/ref/fate/vvc-conformance-WRAP_A_4 2024-06-03
> 22:55:42.173081332 +0200
> +++ tests/data/fate/vvc-conformance-WRAP_A_4 2024-06-04
> 02:39:44.835650168 +0200
> @@ -4,11 +4,11 @@
> #dimensions 0: 1680x832
> #sar 0: 0/1
> 0, 0, 0, 1, 4193280, 0xbd70f1b3
> -0, 1, 1, 1, 4193280, 0x64e160d5
> -0, 2, 2, 1, 4193280, 0xd20722ea
> -0, 3, 3, 1, 4193280, 0xa1d00055
> -0, 4, 4, 1, 4193280, 0xe3dcb9cd
> -0, 5, 5, 1, 4193280, 0xcf97b6cf
> -0, 6, 6, 1, 4193280, 0xd87b73d0
> -0, 7, 7, 1, 4193280, 0x0f8ee2bc
> -0, 8, 8, 1, 4193280, 0x76607ca4
> +0, 1, 1, 1, 4193280, 0x491104c9
> +0, 2, 2, 1, 4193280, 0xf600c2c1
> +0, 3, 3, 1, 4193280, 0x1e3c8e2b
> +0, 4, 4, 1, 4193280, 0xad275e45
> +0, 5, 5, 1, 4193280, 0xcd6103d7
> +0, 6, 6, 1, 4193280, 0x0ec8cfbd
> +0, 7, 7, 1, 4193280, 0x2f664486
> +0, 8, 8, 1, 4193280, 0x543eb3fc
> Test vvc-conformance-WRAP_A_4 failed. Look at
> tests/data/fate/vvc-conformance-WRAP_A_4.err for details.
> make: *** [tests/Makefile:311: fate-vvc-conformance-WRAP_A_4] Error 1
>
> thx
>
> [...]
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Some people wanted to paint the bikeshed green, some blue and some pink.
> People argued and fought, when they finally agreed, only rust was left.
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread