david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect cases in double-only/float-only cases

Browse Source
This commit is contained in:
Chris Cannam
2021-03-09 17:21:08 +00:00
parent ee9128020d
commit e79658b04f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dsp/FFT.cpp
View File

@@ -1865,8 +1865,8 @@ public:
dbuf[i] = realIn[i]; dbuf[i] = realIn[i];
} }
fftw_execute(m_dplanf); fftw_execute(m_dplanf);
v_cartesian_interleaved_to_polar(magOut, phaseOut, v_cartesian_interleaved_to_polar
(double *)m_dpacked, m_size/2+1); (magOut, phaseOut, (fft_double_type *)m_dpacked, m_size/2+1);
} }
void forwardMagnitude(const double *R__ realIn, double *R__ magOut) { void forwardMagnitude(const double *R__ realIn, double *R__ magOut) {
@@ -1926,8 +1926,8 @@ public:
fbuf[i] = realIn[i]; fbuf[i] = realIn[i];
} }
fftwf_execute(m_fplanf); fftwf_execute(m_fplanf);
v_cartesian_interleaved_to_polar(magOut, phaseOut, v_cartesian_interleaved_to_polar
(float *)m_fpacked, m_size/2+1); (magOut, phaseOut, (fft_float_type *)m_fpacked, m_size/2+1);
} }
void forwardMagnitude(const float *R__ realIn, float *R__ magOut) { void forwardMagnitude(const float *R__ realIn, float *R__ magOut) {
@@ -1964,7 +1964,7 @@ public:
void inverseInterleaved(const double *R__ complexIn, double *R__ realOut) { void inverseInterleaved(const double *R__ complexIn, double *R__ realOut) {
if (!m_dplanf) initDouble(); if (!m_dplanf) initDouble();
v_convert((double *)m_dpacked, complexIn, m_size + 2); v_convert((fft_double_type *)m_dpacked, complexIn, m_size + 2);
fftw_execute(m_dplani); fftw_execute(m_dplani);
const int sz = m_size; const int sz = m_size;
fft_double_type *const R__ dbuf = m_dbuf; fft_double_type *const R__ dbuf = m_dbuf;
@@ -2034,7 +2034,7 @@ public:
void inverseInterleaved(const float *R__ complexIn, float *R__ realOut) { void inverseInterleaved(const float *R__ complexIn, float *R__ realOut) {
if (!m_fplanf) initFloat(); if (!m_fplanf) initFloat();
v_copy((float *)m_fpacked, complexIn, m_size + 2); v_convert((fft_float_type *)m_fpacked, complexIn, m_size + 2);
fftwf_execute(m_fplani); fftwf_execute(m_fplani);
const int sz = m_size; const int sz = m_size;
fft_float_type *const R__ fbuf = m_fbuf; fft_float_type *const R__ fbuf = m_fbuf;