diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:35:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:35:18 +0100 |
| commit | ea93ccf07991dbb0d90b913c0bf49f680fdc0ffc (patch) | |
| tree | f480704103df76937079555a2717f8c0c00bc1aa /libavutil | |
| parent | 55d8cac254ee2aeba051810ca92bb868fcbd8468 (diff) | |
| parent | 5b4dfbffc258f90a7d2540d21209ac23afcf7cd0 (diff) | |
Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0'
* commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0':
x86: ABS1: port to cpuflags
v210x: cosmetics, reformat
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86util.asm | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 00fa7b1827..2cc8470d21 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -172,11 +172,19 @@ psignw %1, %2 %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 @@ -190,12 +198,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 @@ -205,10 +207,6 @@ pmaxsw %2, %4 %endmacro -%macro ABS1_SSSE3 2 - pabsw %1, %1 -%endmacro - %macro ABS2_SSSE3 4 pabsw %1, %1 pabsw %2, %2 @@ -254,7 +252,6 @@ ABS2 %3, %4, %5, %6 %endmacro -%define ABS1 ABS1_MMX %define ABS2 ABS2_MMX %define ABSB ABSB_MMX %define ABSB2 ABSB2_MMX |