Commit 08255107 authored by Måns Rullgård's avatar Måns Rullgård

DCA: ARM/NEON optimised lfe_fir

Originally committed as revision 22863 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e168a556
...@@ -33,7 +33,9 @@ NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \ ...@@ -33,7 +33,9 @@ NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \
arm/h264idct_neon.o \ arm/h264idct_neon.o \
arm/h264pred_neon.o \ arm/h264pred_neon.o \
NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/synth_filter_neon.o \ NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o \
arm/dcadsp_neon.o \
arm/synth_filter_neon.o \
NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o
......
/*
* Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.h"
#include "libavutil/attributes.h"
#include "libavcodec/dcadsp.h"
void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs,
int decifactor, float scale, float bias);
void av_cold ff_dcadsp_init_arm(DCADSPContext *s)
{
if (HAVE_NEON)
s->lfe_fir = ff_dca_lfe_fir_neon;
}
/*
* Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "asm.S"
function ff_dca_lfe_fir_neon, export=1
push {r4-r6,lr}
add r4, r0, r3, lsl #2 @ out2
add r5, r2, #256*4-16 @ cf1
sub r1, r1, #12
cmp r3, #32
moveq r6, #256/32
movne r6, #256/64
NOVFP vldr d0, [sp, #16] @ scale, bias
mov lr, #-16
1:
vmov.f32 q2, #0.0 @ v0
vmov.f32 q3, #0.0 @ v1
mov r12, r6
2:
vld1.32 {q8}, [r2,:128]! @ cf0
vld1.32 {q9}, [r5,:128], lr @ cf1
vld1.32 {q1}, [r1], lr @ in
subs r12, r12, #4
vrev64.32 q10, q8
vmla.f32 q3, q1, q9
vmla.f32 d4, d2, d21
vmla.f32 d5, d3, d20
bne 2b
add r1, r1, r6, lsl #2
subs r3, r3, #1
vadd.f32 d4, d4, d5
vadd.f32 d6, d6, d7
vpadd.f32 d4, d4, d6
vdup.32 d5, d0[1]
vmla.f32 d5, d4, d0[0]
vst1.32 {d5[0]}, [r0,:32]!
vst1.32 {d5[1]}, [r4,:32]!
bne 1b
pop {r4-r6,pc}
endfunc
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "config.h"
#include "dcadsp.h" #include "dcadsp.h"
static void dca_lfe_fir_c(float *out, const float *in, const float *coefs, static void dca_lfe_fir_c(float *out, const float *in, const float *coefs,
...@@ -46,4 +47,5 @@ static void dca_lfe_fir_c(float *out, const float *in, const float *coefs, ...@@ -46,4 +47,5 @@ static void dca_lfe_fir_c(float *out, const float *in, const float *coefs,
void ff_dcadsp_init(DCADSPContext *s) void ff_dcadsp_init(DCADSPContext *s)
{ {
s->lfe_fir = dca_lfe_fir_c; s->lfe_fir = dca_lfe_fir_c;
if (ARCH_ARM) ff_dcadsp_init_arm(s);
} }
...@@ -25,5 +25,6 @@ typedef struct DCADSPContext { ...@@ -25,5 +25,6 @@ typedef struct DCADSPContext {
} DCADSPContext; } DCADSPContext;
void ff_dcadsp_init(DCADSPContext *s); void ff_dcadsp_init(DCADSPContext *s);
void ff_dcadsp_init_arm(DCADSPContext *s);
#endif /* AVCODEC_DCADSP_H */ #endif /* AVCODEC_DCADSP_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment