comparison layer/SpectrogramLayer.h @ 104:1348818e7be7

* Switch from fftw3 to fftw3f. I think the efficiency improvement is probably worth the lower precision, although I ought to do a few more tests.
author Chris Cannam
date Thu, 15 Jun 2006 12:28:47 +0000
parents 0f36cdf407a6
children bf196d6e8998
comparison
equal deleted inserted replaced
103:5064eeb1c76f 104:1348818e7be7
205 void cacheInvalid(size_t startFrame, size_t endFrame); 205 void cacheInvalid(size_t startFrame, size_t endFrame);
206 206
207 void fillTimerTimedOut(); 207 void fillTimerTimedOut();
208 208
209 protected: 209 protected:
210 typedef float fftsample;
211
210 const DenseTimeValueModel *m_model; // I do not own this 212 const DenseTimeValueModel *m_model; // I do not own this
211 213
212 int m_channel; 214 int m_channel;
213 size_t m_windowSize; 215 size_t m_windowSize;
214 WindowType m_windowType; 216 WindowType m_windowType;
289 291
290 void setColourmap(); 292 void setColourmap();
291 void rotateColourmap(int distance); 293 void rotateColourmap(int distance);
292 294
293 void fillCacheColumn(int column, 295 void fillCacheColumn(int column,
294 double *inputBuffer, 296 fftsample *inputBuffer,
295 fftw_complex *outputBuffer, 297 fftwf_complex *outputBuffer,
296 fftw_plan plan, 298 fftwf_plan plan,
297 size_t windowSize, 299 size_t windowSize,
298 size_t windowIncrement, 300 size_t windowIncrement,
299 float *workbuffer, 301 float *workbuffer,
300 const Window<double> &windower) 302 const Window<fftsample> &windower)
301 const; 303 const;
302 304
303 static float calculateFrequency(size_t bin, 305 static float calculateFrequency(size_t bin,
304 size_t windowSize, 306 size_t windowSize,
305 size_t windowIncrement, 307 size_t windowIncrement,