summaryrefslogtreecommitdiff
path: root/libavresample
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2013-10-09 08:54:59 -0400
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2013-10-14 12:39:29 +0100
commit206895708ea2b464755d340e44501daf9a07c310 (patch)
treeadef04fec470970a6e01ed4752c44d9159b56ab3 /libavresample
parentc108ba0175d4fc3a3253a8b0f782fbfb96ba5098 (diff)
x86inc: Remove our FMA4 support
This is so we can sync to x264's version of FMA4 support. This partialy reverts commit 79687079a97a039c325ab79d7a95920d800b791f. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/x86/audio_mix.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavresample/x86/audio_mix.asm b/libavresample/x86/audio_mix.asm
index 4710bb1f6e..2c657b50d4 100644
--- a/libavresample/x86/audio_mix.asm
+++ b/libavresample/x86/audio_mix.asm
@@ -384,10 +384,10 @@ cglobal mix_%1_to_%2_%3_flt, 3,in_channels+2,needed_mmregs+matrix_elements_mm, n
S16_TO_S32_SX 4, 5
cvtdq2ps m4, m4
cvtdq2ps m5, m5
- fmaddps m2, m4, mx_1_ %+ %%i, m2, m6
- fmaddps m3, m5, mx_1_ %+ %%i, m3, m6
- fmaddps m0, m4, mx_0_ %+ %%i, m0, m4
- fmaddps m1, m5, mx_0_ %+ %%i, m1, m5
+ FMULADD_PS m2, m4, mx_1_ %+ %%i, m2, m6
+ FMULADD_PS m3, m5, mx_1_ %+ %%i, m3, m6
+ FMULADD_PS m0, m4, mx_0_ %+ %%i, m0, m4
+ FMULADD_PS m1, m5, mx_0_ %+ %%i, m1, m5
%else
%if copy_src_from_stack
mov src_ptr, src %+ %%i %+ m
@@ -396,8 +396,8 @@ cglobal mix_%1_to_%2_%3_flt, 3,in_channels+2,needed_mmregs+matrix_elements_mm, n
S16_TO_S32_SX 2, 3
cvtdq2ps m2, m2
cvtdq2ps m3, m3
- fmaddps m0, m2, mx_0_ %+ %%i, m0, m4
- fmaddps m1, m3, mx_0_ %+ %%i, m1, m4
+ FMULADD_PS m0, m2, mx_0_ %+ %%i, m0, m4
+ FMULADD_PS m1, m3, mx_0_ %+ %%i, m1, m4
%endif
%assign %%i %%i+1
%endrep
@@ -437,12 +437,12 @@ cglobal mix_%1_to_%2_%3_flt, 3,in_channels+2,needed_mmregs+matrix_elements_mm, n
mova m2, [src_ptr+lenq]
%endif
%if stereo
- fmaddps m1, m2, mx_1_ %+ %%i, m1, m3
+ FMULADD_PS m1, m2, mx_1_ %+ %%i, m1, m3
%endif
%if stereo || mx_stack_0_ %+ %%i
- fmaddps m0, m2, mx_0_ %+ %%i, m0, m2
+ FMULADD_PS m0, m2, mx_0_ %+ %%i, m0, m2
%else
- fmaddps m0, mx_0_ %+ %%i, [src_ptr+lenq], m0, m1
+ FMULADD_PS m0, mx_0_ %+ %%i, [src_ptr+lenq], m0, m1
%endif
%assign %%i %%i+1
%endrep