From: Wu Jianhua <[email protected]>
Signed-off-by: Wu Jianhua <[email protected]>
---
libavcodec/x86/vvc/vvcdsp_init.c | 45 ++++++++++++++++++++------------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/libavcodec/x86/vvc/vvcdsp_init.c b/libavcodec/x86/vvc/vvcdsp_init.c
index d9203f4d5f..aef6699c35 100644
--- a/libavcodec/x86/vvc/vvcdsp_init.c
+++ b/libavcodec/x86/vvc/vvcdsp_init.c
@@ -63,6 +63,30 @@ PUT_TAP_PROTOTYPES(8, sse4)
PUT_TAP_PROTOTYPES(4, avx2)
PUT_TAP_PROTOTYPES(8, avx2)
+#define bf(fn, bd, opt) fn##_##bd##_##opt
+#define BF(fn, bpc, opt) fn##_##bpc##bpc_##opt
+
+#define AVG_BPC_PROTOTYPES(bpc, opt)
\
+void BF(ff_vvc_avg, bpc, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
+ const int16_t *src0, const int16_t *src1, intptr_t width, intptr_t height,
intptr_t pixel_max); \
+void BF(ff_vvc_w_avg, bpc, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
+ const int16_t *src0, const int16_t *src1, intptr_t width, intptr_t height,
\
+ intptr_t denom, intptr_t w0, intptr_t w1, intptr_t o0, intptr_t o1,
intptr_t pixel_max);
+
+#define AVG_PROTOTYPES(bd, opt)
\
+void bf(ff_vvc_avg, bd, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
+ const int16_t *src0, const int16_t *src1, int width, int height);
\
+void bf(ff_vvc_w_avg, bd, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
+ const int16_t *src0, const int16_t *src1, int width, int height,
\
+ int denom, int w0, int w1, int o0, int o1);
+
+AVG_BPC_PROTOTYPES( 8, avx2)
+AVG_BPC_PROTOTYPES(16, avx2)
+
+AVG_PROTOTYPES( 8, avx2)
+AVG_PROTOTYPES(10, avx2)
+AVG_PROTOTYPES(12, avx2)
+
#if ARCH_X86_64
#define FW_PUT(name, depth, opt) \
void ff_vvc_put_ ## name ## _ ## depth ## _##opt(int16_t *dst, const uint8_t
*src, ptrdiff_t srcstride, \
@@ -202,23 +226,13 @@ FW_PUT_16BPC_AVX2(12)
MC_TAP_LINKS_16BPC_AVX2(LUMA, 8, bd); \
MC_TAP_LINKS_16BPC_AVX2(CHROMA, 4, bd);
-#define bf(fn, bd, opt) fn##_##bd##_##opt
-#define BF(fn, bpc, opt) fn##_##bpc##bpc_##opt
-
-#define AVG_BPC_FUNC(bpc, opt)
\
-void BF(ff_vvc_avg, bpc, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
- const int16_t *src0, const int16_t *src1, intptr_t width, intptr_t height,
intptr_t pixel_max); \
-void BF(ff_vvc_w_avg, bpc, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
- const int16_t *src0, const int16_t *src1, intptr_t width, intptr_t height,
\
- intptr_t denom, intptr_t w0, intptr_t w1, intptr_t o0, intptr_t o1,
intptr_t pixel_max);
-
#define AVG_FUNCS(bpc, bd, opt)
\
-static void bf(avg, bd, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
+void bf(ff_vvc_avg, bd, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
const int16_t *src0, const int16_t *src1, int width, int height)
\
{
\
BF(ff_vvc_avg, bpc, opt)(dst, dst_stride, src0, src1, width, height, (1 <<
bd) - 1); \
}
\
-static void bf(w_avg, bd, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
+void bf(ff_vvc_w_avg, bd, opt)(uint8_t *dst, ptrdiff_t dst_stride,
\
const int16_t *src0, const int16_t *src1, int width, int height,
\
int denom, int w0, int w1, int o0, int o1)
\
{
\
@@ -226,16 +240,13 @@ static void bf(w_avg, bd, opt)(uint8_t *dst, ptrdiff_t
dst_stride,
denom, w0, w1, o0, o1, (1 << bd) - 1);
\
}
-AVG_BPC_FUNC(8, avx2)
-AVG_BPC_FUNC(16, avx2)
-
AVG_FUNCS(8, 8, avx2)
AVG_FUNCS(16, 10, avx2)
AVG_FUNCS(16, 12, avx2)
#define AVG_INIT(bd, opt) do { \
- c->inter.avg = bf(avg, bd, opt); \
- c->inter.w_avg = bf(w_avg, bd, opt); \
+ c->inter.avg = bf(ff_vvc_avg, bd, opt); \
+ c->inter.w_avg = bf(ff_vvc_w_avg, bd, opt); \
} while (0)
#endif
--
2.44.0.windows.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
