Skip to content

Commit cc3ca17

Browse files
mkvermkver
committed
avcodec/x86/qpeldsp{,_init}: Use proper prefix
E.g. rename ff_put_mpeg4_qpel8_h_lowpass_ssse3 to ff_mpeg4_put_qpel8_h_lowpass_ssse3. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
1 parent ca43bc6 commit cc3ca17

2 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎libavcodec/x86/qpeldsp.asm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ PUT_NO_RND_PIXELS_L2 16
116116

117117
%macro MPEG4_QPEL16_H_LOWPASS 1-2 ""
118118
%ifidn %2, l2
119-
cglobal %1_mpeg4_qpel16_h_lowpass_l2, 6, 6, 8+UNIX64, dst, src, dstride, srcstride, h, offset
119+
cglobal mpeg4_%1_qpel16_h_lowpass_l2, 6, 6, 8+UNIX64, dst, src, dstride, srcstride, h, offset
120120
%else
121-
cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 8, dst, src, dstride, srcstride, h
121+
cglobal mpeg4_%1_qpel16_h_lowpass, 5, 5, 8, dst, src, dstride, srcstride, h
122122
%endif
123123
mova m7, [coeff16_0]
124124
%define PW_FF m1
@@ -189,9 +189,9 @@ MPEG4_QPEL16_H_LOWPASS put_no_rnd, l2
189189

190190
%macro MPEG4_QPEL8_H_LOWPASS 1-2 ""
191191
%ifidn %2, l2
192-
cglobal %1_mpeg4_qpel8_h_lowpass_l2, 6, 6, 8+2*ARCH_X86_64+UNIX64, dst, src, dstride, srcstride, h, offset
192+
cglobal mpeg4_%1_qpel8_h_lowpass_l2, 6, 6, 8+2*ARCH_X86_64+UNIX64, dst, src, dstride, srcstride, h, offset
193193
%else
194-
cglobal %1_mpeg4_qpel8_h_lowpass, 5, 5, 8+2*ARCH_X86_64, dst, src, dstride, srcstride, h
194+
cglobal mpeg4_%1_qpel8_h_lowpass, 5, 5, 8+2*ARCH_X86_64, dst, src, dstride, srcstride, h
195195
%endif
196196
mova m4, [PW_ROUND]
197197
mova m5, [coeff8_0]
@@ -287,7 +287,7 @@ MPEG4_QPEL8_H_LOWPASS put_no_rnd, l2
287287
%endmacro
288288

289289
%macro MPEG4_QPEL16_V_LOWPASS 1
290-
cglobal %1_mpeg4_qpel16_v_lowpass, 4, 6, 7, 544
290+
cglobal mpeg4_%1_qpel16_v_lowpass, 4, 6, 7, 544
291291
mov r4d, 17
292292
mov r5, rsp
293293
pxor m4, m4
@@ -355,7 +355,7 @@ cglobal %1_mpeg4_qpel16_v_lowpass, 4, 6, 7, 544
355355
%endmacro
356356

357357
%macro MPEG4_QPEL8_V_LOWPASS 1
358-
cglobal %1_mpeg4_qpel8_v_lowpass, 4, 6, 7, 144
358+
cglobal mpeg4_%1_qpel8_v_lowpass, 4, 6, 7, 144
359359
mov r4d, 9
360360
mov r5, rsp
361361
pxor m2, m2

‎libavcodec/x86/qpeldsp_init.c‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ void ff_put_no_rnd_pixels16x16_l2_sse2(uint8_t *dst,
4242
ptrdiff_t dstStride, ptrdiff_t src1Stride);
4343

4444
#define QPEL_H(OPNAME, RND, SIZE, UNUSED1, XMM, UNUSED2, UNUSED3, L2) \
45-
void ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_ ## XMM (uint8_t *dst, \
45+
void ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_ ## XMM (uint8_t *dst, \
4646
const uint8_t *src, \
4747
ptrdiff_t dstStride, \
4848
ptrdiff_t srcStride, \
4949
int h); \
50-
void ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## XMM(uint8_t *dst, \
50+
void ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_l2_ ## XMM(uint8_t *dst, \
5151
const uint8_t *src, \
5252
ptrdiff_t dstStride, \
5353
ptrdiff_t srcStride, \
@@ -57,28 +57,28 @@ static void OPNAME ## _qpel ## SIZE ## _mc10_ ## XMM(uint8_t *dst,
5757
const uint8_t *src, \
5858
ptrdiff_t stride) \
5959
{ \
60-
ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## XMM(dst, src, stride, \
60+
ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_l2_ ## XMM(dst, src, stride, \
6161
stride, SIZE, 0); \
6262
} \
6363
\
6464
static void OPNAME ## _qpel ## SIZE ## _mc20_ ## XMM(uint8_t *dst, \
6565
const uint8_t *src, \
6666
ptrdiff_t stride) \
6767
{ \
68-
ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_ ## XMM(dst, src, stride, \
68+
ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_ ## XMM(dst, src, stride, \
6969
stride, SIZE); \
7070
} \
7171
\
7272
static void OPNAME ## _qpel ## SIZE ## _mc30_ ## XMM(uint8_t *dst, \
7373
const uint8_t *src, \
7474
ptrdiff_t stride) \
7575
{ \
76-
ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## XMM(dst, src, stride, \
76+
ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_l2_ ## XMM(dst, src, stride, \
7777
stride, SIZE, 1); \
7878
}
7979

8080
#define QPEL_V(OPNAME, RND, SIZE, UNUSED1, UNUSED2, XMM, UNUSED3, L2) \
81-
void ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## XMM (uint8_t *dst, \
81+
void ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## XMM (uint8_t *dst, \
8282
const uint8_t *src, \
8383
ptrdiff_t dstStride, \
8484
ptrdiff_t srcStride); \
@@ -87,7 +87,7 @@ static void OPNAME ## _qpel ## SIZE ## _mc01_ ## XMM(uint8_t *dst,
8787
ptrdiff_t stride) \
8888
{ \
8989
DECLARE_ALIGNED(SIZE, uint8_t, half)[SIZE*SIZE]; \
90-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## XMM(half, src, \
90+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## XMM(half, src, \
9191
SIZE, stride); \
9292
ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, src, half, \
9393
stride, stride); \
@@ -97,7 +97,7 @@ static void OPNAME ## _qpel ## SIZE ## _mc02_ ## XMM(uint8_t *dst,
9797
const uint8_t *src, \
9898
ptrdiff_t stride) \
9999
{ \
100-
ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## XMM(dst, src, \
100+
ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## XMM(dst, src, \
101101
stride, stride); \
102102
} \
103103
\
@@ -106,7 +106,7 @@ static void OPNAME ## _qpel ## SIZE ## _mc03_ ## XMM(uint8_t *dst,
106106
ptrdiff_t stride) \
107107
{ \
108108
DECLARE_ALIGNED(SIZE, uint8_t, half)[SIZE*SIZE]; \
109-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## XMM(half, src, \
109+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## XMM(half, src, \
110110
SIZE, stride); \
111111
ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, src + stride, \
112112
half, stride, stride); \
@@ -120,9 +120,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc11_ ## HVXMM(uint8_t *dst,
120120
DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \
121121
uint8_t *const halfH = half + SIZE*SIZE; \
122122
uint8_t *const halfHV = half; \
123-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
123+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
124124
stride, SIZEP1, 0); \
125-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
125+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
126126
SIZE, SIZE); \
127127
ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH, halfHV, \
128128
stride, SIZE); \
@@ -135,9 +135,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc31_ ## HVXMM(uint8_t *dst,
135135
DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \
136136
uint8_t *const halfH = half + SIZE*SIZE; \
137137
uint8_t *const halfHV = half; \
138-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
138+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
139139
stride, SIZEP1, 1); \
140-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
140+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
141141
SIZE, SIZE); \
142142
ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH, halfHV, \
143143
stride, SIZE); \
@@ -150,9 +150,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc13_ ## HVXMM(uint8_t *dst,
150150
DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \
151151
uint8_t *const halfH = half + SIZE*SIZE; \
152152
uint8_t *const halfHV = half; \
153-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
153+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
154154
stride, SIZEP1, 0); \
155-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
155+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
156156
SIZE, SIZE); \
157157
ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH + SIZE, \
158158
halfHV, stride, SIZE); \
@@ -165,9 +165,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc33_ ## HVXMM(uint8_t *dst,
165165
DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \
166166
uint8_t *const halfH = half + SIZE*SIZE; \
167167
uint8_t *const halfHV = half; \
168-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
168+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
169169
stride, SIZEP1, 1); \
170-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
170+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
171171
SIZE, SIZE); \
172172
ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH + SIZE, \
173173
halfHV, stride, SIZE); \
@@ -180,9 +180,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc21_ ## HVXMM(uint8_t *dst,
180180
DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \
181181
uint8_t *const halfH = half + SIZE*SIZE; \
182182
uint8_t *const halfHV = half; \
183-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \
183+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \
184184
stride, SIZEP1); \
185-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
185+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
186186
SIZE, SIZE); \
187187
ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH, halfHV, \
188188
stride, SIZE); \
@@ -195,9 +195,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc23_ ## HVXMM(uint8_t *dst,
195195
DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \
196196
uint8_t *const halfH = half + SIZE*SIZE; \
197197
uint8_t *const halfHV = half; \
198-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \
198+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \
199199
stride, SIZEP1); \
200-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
200+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \
201201
SIZE, SIZE); \
202202
ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH + SIZE, \
203203
halfHV, stride, SIZE); \
@@ -208,9 +208,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc12_ ## HVXMM(uint8_t *dst,
208208
ptrdiff_t stride) \
209209
{ \
210210
DECLARE_ALIGNED(SIZE, uint8_t, halfH)[SIZEP1*SIZE]; \
211-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
211+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
212212
stride, SIZEP1, 0); \
213-
ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \
213+
ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \
214214
stride, SIZE); \
215215
} \
216216
\
@@ -219,9 +219,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc32_ ## HVXMM(uint8_t *dst,
219219
ptrdiff_t stride) \
220220
{ \
221221
DECLARE_ALIGNED(SIZE, uint8_t, halfH)[SIZEP1*SIZE]; \
222-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
222+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \
223223
stride, SIZEP1, 1); \
224-
ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \
224+
ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \
225225
stride, SIZE); \
226226
} \
227227
\
@@ -230,9 +230,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc22_ ## HVXMM(uint8_t *dst,
230230
ptrdiff_t stride) \
231231
{ \
232232
DECLARE_ALIGNED(SIZE, uint8_t, halfH)[SIZEP1*SIZE]; \
233-
ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \
233+
ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \
234234
stride, SIZEP1); \
235-
ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \
235+
ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \
236236
stride, SIZE); \
237237
}
238238

0 commit comments

Comments
 (0)