diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-08 23:02:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-08 23:59:09 +0200 |
| commit | 7e22514d98ecd56cc4e55dac7c813551e2152b80 (patch) | |
| tree | 13c47e1e1215525323177a008d5406a7d61a418a /libavcodec/arm/dsputil_neon.S | |
| parent | e016e3c9d7ce1493b952bdd8232f7e03077469a3 (diff) | |
| parent | 3b81a18ba30bf18bab78f56744d8f3e1e4060104 (diff) | |
| download | ffmpeg-7e22514d98ecd56cc4e55dac7c813551e2152b80.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: ppc: add a separate header for Altivec function prototypes
ARM: fix float_dsp breakage from d5a7229
Add a float DSP framework to libavutil
PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
ARM: Move asm.S from libavcodec to libavutil
vc1dsp: mark put/avg_vc1_mspel_mc() always_inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dsputil_neon.S')
| -rw-r--r-- | libavcodec/arm/dsputil_neon.S | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/libavcodec/arm/dsputil_neon.S b/libavcodec/arm/dsputil_neon.S index 344f28bea9..7ddd76a153 100644 --- a/libavcodec/arm/dsputil_neon.S +++ b/libavcodec/arm/dsputil_neon.S @@ -20,7 +20,7 @@ */ #include "config.h" -#include "asm.S" +#include "libavutil/arm/asm.S" preserve8 @@ -534,45 +534,6 @@ function ff_add_pixels_clamped_neon, export=1 bx lr endfunc -function ff_vector_fmul_neon, export=1 - subs r3, r3, #8 - vld1.32 {d0-d3}, [r1,:128]! - vld1.32 {d4-d7}, [r2,:128]! - vmul.f32 q8, q0, q2 - vmul.f32 q9, q1, q3 - beq 3f - bics ip, r3, #15 - beq 2f -1: subs ip, ip, #16 - vld1.32 {d0-d1}, [r1,:128]! - vld1.32 {d4-d5}, [r2,:128]! - vmul.f32 q10, q0, q2 - vld1.32 {d2-d3}, [r1,:128]! - vld1.32 {d6-d7}, [r2,:128]! - vmul.f32 q11, q1, q3 - vst1.32 {d16-d19},[r0,:128]! - vld1.32 {d0-d1}, [r1,:128]! - vld1.32 {d4-d5}, [r2,:128]! - vmul.f32 q8, q0, q2 - vld1.32 {d2-d3}, [r1,:128]! - vld1.32 {d6-d7}, [r2,:128]! - vmul.f32 q9, q1, q3 - vst1.32 {d20-d23},[r0,:128]! - bne 1b - ands r3, r3, #15 - beq 3f -2: vld1.32 {d0-d1}, [r1,:128]! - vld1.32 {d4-d5}, [r2,:128]! - vst1.32 {d16-d17},[r0,:128]! - vmul.f32 q8, q0, q2 - vld1.32 {d2-d3}, [r1,:128]! - vld1.32 {d6-d7}, [r2,:128]! - vst1.32 {d18-d19},[r0,:128]! - vmul.f32 q9, q1, q3 -3: vst1.32 {d16-d19},[r0,:128]! - bx lr -endfunc - function ff_vector_fmul_window_neon, export=1 push {r4,r5,lr} ldr lr, [sp, #12] |