comparison data/fft/FFTDataServer.cpp @ 203:11e107062a2b

* Fix apparent (but not actual) failure to save session file
* Fix doofusness in FFT model (N/2 vs N/2+1) -- need to review use of
  this model in spectrogram

 
     size_t start = m_model->getStartFrame();
     size_t end = m_model->getEndFrame();
 
     m_width = (end - start) / m_windowIncrement + 1;
-    m_height = m_fftSize / 2;
+    m_height = m_fftSize / 2 + 1; // DC == 0, Nyquist == fftsize/2
 
     size_t maxCacheSize = 20 * 1024 * 1024;
     size_t columnSize = m_height * sizeof(fftsample) * 2 + sizeof(fftsample);
     if (m_width * columnSize < maxCacheSize * 2) m_cacheWidth = m_width;
     else m_cacheWidth = maxCacheSize / columnSize;

 
     m_fftInput = (fftsample *)
         fftwf_malloc(fftSize * sizeof(fftsample));
 
     m_fftOutput = (fftwf_complex *)
-        fftwf_malloc(fftSize * sizeof(fftwf_complex));
+        fftwf_malloc((fftSize/2 + 1) * sizeof(fftwf_complex));
 
     m_workbuffer = (float *)
-        fftwf_malloc(fftSize * sizeof(float));
+        fftwf_malloc((fftSize+2) * sizeof(float));
 
     m_fftPlan = fftwf_plan_dft_r2c_1d(m_fftSize,
                                       m_fftInput,
                                       m_fftOutput,
                                       FFTW_ESTIMATE);

 
     fftwf_execute(m_fftPlan);
 
     fftsample factor = 0.0;
 
-    for (size_t i = 0; i < m_fftSize/2; ++i) {
+    for (size_t i = 0; i <= m_fftSize/2; ++i) {
 
 	fftsample mag = sqrtf(m_fftOutput[i][0] * m_fftOutput[i][0] +
                               m_fftOutput[i][1] * m_fftOutput[i][1]);
 	mag /= m_windowSize / 2;
 

 
 	fftsample phase = atan2f(m_fftOutput[i][1], m_fftOutput[i][0]);
 	phase = princargf(phase);
 
         m_workbuffer[i] = mag;
-        m_workbuffer[i + m_fftSize/2] = phase;
+        m_workbuffer[i + m_fftSize/2+1] = phase;
     }
 
     cache->setColumnAt(col,
                        m_workbuffer,
-                       m_workbuffer + m_fftSize/2,
+                       m_workbuffer + m_fftSize/2+1,
                        factor);
 
     if (m_suspended) {
 //        std::cerr << "FFTDataServer::fillColumn(" << x << "): calling resume" << std::endl;
 //        resume();