This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit cc3ca1712760ae53957a3a5987cb7c61c290a451 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Tue Apr 28 12:15:58 2026 +0200 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Thu Apr 30 10:39:33 2026 +0200 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 <[email protected]> --- libavcodec/x86/qpeldsp.asm | 12 +++++----- libavcodec/x86/qpeldsp_init.c | 54 +++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libavcodec/x86/qpeldsp.asm b/libavcodec/x86/qpeldsp.asm index d398e44436..f9cdee331c 100644 --- a/libavcodec/x86/qpeldsp.asm +++ b/libavcodec/x86/qpeldsp.asm @@ -116,9 +116,9 @@ PUT_NO_RND_PIXELS_L2 16 %macro MPEG4_QPEL16_H_LOWPASS 1-2 "" %ifidn %2, l2 -cglobal %1_mpeg4_qpel16_h_lowpass_l2, 6, 6, 8+UNIX64, dst, src, dstride, srcstride, h, offset +cglobal mpeg4_%1_qpel16_h_lowpass_l2, 6, 6, 8+UNIX64, dst, src, dstride, srcstride, h, offset %else -cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 8, dst, src, dstride, srcstride, h +cglobal mpeg4_%1_qpel16_h_lowpass, 5, 5, 8, dst, src, dstride, srcstride, h %endif mova m7, [coeff16_0] %define PW_FF m1 @@ -189,9 +189,9 @@ MPEG4_QPEL16_H_LOWPASS put_no_rnd, l2 %macro MPEG4_QPEL8_H_LOWPASS 1-2 "" %ifidn %2, l2 -cglobal %1_mpeg4_qpel8_h_lowpass_l2, 6, 6, 8+2*ARCH_X86_64+UNIX64, dst, src, dstride, srcstride, h, offset +cglobal mpeg4_%1_qpel8_h_lowpass_l2, 6, 6, 8+2*ARCH_X86_64+UNIX64, dst, src, dstride, srcstride, h, offset %else -cglobal %1_mpeg4_qpel8_h_lowpass, 5, 5, 8+2*ARCH_X86_64, dst, src, dstride, srcstride, h +cglobal mpeg4_%1_qpel8_h_lowpass, 5, 5, 8+2*ARCH_X86_64, dst, src, dstride, srcstride, h %endif mova m4, [PW_ROUND] mova m5, [coeff8_0] @@ -287,7 +287,7 @@ MPEG4_QPEL8_H_LOWPASS put_no_rnd, l2 %endmacro %macro MPEG4_QPEL16_V_LOWPASS 1 -cglobal %1_mpeg4_qpel16_v_lowpass, 4, 6, 7, 544 +cglobal mpeg4_%1_qpel16_v_lowpass, 4, 6, 7, 544 mov r4d, 17 mov r5, rsp pxor m4, m4 @@ -355,7 +355,7 @@ cglobal %1_mpeg4_qpel16_v_lowpass, 4, 6, 7, 544 %endmacro %macro MPEG4_QPEL8_V_LOWPASS 1 -cglobal %1_mpeg4_qpel8_v_lowpass, 4, 6, 7, 144 +cglobal mpeg4_%1_qpel8_v_lowpass, 4, 6, 7, 144 mov r4d, 9 mov r5, rsp pxor m2, m2 diff --git a/libavcodec/x86/qpeldsp_init.c b/libavcodec/x86/qpeldsp_init.c index 932a006e05..18c259b0d8 100644 --- a/libavcodec/x86/qpeldsp_init.c +++ b/libavcodec/x86/qpeldsp_init.c @@ -42,12 +42,12 @@ void ff_put_no_rnd_pixels16x16_l2_sse2(uint8_t *dst, ptrdiff_t dstStride, ptrdiff_t src1Stride); #define QPEL_H(OPNAME, RND, SIZE, UNUSED1, XMM, UNUSED2, UNUSED3, L2) \ -void ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_ ## XMM (uint8_t *dst, \ +void ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_ ## XMM (uint8_t *dst, \ const uint8_t *src, \ ptrdiff_t dstStride, \ ptrdiff_t srcStride, \ int h); \ -void ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## XMM(uint8_t *dst, \ +void ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_l2_ ## XMM(uint8_t *dst, \ const uint8_t *src, \ ptrdiff_t dstStride, \ ptrdiff_t srcStride, \ @@ -57,7 +57,7 @@ static void OPNAME ## _qpel ## SIZE ## _mc10_ ## XMM(uint8_t *dst, const uint8_t *src, \ ptrdiff_t stride) \ { \ - ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## XMM(dst, src, stride, \ + ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_l2_ ## XMM(dst, src, stride, \ stride, SIZE, 0); \ } \ \ @@ -65,7 +65,7 @@ static void OPNAME ## _qpel ## SIZE ## _mc20_ ## XMM(uint8_t *dst, const uint8_t *src, \ ptrdiff_t stride) \ { \ - ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_ ## XMM(dst, src, stride, \ + ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_ ## XMM(dst, src, stride, \ stride, SIZE); \ } \ \ @@ -73,12 +73,12 @@ static void OPNAME ## _qpel ## SIZE ## _mc30_ ## XMM(uint8_t *dst, const uint8_t *src, \ ptrdiff_t stride) \ { \ - ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## XMM(dst, src, stride, \ + ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _h_lowpass_l2_ ## XMM(dst, src, stride, \ stride, SIZE, 1); \ } #define QPEL_V(OPNAME, RND, SIZE, UNUSED1, UNUSED2, XMM, UNUSED3, L2) \ -void ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## XMM (uint8_t *dst, \ +void ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## XMM (uint8_t *dst, \ const uint8_t *src, \ ptrdiff_t dstStride, \ ptrdiff_t srcStride); \ @@ -87,7 +87,7 @@ static void OPNAME ## _qpel ## SIZE ## _mc01_ ## XMM(uint8_t *dst, ptrdiff_t stride) \ { \ DECLARE_ALIGNED(SIZE, uint8_t, half)[SIZE*SIZE]; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## XMM(half, src, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## XMM(half, src, \ SIZE, stride); \ ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, src, half, \ stride, stride); \ @@ -97,7 +97,7 @@ static void OPNAME ## _qpel ## SIZE ## _mc02_ ## XMM(uint8_t *dst, const uint8_t *src, \ ptrdiff_t stride) \ { \ - ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## XMM(dst, src, \ + ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## XMM(dst, src, \ stride, stride); \ } \ \ @@ -106,7 +106,7 @@ static void OPNAME ## _qpel ## SIZE ## _mc03_ ## XMM(uint8_t *dst, ptrdiff_t stride) \ { \ DECLARE_ALIGNED(SIZE, uint8_t, half)[SIZE*SIZE]; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## XMM(half, src, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## XMM(half, src, \ SIZE, stride); \ ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, src + stride, \ half, stride, stride); \ @@ -120,9 +120,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc11_ ## HVXMM(uint8_t *dst, DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \ uint8_t *const halfH = half + SIZE*SIZE; \ uint8_t *const halfHV = half; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ stride, SIZEP1, 0); \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ SIZE, SIZE); \ ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH, halfHV, \ stride, SIZE); \ @@ -135,9 +135,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc31_ ## HVXMM(uint8_t *dst, DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \ uint8_t *const halfH = half + SIZE*SIZE; \ uint8_t *const halfHV = half; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ stride, SIZEP1, 1); \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ SIZE, SIZE); \ ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH, halfHV, \ stride, SIZE); \ @@ -150,9 +150,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc13_ ## HVXMM(uint8_t *dst, DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \ uint8_t *const halfH = half + SIZE*SIZE; \ uint8_t *const halfHV = half; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ stride, SIZEP1, 0); \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ SIZE, SIZE); \ ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH + SIZE, \ halfHV, stride, SIZE); \ @@ -165,9 +165,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc33_ ## HVXMM(uint8_t *dst, DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \ uint8_t *const halfH = half + SIZE*SIZE; \ uint8_t *const halfHV = half; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ stride, SIZEP1, 1); \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ SIZE, SIZE); \ ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH + SIZE, \ halfHV, stride, SIZE); \ @@ -180,9 +180,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc21_ ## HVXMM(uint8_t *dst, DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \ uint8_t *const halfH = half + SIZE*SIZE; \ uint8_t *const halfHV = half; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \ stride, SIZEP1); \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ SIZE, SIZE); \ ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH, halfHV, \ stride, SIZE); \ @@ -195,9 +195,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc23_ ## HVXMM(uint8_t *dst, DECLARE_ALIGNED(SIZE, uint8_t, half)[(SIZE + SIZEP1)*SIZE]; \ uint8_t *const halfH = half + SIZE*SIZE; \ uint8_t *const halfHV = half; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \ stride, SIZEP1); \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _v_lowpass_ ## VXMM(halfHV, halfH, \ SIZE, SIZE); \ ff_ ## OPNAME ## _pixels ## SIZE ## x ## SIZE ## _l2_ ## L2(dst, halfH + SIZE, \ halfHV, stride, SIZE); \ @@ -208,9 +208,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc12_ ## HVXMM(uint8_t *dst, ptrdiff_t stride) \ { \ DECLARE_ALIGNED(SIZE, uint8_t, halfH)[SIZEP1*SIZE]; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ stride, SIZEP1, 0); \ - ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \ + ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \ stride, SIZE); \ } \ \ @@ -219,9 +219,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc32_ ## HVXMM(uint8_t *dst, ptrdiff_t stride) \ { \ DECLARE_ALIGNED(SIZE, uint8_t, halfH)[SIZEP1*SIZE]; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_l2_ ## HXMM(halfH, src, SIZE, \ stride, SIZEP1, 1); \ - ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \ + ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \ stride, SIZE); \ } \ \ @@ -230,9 +230,9 @@ static void OPNAME ## _qpel ## SIZE ## _mc22_ ## HVXMM(uint8_t *dst, ptrdiff_t stride) \ { \ DECLARE_ALIGNED(SIZE, uint8_t, halfH)[SIZEP1*SIZE]; \ - ff_put_ ## RND ## mpeg4_qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \ + ff_mpeg4_put_ ## RND ## qpel ## SIZE ## _h_lowpass_ ## HXMM(halfH, src, SIZE, \ stride, SIZEP1); \ - ff_ ## OPNAME ## _mpeg4_qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \ + ff_mpeg4_ ## OPNAME ## _qpel ## SIZE ## _v_lowpass_ ## VXMM(dst, halfH, \ stride, SIZE); \ } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
