diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 04:12:40 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 04:12:40 +0100 |
commit | 8e70fdab3614a5ef709d60b67c6729c3eca93c21 (patch) | |
tree | e18aa3e652eb2ec4949bd4186e49aa385a0d39a8 /libavcodec/arm/ac3dsp_neon.S | |
parent | a12f679a5db9a2069f58a993317720c5b4f82c27 (diff) | |
parent | 4958f35a2ebc307049ff2104ffb944f5f457feb3 (diff) | |
download | ffmpeg-8e70fdab3614a5ef709d60b67c6729c3eca93c21.tar.gz |
Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'
* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
dsputil: Move apply_window_int16 to ac3dsp
Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/ac3dsp_neon.S')
-rw-r--r-- | libavcodec/arm/ac3dsp_neon.S | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/libavcodec/arm/ac3dsp_neon.S b/libavcodec/arm/ac3dsp_neon.S index 381f15868d..89d0ae8048 100644 --- a/libavcodec/arm/ac3dsp_neon.S +++ b/libavcodec/arm/ac3dsp_neon.S @@ -109,6 +109,29 @@ function ff_ac3_extract_exponents_neon, export=1 bx lr endfunc +function ff_apply_window_int16_neon, export=1 + push {r4,lr} + add r4, r1, r3, lsl #1 + add lr, r0, r3, lsl #1 + sub r4, r4, #16 + sub lr, lr, #16 + mov r12, #-16 +1: + vld1.16 {q0}, [r1,:128]! + vld1.16 {q2}, [r2,:128]! + vld1.16 {q1}, [r4,:128], r12 + vrev64.16 q3, q2 + vqrdmulh.s16 q0, q0, q2 + vqrdmulh.s16 d2, d2, d7 + vqrdmulh.s16 d3, d3, d6 + vst1.16 {q0}, [r0,:128]! + vst1.16 {q1}, [lr,:128], r12 + subs r3, r3, #16 + bgt 1b + + pop {r4,pc} +endfunc + function ff_ac3_sum_square_butterfly_int32_neon, export=1 vmov.i64 q0, #0 vmov.i64 q1, #0 |