History

avcodec/x86/constants: Move constants only used by cavsdsp to it

And make them static.

Andreas Rheinhardt committed 1 year ago

Commit e4c8e801 parent 437cbd23 files · +6 −7Browse files

Unified · Split

3 files
  1. libavcodec/x86/cavsdsp.c +6 −3
  2. libavcodec/x86/constants.c +0 −2
  3. libavcodec/x86/constants.h +0 −2
libavcodec/x86/cavsdsp.c+6−3
@@ -51,6 +51,9 @@ static void cavs_idct8_add_sse2(uint8_t *dst, int16_t *block, ptrdiff_t stride) · 50 unmodified lines
51 51
52#if HAVE_MMXEXT_INLINE52#if HAVE_MMXEXT_INLINE
53 53
54DECLARE_ASM_CONST(8, uint64_t, pw_42) = 0x002A002A002A002AULL;
55DECLARE_ASM_CONST(8, uint64_t, pw_96) = 0x0060006000600060ULL;
56
54/*****************************************************************************57/*****************************************************************************
55 *58 *
56 * motion compensation59 * motion compensation
@@ -233,17 +236,17 @@ static void OPNAME ## cavs_qpel8_h_ ## MMX(uint8_t *dst, const uint8_t *src, ptr · 176 unmodified lines
233\236\
234static inline void OPNAME ## cavs_qpel8or16_v1_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)\237static inline void OPNAME ## cavs_qpel8or16_v1_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)\
235{ \238{ \
236 QPEL_CAVSVNUM(QPEL_CAVSV1,OP,ff_pw_64,ff_pw_96,ff_pw_42) \239 QPEL_CAVSVNUM(QPEL_CAVSV1,OP,ff_pw_64,pw_96,pw_42) \
237}\240}\
238\241\
239static inline void OPNAME ## cavs_qpel8or16_v2_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)\242static inline void OPNAME ## cavs_qpel8or16_v2_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)\
240{ \243{ \
241 QPEL_CAVSVNUM(QPEL_CAVSV2,OP,ff_pw_4,ff_pw_5,ff_pw_42) \244 QPEL_CAVSVNUM(QPEL_CAVSV2,OP,ff_pw_4,ff_pw_5,pw_42) \
242}\245}\
243\246\
244static inline void OPNAME ## cavs_qpel8or16_v3_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)\247static inline void OPNAME ## cavs_qpel8or16_v3_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)\
245{ \248{ \
246 QPEL_CAVSVNUM(QPEL_CAVSV3,OP,ff_pw_64,ff_pw_96,ff_pw_42) \249 QPEL_CAVSVNUM(QPEL_CAVSV3,OP,ff_pw_64,pw_96,pw_42) \
247}\250}\
248\251\
249static void OPNAME ## cavs_qpel8_v1_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride)\252static void OPNAME ## cavs_qpel8_v1_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride)\
libavcodec/x86/constants.c+0−2
@@ -37,10 +37,8 @@ DECLARE_ALIGNED(16, const xmm_reg, ff_pw_16) = { 0x0010001000100010ULL, 0x001 · 36 unmodified lines
37DECLARE_ASM_ALIGNED(16, const xmm_reg, ff_pw_18) = { 0x0012001200120012ULL, 0x0012001200120012ULL };37DECLARE_ASM_ALIGNED(16, const xmm_reg, ff_pw_18) = { 0x0012001200120012ULL, 0x0012001200120012ULL };
38DECLARE_ALIGNED(16, const xmm_reg, ff_pw_20) = { 0x0014001400140014ULL, 0x0014001400140014ULL };38DECLARE_ALIGNED(16, const xmm_reg, ff_pw_20) = { 0x0014001400140014ULL, 0x0014001400140014ULL };
39DECLARE_ALIGNED(16, const xmm_reg, ff_pw_32) = { 0x0020002000200020ULL, 0x0020002000200020ULL };39DECLARE_ALIGNED(16, const xmm_reg, ff_pw_32) = { 0x0020002000200020ULL, 0x0020002000200020ULL };
40DECLARE_ASM_ALIGNED(8, const uint64_t, ff_pw_42) = 0x002A002A002A002AULL;
41DECLARE_ASM_ALIGNED(8, const uint64_t, ff_pw_53) = 0x0035003500350035ULL;40DECLARE_ASM_ALIGNED(8, const uint64_t, ff_pw_53) = 0x0035003500350035ULL;
42DECLARE_ASM_ALIGNED(16, const xmm_reg, ff_pw_64) = { 0x0040004000400040ULL, 0x0040004000400040ULL };41DECLARE_ASM_ALIGNED(16, const xmm_reg, ff_pw_64) = { 0x0040004000400040ULL, 0x0040004000400040ULL };
43DECLARE_ASM_ALIGNED(8, const uint64_t, ff_pw_96) = 0x0060006000600060ULL;
44DECLARE_ASM_ALIGNED(8, const uint64_t, ff_pw_128) = 0x0080008000800080ULL;42DECLARE_ASM_ALIGNED(8, const uint64_t, ff_pw_128) = 0x0080008000800080ULL;
45DECLARE_ALIGNED(32, const ymm_reg, ff_pw_255) = { 0x00ff00ff00ff00ffULL, 0x00ff00ff00ff00ffULL,43DECLARE_ALIGNED(32, const ymm_reg, ff_pw_255) = { 0x00ff00ff00ff00ffULL, 0x00ff00ff00ff00ffULL,
46 0x00ff00ff00ff00ffULL, 0x00ff00ff00ff00ffULL };44 0x00ff00ff00ff00ffULL, 0x00ff00ff00ff00ffULL };
libavcodec/x86/constants.h+0−2
@@ -37,10 +37,8 @@ extern const xmm_reg ff_pw_16; · 36 unmodified lines
37extern const xmm_reg ff_pw_18;37extern const xmm_reg ff_pw_18;
38extern const xmm_reg ff_pw_20;38extern const xmm_reg ff_pw_20;
39extern const xmm_reg ff_pw_32;39extern const xmm_reg ff_pw_32;
40extern const uint64_t ff_pw_42;
41extern const uint64_t ff_pw_53;40extern const uint64_t ff_pw_53;
42extern const xmm_reg ff_pw_64;41extern const xmm_reg ff_pw_64;
43extern const uint64_t ff_pw_96;
44extern const uint64_t ff_pw_128;42extern const uint64_t ff_pw_128;
45extern const ymm_reg ff_pw_255;43extern const ymm_reg ff_pw_255;
46extern const ymm_reg ff_pw_256;44extern const ymm_reg ff_pw_256;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t