From: "Ronald S. Bultje" <[email protected]>
---
libavcodec/x86/vp3dsp.asm | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/libavcodec/x86/vp3dsp.asm b/libavcodec/x86/vp3dsp.asm
index af2f60c..98b1cb5 100644
--- a/libavcodec/x86/vp3dsp.asm
+++ b/libavcodec/x86/vp3dsp.asm
@@ -102,8 +102,8 @@ SECTION .text
mov [r0+r3 -1], r2w
%endmacro
-INIT_MMX
-cglobal vp3_v_loop_filter_mmx2, 3, 4
+INIT_MMX mmx2
+cglobal vp3_v_loop_filter, 3, 4
%if ARCH_X86_64
movsxd r1, r1d
%endif
@@ -120,7 +120,7 @@ cglobal vp3_v_loop_filter_mmx2, 3, 4
movq [r0 ], m3
RET
-cglobal vp3_h_loop_filter_mmx2, 3, 4
+cglobal vp3_h_loop_filter, 3, 4
%if ARCH_X86_64
movsxd r1, r1d
%endif
@@ -521,9 +521,17 @@ cglobal vp3_h_loop_filter_mmx2, 3, 4
PUT_BLOCK 0, 1, 2, 3, 4, 5, 6, 7
%endmacro
-%macro vp3_idct_funcs 1
-cglobal vp3_idct_put_%1, 3, 4, 9
- VP3_IDCT_%1 r2
+%macro VP3_IDCT 1
+%if mmsize == 8
+ VP3_IDCT_mmx %1
+%else
+ VP3_IDCT_sse2 %1
+%endif
+%endmacro
+
+%macro vp3_idct_funcs 0
+cglobal vp3_idct_put, 3, 4, 9
+ VP3_IDCT r2
movsxdifnidn r1, r1d
mova m4, [pb_80]
@@ -565,8 +573,8 @@ cglobal vp3_idct_put_%1, 3, 4, 9
%endrep
RET
-cglobal vp3_idct_add_%1, 3, 4, 9
- VP3_IDCT_%1 r2
+cglobal vp3_idct_add, 3, 4, 9
+ VP3_IDCT r2
mov r3, 4
pxor m4, m4
@@ -607,10 +615,10 @@ cglobal vp3_idct_add_%1, 3, 4, 9
RET
%endmacro
-INIT_MMX
-vp3_idct_funcs mmx
-INIT_XMM
-vp3_idct_funcs sse2
+INIT_MMX mmx
+vp3_idct_funcs
+INIT_XMM sse2
+vp3_idct_funcs
%macro DC_ADD 0
movq m2, [r0 ]
@@ -631,8 +639,8 @@ vp3_idct_funcs sse2
movq [r0+r3 ], m5
%endmacro
-INIT_MMX
-cglobal vp3_idct_dc_add_mmx2, 3, 4
+INIT_MMX mmx2
+cglobal vp3_idct_dc_add, 3, 4
%if ARCH_X86_64
movsxd r1, r1d
%endif
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
