aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-02-18 19:25:58 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-02-21 01:06:22 +0100
commit48612de63c2a36f6a9cad4bcd41e907ab9ec099b (patch)
treee1584d2cc64a330f67e604dce5882fb17fe169c2
parentef04737e189e25904b7ed06fc3cd7a19e05f27f0 (diff)
downloadffmpeg-48612de63c2a36f6a9cad4bcd41e907ab9ec099b.tar.gz
avcodec/vvc/vvcdsp: Remove pointless wrappers
Reviewed-by: Nuo Mi <nuomi2021@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/vvc/vvcdsp.c18
-rw-r--r--libavcodec/vvc/vvcdsp_template.c2
2 files changed, 1 insertions, 19 deletions
diff --git a/libavcodec/vvc/vvcdsp.c b/libavcodec/vvc/vvcdsp.c
index 214dc4e6c0..d63b9bc9b3 100644
--- a/libavcodec/vvc/vvcdsp.c
+++ b/libavcodec/vvc/vvcdsp.c
@@ -64,24 +64,6 @@ static int vvc_sad(const int16_t *src0, const int16_t *src1, int dx, int dy,
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;
diff --git a/libavcodec/vvc/vvcdsp_template.c b/libavcodec/vvc/vvcdsp_template.c
index f92c266478..33815d6765 100644
--- a/libavcodec/vvc/vvcdsp_template.c
+++ b/libavcodec/vvc/vvcdsp_template.c
@@ -97,7 +97,7 @@ static void FUNC(transform_bdpcm)(int *coeffs, const int width, const int height
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; \
+ itx->itx[TYPE][TX_SIZE_##s] = ff_vvc_inv_##type##_##s; \
#define VVC_ITX_COMMON(TYPE, type) \
VVC_ITX(TYPE, type, 4); \