[FFmpeg-cvslog] vvcdec: add dsp init and inv transform
Nuo Mi
git at videolan.org
Wed Jan 3 17:16:23 EET 2024
ffmpeg | branch: master | Nuo Mi <nuomi2021 at gmail.com> | Tue Dec 5 22:45:16 2023 +0800| [b49575f4cfd6928b8263b4ad264202f2aaa0bcb6] | committer: Nuo Mi
vvcdec: add dsp init and inv transform
Co-authored-by: Xu Mu <toxumu at outlook.com>
Co-authored-by: Frank Plowman <post at frankplowman.com>
Co-authored-by: Shaun Loo <shaunloo10 at gmail.com>
Co-authored-by: Wu Jianhua <toqsxw at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b49575f4cfd6928b8263b4ad264202f2aaa0bcb6
---
libavcodec/vvc/Makefile | 3 +-
libavcodec/vvc/vvcdsp.c | 141 +++++++++++++++++++++++++++++++++++++++
libavcodec/vvc/vvcdsp_template.c | 120 +++++++++++++++++++++++++++++++++
3 files changed, 263 insertions(+), 1 deletion(-)
diff --git a/libavcodec/vvc/Makefile b/libavcodec/vvc/Makefile
index 57e2a2af75..10ba5f35be 100644
--- a/libavcodec/vvc/Makefile
+++ b/libavcodec/vvc/Makefile
@@ -1,7 +1,8 @@
clean::
$(RM) $(CLEANSUFFIXES:%=libavcodec/vvc/%)
-OBJS-$(CONFIG_VVC_DECODER) += vvc/vvc_cabac.o \
+OBJS-$(CONFIG_VVC_DECODER) += vvc/vvcdsp.o \
+ vvc/vvc_cabac.o \
vvc/vvc_ctu.o \
vvc/vvc_data.o \
vvc/vvc_filter.o \
diff --git a/libavcodec/vvc/vvcdsp.c b/libavcodec/vvc/vvcdsp.c
new file mode 100644
index 0000000000..c82ea7be30
--- /dev/null
+++ b/libavcodec/vvc/vvcdsp.c
@@ -0,0 +1,141 @@
+/*
+ * VVC DSP
+ *
+ * Copyright (C) 2021 Nuo Mi
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "vvcdsp.h"
+#include "vvc_ctu.h"
+#include "vvc_itx_1d.h"
+
+#define VVC_SIGN(v) (v < 0 ? -1 : !!v)
+
+static void av_always_inline pad_int16(int16_t *_dst, const ptrdiff_t dst_stride, const int width, const int height)
+{
+ const int padded_width = width + 2;
+ int16_t *dst;
+ for (int y = 0; y < height; y++) {
+ dst = _dst + y * dst_stride;
+ for (int x = 0; x < width; x++) {
+ dst[-1] = dst[0];
+ dst[width] = dst[width - 1];
+ }
+ }
+
+ _dst--;
+ //top
+ memcpy(_dst - dst_stride, _dst, padded_width * sizeof(int16_t));
+ //bottom
+ _dst += dst_stride * height;
+ memcpy(_dst, _dst - dst_stride, padded_width * sizeof(int16_t));
+}
+
+static int vvc_sad(const int16_t *src0, const int16_t *src1, int dx, int dy,
+ const int block_w, const int block_h)
+{
+ int sad = 0;
+ dx -= 2;
+ dy -= 2;
+ src0 += (2 + dy) * MAX_PB_SIZE + 2 + dx;
+ src1 += (2 - dy) * MAX_PB_SIZE + 2 - dx;
+ for (int y = 0; y < block_h; y += 2) {
+ for (int x = 0; x < block_w; x++) {
+ sad += FFABS(src0[x] - src1[x]);
+ }
+ src0 += 2 * MAX_PB_SIZE;
+ src1 += 2 * MAX_PB_SIZE;
+ }
+ return sad;
+}
+
+#define itx_fn(type, s) \
+static void itx_##type##_##s(int *coeffs, ptrdiff_t step, size_t nz) \
+{ \
+ ff_vvc_inv_##type##_##s(coeffs, step, nz); \
+}
+
+#define itx_fn_common(type) \
+ itx_fn(type, 4); \
+ itx_fn(type, 8); \
+ itx_fn(type, 16); \
+ itx_fn(type, 32); \
+
+itx_fn_common(dct2);
+itx_fn_common(dst7);
+itx_fn_common(dct8);
+itx_fn(dct2, 2);
+itx_fn(dct2, 64);
+
+typedef struct IntraEdgeParams {
+ uint8_t* top;
+ uint8_t* left;
+ int filter_flag;
+
+ uint16_t left_array[3 * MAX_TB_SIZE + 3];
+ uint16_t filtered_left_array[3 * MAX_TB_SIZE + 3];
+ uint16_t top_array[3 * MAX_TB_SIZE + 3];
+ uint16_t filtered_top_array[3 * MAX_TB_SIZE + 3];
+} IntraEdgeParams;
+
+#define PROF_BORDER_EXT 1
+#define PROF_BLOCK_SIZE (AFFINE_MIN_BLOCK_SIZE + PROF_BORDER_EXT * 2)
+#define BDOF_BORDER_EXT 1
+
+#define BDOF_PADDED_SIZE (16 + BDOF_BORDER_EXT * 2)
+#define BDOF_BLOCK_SIZE 4
+#define BDOF_GRADIENT_SIZE (BDOF_BLOCK_SIZE + BDOF_BORDER_EXT * 2)
+
+#define BIT_DEPTH 8
+#include "vvcdsp_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 10
+#include "vvcdsp_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 12
+#include "vvcdsp_template.c"
+#undef BIT_DEPTH
+
+void ff_vvc_dsp_init(VVCDSPContext *vvcdsp, int bit_depth)
+{
+#undef FUNC
+#define FUNC(a, depth) a ## _ ## depth
+
+#define VVC_DSP(depth) \
+ FUNC(ff_vvc_inter_dsp_init, depth)(&vvcdsp->inter); \
+ FUNC(ff_vvc_intra_dsp_init, depth)(&vvcdsp->intra); \
+ FUNC(ff_vvc_itx_dsp_init, depth)(&vvcdsp->itx); \
+ FUNC(ff_vvc_lmcs_dsp_init, depth)(&vvcdsp->lmcs); \
+ FUNC(ff_vvc_lf_dsp_init, depth)(&vvcdsp->lf); \
+ FUNC(ff_vvc_sao_dsp_init, depth)(&vvcdsp->sao); \
+ FUNC(ff_vvc_alf_dsp_init, depth)(&vvcdsp->alf); \
+
+ switch (bit_depth) {
+ case 12:
+ VVC_DSP(12);
+ break;
+ case 10:
+ VVC_DSP(10);
+ break;
+ default:
+ VVC_DSP(8);
+ break;
+ }
+}
diff --git a/libavcodec/vvc/vvcdsp_template.c b/libavcodec/vvc/vvcdsp_template.c
new file mode 100644
index 0000000000..f92c266478
--- /dev/null
+++ b/libavcodec/vvc/vvcdsp_template.c
@@ -0,0 +1,120 @@
+/*
+ * VVC transform and residual DSP
+ *
+ * Copyright (C) 2021 Nuo Mi
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include "libavutil/frame.h"
+#include "libavcodec/bit_depth_template.c"
+
+#include "vvcdec.h"
+#include "vvc_data.h"
+
+#include "vvc_inter_template.c"
+#include "vvc_intra_template.c"
+#include "vvc_filter_template.c"
+
+static void FUNC(add_residual)(uint8_t *_dst, const int *res,
+ const int w, const int h, const ptrdiff_t _stride)
+{
+ pixel *dst = (pixel *)_dst;
+
+ const int stride = _stride / sizeof(pixel);
+
+ for (int y = 0; y < h; y++) {
+ for (int x = 0; x < w; x++) {
+ dst[x] = av_clip_pixel(dst[x] + *res);
+ res++;
+ }
+ dst += stride;
+ }
+}
+
+static void FUNC(add_residual_joint)(uint8_t *_dst, const int *res,
+ const int w, const int h, const ptrdiff_t _stride, const int c_sign, const int shift)
+{
+ pixel *dst = (pixel *)_dst;
+
+ const int stride = _stride / sizeof(pixel);
+
+ for (int y = 0; y < h; y++) {
+ for (int x = 0; x < w; x++) {
+ const int r = ((*res) * c_sign) >> shift;
+ dst[x] = av_clip_pixel(dst[x] + r);
+ res++;
+ }
+ dst += stride;
+ }
+}
+
+static void FUNC(pred_residual_joint)(int *buf, const int w, const int h,
+ const int c_sign, const int shift)
+{
+ for (int y = 0; y < h; y++) {
+ for (int x = 0; x < w; x++) {
+ *buf = ((*buf) * c_sign) >> shift;
+ buf++;
+ }
+ }
+}
+
+static void FUNC(transform_bdpcm)(int *coeffs, const int width, const int height,
+ const int vertical, const int log2_transform_range)
+{
+ int x, y;
+
+ if (vertical) {
+ coeffs += width;
+ for (y = 0; y < height - 1; y++) {
+ for (x = 0; x < width; x++)
+ coeffs[x] = av_clip_intp2(coeffs[x] + coeffs[x - width], log2_transform_range);
+ coeffs += width;
+ }
+ } else {
+ for (y = 0; y < height; y++) {
+ for (x = 1; x < width; x++)
+ coeffs[x] = av_clip_intp2(coeffs[x] + coeffs[x - 1], log2_transform_range);
+ coeffs += width;
+ }
+ }
+}
+
+static void FUNC(ff_vvc_itx_dsp_init)(VVCItxDSPContext *const itx)
+{
+#define VVC_ITX(TYPE, type, s) \
+ itx->itx[TYPE][TX_SIZE_##s] = itx_##type##_##s; \
+
+#define VVC_ITX_COMMON(TYPE, type) \
+ VVC_ITX(TYPE, type, 4); \
+ VVC_ITX(TYPE, type, 8); \
+ VVC_ITX(TYPE, type, 16); \
+ VVC_ITX(TYPE, type, 32);
+
+ itx->add_residual = FUNC(add_residual);
+ itx->add_residual_joint = FUNC(add_residual_joint);
+ itx->pred_residual_joint = FUNC(pred_residual_joint);
+ itx->transform_bdpcm = FUNC(transform_bdpcm);
+ VVC_ITX(DCT2, dct2, 2)
+ VVC_ITX(DCT2, dct2, 64)
+ VVC_ITX_COMMON(DCT2, dct2)
+ VVC_ITX_COMMON(DCT8, dct8)
+ VVC_ITX_COMMON(DST7, dst7)
+
+#undef VVC_ITX
+#undef VVC_ITX_COMMON
+}
More information about the ffmpeg-cvslog
mailing list