---
libavcodec/x86/dsputilenc_yasm.asm | 2 --
libavutil/x86/x86util.asm | 21 +++++++++------------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/libavcodec/x86/dsputilenc_yasm.asm
b/libavcodec/x86/dsputilenc_yasm.asm
index f9d09f7..b75bee2 100644
--- a/libavcodec/x86/dsputilenc_yasm.asm
+++ b/libavcodec/x86/dsputilenc_yasm.asm
@@ -257,11 +257,9 @@ hadamard8_16_wrapper 0, 14
%endmacro
INIT_MMX mmx
-%define ABS1 ABS1_MMX
HADAMARD8_DIFF
INIT_MMX mmxext
-%define ABS1 ABS1_MMXEXT
HADAMARD8_DIFF
INIT_XMM sse2
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index 51d2e36..e1c9f19 100644
--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -169,11 +169,19 @@
%endif
%endmacro
-%macro ABS1_MMX 2 ; a, tmp
+%macro ABS1 2
+%if cpuflag(ssse3)
+ pabsw %1, %1
+%elif cpuflag(mmxext) ; a, tmp
+ pxor %2, %2
+ psubw %2, %1
+ pmaxsw %1, %2
+%else ; a, tmp
pxor %2, %2
pcmpgtw %2, %1
pxor %1, %2
psubw %1, %2
+%endif
%endmacro
%macro ABS2_MMX 4 ; a, b, tmp0, tmp1
@@ -187,12 +195,6 @@
psubw %2, %4
%endmacro
-%macro ABS1_MMXEXT 2 ; a, tmp
- pxor %2, %2
- psubw %2, %1
- pmaxsw %1, %2
-%endmacro
-
%macro ABS2_MMXEXT 4 ; a, b, tmp0, tmp1
pxor %3, %3
pxor %4, %4
@@ -202,10 +204,6 @@
pmaxsw %2, %4
%endmacro
-%macro ABS1_SSSE3 2
- pabsw %1, %1
-%endmacro
-
%macro ABS2_SSSE3 4
pabsw %1, %1
pabsw %2, %2
@@ -251,7 +249,6 @@
ABS2 %3, %4, %5, %6
%endmacro
-%define ABS1 ABS1_MMX
%define ABS2 ABS2_MMX
%define ABSB ABSB_MMX
%define ABSB2 ABSB2_MMX
--
1.7.2.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
