summaryrefslogtreecommitdiff
path: root/libavcodec/arm/fft_fixed_init_arm.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-03-28 19:39:44 +0100
committerMans Rullgard <mans@mansr.com>2011-04-03 22:39:52 +0100
commitf7653904c8a136787d9dda97a02aecfe1746a465 (patch)
tree2917b45989f88becdf96df109ac61c89a956cb68 /libavcodec/arm/fft_fixed_init_arm.c
parentdba9852935f31d81d16bf26ee21d164d5d5f5764 (diff)
ARM: NEON fixed-point forward MDCT
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/arm/fft_fixed_init_arm.c')
-rw-r--r--libavcodec/arm/fft_fixed_init_arm.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/arm/fft_fixed_init_arm.c b/libavcodec/arm/fft_fixed_init_arm.c
index 916bf291ea..be412cde05 100644
--- a/libavcodec/arm/fft_fixed_init_arm.c
+++ b/libavcodec/arm/fft_fixed_init_arm.c
@@ -22,11 +22,21 @@
#include "libavcodec/fft.h"
void ff_fft_fixed_calc_neon(FFTContext *s, FFTComplex *z);
+void ff_mdct_fixed_calc_neon(FFTContext *s, FFTSample *o, const FFTSample *i);
+void ff_mdct_fixed_calcw_neon(FFTContext *s, FFTDouble *o, const FFTSample *i);
av_cold void ff_fft_fixed_init_arm(FFTContext *s)
{
if (HAVE_NEON) {
s->fft_permutation = FF_FFT_PERM_SWAP_LSBS;
s->fft_calc = ff_fft_fixed_calc_neon;
+
+#if CONFIG_MDCT
+ if (!s->inverse && s->mdct_bits >= 5) {
+ s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE;
+ s->mdct_calc = ff_mdct_fixed_calc_neon;
+ s->mdct_calcw = ff_mdct_fixed_calcw_neon;
+ }
+#endif
}
}