[FFmpeg-devel] [PATCH v2 16/16] avcodec/vvcdec: inter prediction, support subpicture

[Nuo Mi]

passed files:
    LMCS_B_Dolby_2.bit
    CodingToolsSets_E_Tencent_1.bit
    SUBPIC_A_HUAWEI_3.bit
    SUBPIC_B_HUAWEI_3.bit
    SUBPIC_C_ERICSSON_1.bit
    SUBPIC_D_ERICSSON_1.bit
    SUBPIC_E_MediaTek_1.bit

passed dvb conformance files (https://dvb.org/specifications/verification-validation/vvc-test-content):
    VVC_HDR_UHDTV1_OpenGOP_3840x2160_50fps_HLG10_mosaic.bit
    VVC_HDR_UHDTV1_OpenGOP_3840x2160_50fps_HLG10_PiP.bit
---
 libavcodec/vvc/vvc_inter.c | 79 +++++++++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 23 deletions(-)

diff --git a/libavcodec/vvc/vvc_inter.c b/libavcodec/vvc/vvc_inter.c
index c5629f7f6f..1a87cb71cf 100644
--- a/libavcodec/vvc/vvc_inter.c
+++ b/libavcodec/vvc/vvc_inter.c
@@ -30,14 +30,34 @@
 #define PROF_TEMP_OFFSET (MAX_PB_SIZE + 32)
 static const int bcw_w_lut[] = {4, 5, 3, 10, -2};
 
-static int emulated_edge(const VVCFrameContext *fc, uint8_t *dst, const uint8_t **src, ptrdiff_t *src_stride,
-    const int x_off, const int y_off, const int block_w, const int block_h, const int is_luma)
+static void subpic_offset(int *x_off, int *y_off,
+    const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_luma)
 {
-    const int extra_before = is_luma ? LUMA_EXTRA_BEFORE : CHROMA_EXTRA_BEFORE;
-    const int extra_after  = is_luma ? LUMA_EXTRA_AFTER : CHROMA_EXTRA_AFTER;
-    const int extra        = is_luma ? LUMA_EXTRA : CHROMA_EXTRA;
-    const int pic_width    = is_luma ? fc->ps.pps->width  : (fc->ps.pps->width >> fc->ps.sps->hshift[1]);
-    const int pic_height   = is_luma ? fc->ps.pps->height : (fc->ps.pps->height >> fc->ps.sps->vshift[1]);
+    *x_off -= pps->subpic_x[subpic_idx] >> sps->hshift[!is_luma];
+    *y_off -= pps->subpic_y[subpic_idx] >> sps->vshift[!is_luma];
+}
+
+static void subpic_width_height(int *pic_width, int *pic_height,
+    const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_luma)
+{
+    *pic_width  = pps->subpic_width[subpic_idx]  >> sps->hshift[!is_luma];
+    *pic_height = pps->subpic_height[subpic_idx] >> sps->vshift[!is_luma];
+}
+
+static int emulated_edge(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 is_luma)
+{
+    const VVCFrameContext *fc = lc->fc;
+    const VVCSPS *sps         = fc->ps.sps;
+    const VVCPPS *pps         = fc->ps.pps;
+    const int subpic_idx      = lc->sc->sh.r->curr_subpic_idx;
+    const int extra_before    = is_luma ? LUMA_EXTRA_BEFORE : CHROMA_EXTRA_BEFORE;
+    const int extra_after     = is_luma ? LUMA_EXTRA_AFTER : CHROMA_EXTRA_AFTER;
+    const int extra           = is_luma ? LUMA_EXTRA : CHROMA_EXTRA;
+    int pic_width, pic_height;
+
+    subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_luma);
+    subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_luma);
 
     if (x_off < extra_before || y_off < extra_before ||
         x_off >= pic_width - block_w - extra_after ||
@@ -57,14 +77,21 @@ static int emulated_edge(const VVCFrameContext *fc, uint8_t *dst, const uint8_t
     return 0;
 }
 
-static void emulated_edge_dmvr(const VVCFrameContext *fc, uint8_t *dst, const uint8_t **src, ptrdiff_t *src_stride,
-    const int x_sb, const int y_sb, const int x_off, const int y_off, const int block_w, const int block_h, const int is_luma)
+static void emulated_edge_dmvr(const VVCLocalContext *lc, uint8_t *dst, const uint8_t **src, ptrdiff_t *src_stride,
+    int x_sb, int y_sb, int x_off,  int y_off, const int block_w, const int block_h, const int is_luma)
 {
-    const int extra_before = is_luma ? LUMA_EXTRA_BEFORE : CHROMA_EXTRA_BEFORE;
-    const int extra_after  = is_luma ? LUMA_EXTRA_AFTER : CHROMA_EXTRA_AFTER;
-    const int extra        = is_luma ? LUMA_EXTRA : CHROMA_EXTRA;
-    const int pic_width    = is_luma ? fc->ps.pps->width  : (fc->ps.pps->width >> fc->ps.sps->hshift[1]);
-    const int pic_height   = is_luma ? fc->ps.pps->height : (fc->ps.pps->height >> fc->ps.sps->vshift[1]);
+    const VVCFrameContext *fc = lc->fc;
+    const VVCSPS *sps         = fc->ps.sps;
+    const VVCPPS *pps         = fc->ps.pps;
+    const int subpic_idx      = lc->sc->sh.r->curr_subpic_idx;
+    const int extra_before    = is_luma ? LUMA_EXTRA_BEFORE : CHROMA_EXTRA_BEFORE;
+    const int extra_after     = is_luma ? LUMA_EXTRA_AFTER : CHROMA_EXTRA_AFTER;
+    const int extra           = is_luma ? LUMA_EXTRA : CHROMA_EXTRA;
+    int pic_width, pic_height;
+
+    subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_luma);
+    subpic_offset(&x_sb, &y_sb, sps, pps, subpic_idx, is_luma);
+    subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_luma);
 
     if (x_off < extra_before || y_off < extra_before ||
         x_off >= pic_width - block_w - extra_after ||
@@ -88,11 +115,17 @@ static void emulated_edge_dmvr(const VVCFrameContext *fc, uint8_t *dst, const ui
    }
 }
 
-static void emulated_edge_bilinear(const VVCFrameContext *fc, uint8_t *dst, const uint8_t **src, ptrdiff_t *src_stride,
-    const int x_off, const int y_off, const int block_w, const int block_h)
+static void emulated_edge_bilinear(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)
 {
-    int pic_width   = fc->ps.pps->width;
-    int pic_height  = fc->ps.pps->height;
+    const VVCFrameContext *fc = lc->fc;
+    const VVCSPS *sps         = fc->ps.sps;
+    const VVCPPS *pps         = fc->ps.pps;
+    const int subpic_idx      = lc->sc->sh.r->curr_subpic_idx;
+    int pic_width, pic_height;
+
+    subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, 1);
+    subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, 1);
 
     if (x_off < BILINEAR_EXTRA_BEFORE || y_off < BILINEAR_EXTRA_BEFORE ||
         x_off >= pic_width - block_w - BILINEAR_EXTRA_AFTER ||
@@ -111,19 +144,19 @@ static void emulated_edge_bilinear(const VVCFrameContext *fc, uint8_t *dst, cons
 
 
 #define EMULATED_EDGE_LUMA(dst, src, src_stride, x_off, y_off)                      \
-    emulated_edge(fc, dst, src, src_stride, x_off, y_off, block_w, block_h, 1)
+    emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 1)
 
 #define EMULATED_EDGE_CHROMA(dst, src, src_stride, x_off, y_off)                    \
-    emulated_edge(fc, dst, src, src_stride, x_off, y_off, block_w, block_h, 0)
+    emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 0)
 
 #define EMULATED_EDGE_DMVR_LUMA(dst, src, src_stride, x_sb, y_sb, x_off, y_off)     \
-    emulated_edge_dmvr(fc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 1)
+    emulated_edge_dmvr(lc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 1)
 
 #define EMULATED_EDGE_DMVR_CHROMA(dst, src, src_stride, x_sb, y_sb, x_off, y_off)   \
-    emulated_edge_dmvr(fc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 0)
+    emulated_edge_dmvr(lc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 0)
 
 #define EMULATED_EDGE_BILINEAR(dst, src, src_stride, x_off, y_off)                  \
-    emulated_edge_bilinear(fc, dst, src, src_stride, x_off, y_off, pred_w, pred_h)
+    emulated_edge_bilinear(lc, dst, src, src_stride, x_off, y_off, pred_w, pred_h)
 
 // part of 8.5.6.6 Weighted sample prediction process
 static int derive_weight_uni(int *denom, int *wx, int *ox,
-- 
2.25.1