Changeset 7100895 for src


Ignore:
Timestamp:
Jul 29, 2017, 10:11:52 PM (2 years ago)
Author:
Eduard Müller <mueller.eduard@googlemail.com>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master
Children:
faeec7c
Parents:
986131d
Message:

Revert ooura reverse fft scaling changes

... and adjusted new Intel IPP fft impls scaling accordingly as well

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/spectral/fft.c

    r986131d r7100895  
    450450  ippsFFTInv_CCSToR_64f((const Ipp64f *)s->complexOut, output->data, s->fftSpec, s->memBuffer);
    451451  // apply scaling
    452   ippsMulC_64f(output->data, 1.0 / s->winsize, output->data, s->fft_size);
     452  ippsMulC_64f(output->data, 2.0 / s->winsize, output->data, s->fft_size);
    453453#else
    454454  // apply fft
    455455  ippsFFTInv_CCSToR_32f((const Ipp32f *)s->complexOut, output->data, s->fftSpec, s->memBuffer);
    456456  // apply scaling
    457   ippsMulC_32f(output->data, 1.0f / s->winsize, output->data, s->fft_size);
     457  ippsMulC_32f(output->data, 2.0f / s->winsize, output->data, s->fft_size);
    458458#endif /* HAVE_AUBIO_DOUBLE */
    459459
    460460#else                         // using OOURA
    461   smpl_t scale = 1.0 / s->winsize;
     461  smpl_t scale = 2.0 / s->winsize;
    462462  s->out[0] = compspec->data[0];
    463463  s->out[1] = compspec->data[s->winsize / 2];
Note: See TracChangeset for help on using the changeset viewer.