avcodec/x86/hevcdsp: Move macro to dsp_init.c

It belongs to the [EQ]PEL_LINKS macros.

Andreas Rheinhardt committed 1 year ago

Commit 05ae73a1 parent 35aee3c2 files · +7 −9Browse files

Unified · Split

2 files

libavcodec/x86/hevc/dsp_init.c +7 −0
libavcodec/x86/hevcdsp.h +0 −9

libavcodec/x86/hevc/dsp_init.c+7−0

@@ -783,6 +783,13 @@ SAO_EDGE_FILTER_FUNCS(12, avx2) · 782 unmodified lines
783	c->sao_edge_filter[4] = ff_hevc_sao_edge_filter_64_##bitd##_##opt; \	783	c->sao_edge_filter[4] = ff_hevc_sao_edge_filter_64_##bitd##_##opt; \
784	} while (0)	784	} while (0)
785		785
		786	#define PEL_LINK(dst, idx1, idx2, idx3, name, D, opt) \
		787	dst [idx1][idx2][idx3] = hevc_put_ ## name ## _ ## D ## _##opt; \
		788	dst ## _bi [idx1][idx2][idx3] = ff_hevc_put_bi_ ## name ## _ ## D ## _##opt; \
		789	dst ## _uni [idx1][idx2][idx3] = hevc_put_uni_ ## name ## _ ## D ## _##opt; \
		790	dst ## _uni_w[idx1][idx2][idx3] = hevc_put_uni_w_ ## name ## _ ## D ## _##opt; \
		791	dst ## _bi_w [idx1][idx2][idx3] = hevc_put_bi_w_ ## name ## _ ## D ## _##opt
		792
786	#define EPEL_LINKS(pointer, my, mx, fname, bitd, opt ) \	793	#define EPEL_LINKS(pointer, my, mx, fname, bitd, opt ) \
787	PEL_LINK(pointer, 1, my , mx , fname##4 , bitd, opt ); \	794	PEL_LINK(pointer, 1, my , mx , fname##4 , bitd, opt ); \
788	PEL_LINK(pointer, 2, my , mx , fname##6 , bitd, opt ); \	795	PEL_LINK(pointer, 2, my , mx , fname##6 , bitd, opt ); \

libavcodec/x86/hevcdsp.h+0−9

@@ -28,15 +28,6 @@ · 27 unmodified lines
28	#include <stddef.h>	28	#include <stddef.h>
29	#include <stdint.h>	29	#include <stdint.h>
30		30
31
32	#define PEL_LINK(dst, idx1, idx2, idx3, name, D, opt) \
33	dst[idx1][idx2][idx3] = hevc_put_ ## name ## _ ## D ## _##opt; \
34	dst ## _bi[idx1][idx2][idx3] = ff_hevc_put_bi_ ## name ## _ ## D ## _##opt; \
35	dst ## _uni[idx1][idx2][idx3] = hevc_put_uni_ ## name ## _ ## D ## _##opt; \
36	dst ## _uni_w[idx1][idx2][idx3] = hevc_put_uni_w_ ## name ## _ ## D ## _##opt; \
37	dst ## _bi_w[idx1][idx2][idx3] = hevc_put_bi_w_ ## name ## _ ## D ## _##opt
38
39
40	typedef void bi_pel_func(uint8_t *_dst, ptrdiff_t _dststride,	31	typedef void bi_pel_func(uint8_t *_dst, ptrdiff_t _dststride,
41	const uint8_t _src, ptrdiff_t _srcstride, const int16_t src2,	32	const uint8_t _src, ptrdiff_t _srcstride, const int16_t src2,
42	int height, intptr_t mx, intptr_t my, int width);	33	int height, intptr_t mx, intptr_t my, int width);