aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/fft_init_arm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-22 11:40:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-22 11:41:37 +0200
commit0129026c4e62d439c51cdae32a6b30ee278cae14 (patch)
tree117fac335c94a810b36a97d171fe4801093b2f24 /libavcodec/arm/fft_init_arm.c
parent9d4dece6b66c2f1dd56da9881cc001b2b7ce8cd8 (diff)
parent41ef1d360bac65032aa32f6b43ae137666507ae5 (diff)
downloadffmpeg-0129026c4e62d439c51cdae32a6b30ee278cae14.tar.gz
Merge commit '41ef1d360bac65032aa32f6b43ae137666507ae5'
* commit '41ef1d360bac65032aa32f6b43ae137666507ae5': arm: Add VFP-accelerated version of synth_filter_float Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/fft_init_arm.c')
-rw-r--r--libavcodec/arm/fft_init_arm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/arm/fft_init_arm.c b/libavcodec/arm/fft_init_arm.c
index 8c98abcdf0..fe0acc56bf 100644
--- a/libavcodec/arm/fft_init_arm.c
+++ b/libavcodec/arm/fft_init_arm.c
@@ -32,6 +32,12 @@ void ff_mdct_calc_neon(FFTContext *s, FFTSample *output, const FFTSample *input)
void ff_rdft_calc_neon(struct RDFTContext *s, FFTSample *z);
+void ff_synth_filter_float_vfp(FFTContext *imdct,
+ float *synth_buf_ptr, int *synth_buf_offset,
+ float synth_buf2[32], const float window[512],
+ float out[32], const float in[32],
+ float scale);
+
void ff_synth_filter_float_neon(FFTContext *imdct,
float *synth_buf_ptr, int *synth_buf_offset,
float synth_buf2[32], const float window[512],
@@ -71,6 +77,8 @@ av_cold void ff_synth_filter_init_arm(SynthFilterContext *s)
{
int cpu_flags = av_get_cpu_flags();
+ if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags))
+ s->synth_filter_float = ff_synth_filter_float_vfp;
if (have_neon(cpu_flags))
s->synth_filter_float = ff_synth_filter_float_neon;
}