diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 02:42:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 03:12:02 +0200 |
| commit | c27adb37ef5bf0280d16e8a2c4df29452a290982 (patch) | |
| tree | 4b3edd5c33bd4e30a459fd7863be0123104cc67e /libavcodec/arm/fft_init_arm.c | |
| parent | 4c735ee0e3d44e7c8e51c8dd519b14ac0f002bec (diff) | |
| parent | 87552d54d3337c3241e8a9e1a05df16eaa821496 (diff) | |
| download | ffmpeg-c27adb37ef5bf0280d16e8a2c4df29452a290982.tar.gz | |
Merge commit '87552d54d3337c3241e8a9e1a05df16eaa821496'
* commit '87552d54d3337c3241e8a9e1a05df16eaa821496':
armv6: Accelerate ff_fft_calc for general case (nbits != 4)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/fft_init_arm.c')
| -rw-r--r-- | libavcodec/arm/fft_init_arm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/arm/fft_init_arm.c b/libavcodec/arm/fft_init_arm.c index 7e49b9c09c..5087f5f64d 100644 --- a/libavcodec/arm/fft_init_arm.c +++ b/libavcodec/arm/fft_init_arm.c @@ -23,6 +23,8 @@ #include "libavcodec/rdft.h" #include "libavcodec/synth_filter.h" +void ff_fft_calc_vfp(FFTContext *s, FFTComplex *z); + void ff_fft_permute_neon(FFTContext *s, FFTComplex *z); void ff_fft_calc_neon(FFTContext *s, FFTComplex *z); @@ -38,10 +40,10 @@ av_cold void ff_fft_init_arm(FFTContext *s) { int cpu_flags = av_get_cpu_flags(); - if (have_vfp(cpu_flags)) { + if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) { + s->fft_calc = ff_fft_calc_vfp; #if CONFIG_MDCT - if (!have_vfpv3(cpu_flags)) - s->imdct_half = ff_imdct_half_vfp; + s->imdct_half = ff_imdct_half_vfp; #endif } |