avcodec/vvc/intra: make lmcs_scale_chroma inplace

prepare for adaptive color transform

Wu Jianhua committed 1 year ago

Commit ff1ecc71 parent d2e7ca63 files · +6 −8Browse files

Unified · Split

3 files

@@ -106,7 +106,7 @@ struct VVCLocalContext; · 105 unmodified lines
106		106
107	typedef struct VVCIntraDSPContext {	107	typedef struct VVCIntraDSPContext {
108	void (intra_cclm_pred)(const struct VVCLocalContext lc, int x0, int y0, int w, int h);	108	void (intra_cclm_pred)(const struct VVCLocalContext lc, int x0, int y0, int w, int h);
109	void (lmcs_scale_chroma)(struct VVCLocalContext lc, int dst, const int coeff, int w, int h, int x0_cu, int y0_cu);	109	void (lmcs_scale_chroma)(struct VVCLocalContext lc, int *coeff, int w, int h, int x0_cu, int y0_cu);
110	void (intra_pred)(const struct VVCLocalContext lc, int x0, int y0, int w, int h, int c_idx);	110	void (intra_pred)(const struct VVCLocalContext lc, int x0, int y0, int w, int h, int c_idx);
111	void (pred_planar)(uint8_t src, const uint8_t top, const uint8_t left, int w, int h, ptrdiff_t stride);	111	void (pred_planar)(uint8_t src, const uint8_t top, const uint8_t left, int w, int h, ptrdiff_t stride);
112	void (pred_mip)(uint8_t src, const uint8_t top, const uint8_t left, int w, int h, ptrdiff_t stride,	112	void (pred_mip)(uint8_t src, const uint8_t top, const uint8_t left, int w, int h, ptrdiff_t stride,

     const VVCSH *sh             = &lc->sc->sh;
     const CodingUnit *cu        = lc->cu;
     const int ps                = fc->ps.sps->pixel_shift;
-    DECLARE_ALIGNED(32, int, temp)[MAX_TB_SIZE * MAX_TB_SIZE];
     for (int i = 0; i < tu->nb_tbs; i++) {
         TransformBlock *tb  = &tu->tbs[i];
                     fc->vvcdsp.itx.pred_residual_joint(jcbcr->coeffs, tb->coeffs, tb->tb_width, tb->tb_height, c_sign, shift);
                 }
                 if (chroma_scale)
-                    fc->vvcdsp.intra.lmcs_scale_chroma(lc, temp, coeffs, w, h, cu->x0, cu->y0);
+                    fc->vvcdsp.intra.lmcs_scale_chroma(lc, coeffs, w, h, cu->x0, cu->y0);
                 // TODO: Address performance issue here by combining transform, lmcs_scale_chroma, and add_residual into one function.
                 // Complete this task before implementing ASM code.
-                fc->vvcdsp.itx.add_residual(dst, chroma_scale ? temp : coeffs, w, h, stride);
+                fc->vvcdsp.itx.add_residual(dst, coeffs, w, h, stride);
             }
         }
     }

 }
 // 8.7.5.3 Picture reconstruction with luma dependent chroma residual scaling process for chroma samples
-static void FUNC(lmcs_scale_chroma)(VVCLocalContext *lc, int *dst, const int *coeff,
+static void FUNC(lmcs_scale_chroma)(VVCLocalContext *lc, int *coeff,
     const int width, const int height, const int x0_cu, const int y0_cu)
 {
     const int chroma_scale = FUNC(lmcs_derive_chroma_scale)(lc, x0_cu, y0_cu);
             const int c = av_clip_intp2(*coeff, BIT_DEPTH);
             if (c > 0)
-                *dst = (c * chroma_scale + (1 << 10)) >> 11;
+                *coeff = (c * chroma_scale + (1 << 10)) >> 11;
             else
-                *dst = -((-c * chroma_scale + (1 << 10)) >> 11);
+                *coeff = -((-c * chroma_scale + (1 << 10)) >> 11);
             coeff++;
-            dst++;
         }
     }
 }

Keyboard shortcuts