From 7100895117717f9721a73937fa3871d41ea82a2e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Eduard=20M=C3=BCller?= Date: Sat, 29 Jul 2017 22:11:52 +0200 Subject: [PATCH] Revert ooura reverse fft scaling changes ... and adjusted new Intel IPP fft impls scaling accordingly as well --- src/spectral/fft.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/spectral/fft.c b/src/spectral/fft.c index 13411fd2..1c2f80ba 100644 --- a/src/spectral/fft.c +++ b/src/spectral/fft.c @@ -449,16 +449,16 @@ void aubio_fft_rdo_complex(aubio_fft_t * s, const fvec_t * compspec, fvec_t * ou // apply fft ippsFFTInv_CCSToR_64f((const Ipp64f *)s->complexOut, output->data, s->fftSpec, s->memBuffer); // apply scaling - ippsMulC_64f(output->data, 1.0 / s->winsize, output->data, s->fft_size); + ippsMulC_64f(output->data, 2.0 / s->winsize, output->data, s->fft_size); #else // apply fft ippsFFTInv_CCSToR_32f((const Ipp32f *)s->complexOut, output->data, s->fftSpec, s->memBuffer); // apply scaling - ippsMulC_32f(output->data, 1.0f / s->winsize, output->data, s->fft_size); + ippsMulC_32f(output->data, 2.0f / s->winsize, output->data, s->fft_size); #endif /* HAVE_AUBIO_DOUBLE */ #else // using OOURA - smpl_t scale = 1.0 / s->winsize; + smpl_t scale = 2.0 / s->winsize; s->out[0] = compspec->data[0]; s->out[1] = compspec->data[s->winsize / 2]; for (i = 1; i < s->fft_size - 1; i++) { -- 2.11.0