diff 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
line wrap: on
line diff
--- a/layer/SpectrogramLayer.h	Thu Jun 15 11:08:22 2006 +0000
+++ b/layer/SpectrogramLayer.h	Thu Jun 15 12:28:47 2006 +0000
@@ -207,6 +207,8 @@
     void fillTimerTimedOut();
 
 protected:
+    typedef float fftsample;
+
     const DenseTimeValueModel *m_model; // I do not own this
     
     int                 m_channel;
@@ -291,13 +293,13 @@
     void rotateColourmap(int distance);
 
     void fillCacheColumn(int column,
-			 double *inputBuffer,
-			 fftw_complex *outputBuffer,
-			 fftw_plan plan,
+			 fftsample *inputBuffer,
+			 fftwf_complex *outputBuffer,
+			 fftwf_plan plan,
 			 size_t windowSize,
 			 size_t windowIncrement,
                          float *workbuffer,
-			 const Window<double> &windower)
+			 const Window<fftsample> &windower)
 	const;
 
     static float calculateFrequency(size_t bin,