comparison data/fft/FFTFileCache.cpp @ 408:115f60df1e4d

* Speed up spectrogram painting by releasing mutex in FFTDataServer
while calculating data prior to writing it, and by adding whole-column
value query methods to FFT objects
* Add paint cache to Thumbwheel -- repaints of this widget were slowing
down the whole spectrogram repaint
* More uses of MutexLocker (named and with debug) and more profile
points
* Make startup much quicker some of the time, with OSC server in place

 #include "FFTFileCache.h"
 
 #include "fileio/MatrixFile.h"
 
 #include "base/Profiler.h"
+#include "base/Thread.h"
 
 #include <iostream>
-
-#include <QMutexLocker>
 
 
 // The underlying matrix has height (m_height * 2 + 1).  In each
 // column we store magnitude at [0], [2] etc and phase at [1], [3]
 // etc, and then store the normalization factor (maximum magnitude) at

 }
 
 void
 FFTFileCache::resize(size_t width, size_t height)
 {
-    QMutexLocker locker(&m_writeMutex);
+    MutexLocker locker(&m_writeMutex, "FFTFileCache::resize::m_writeMutex");
 
     m_mfc->resize(width, height * 2 + m_factorSize);
     if (m_readbuf) {
         delete[] m_readbuf;
         m_readbuf = 0;

 
     case Rectangular:
     {
         float real, imag;
         getValuesAt(x, y, real, imag);
-        value = princargf(atan2f(imag, real));
+        value = atan2f(imag, real);
         break;
     }
 
     case Polar:
         value = getFromReadBufStandard(x, y * 2 + 1);

 }
 
 void
 FFTFileCache::setColumnAt(size_t x, float *mags, float *phases, float factor)
 {
-    QMutexLocker locker(&m_writeMutex);
+    MutexLocker locker(&m_writeMutex, "FFTFileCache::setColumnAt::m_writeMutex");
 
     size_t h = getHeight();
 
     switch (m_storageType) {
 

 }
 
 void
 FFTFileCache::setColumnAt(size_t x, float *real, float *imag)
 {
-    QMutexLocker locker(&m_writeMutex);
+    MutexLocker locker(&m_writeMutex, "FFTFileCache::setColumnAt::m_writeMutex");
 
     size_t h = getHeight();
 
     float factor = 0.0f;
 

             float mag = sqrtf(real[y] * real[y] + imag[y] * imag[y]);
             if (mag > factor) factor = mag;
         }
         for (size_t y = 0; y < h; ++y) {
             float mag = sqrtf(real[y] * real[y] + imag[y] * imag[y]);
-            float phase = princargf(atan2f(imag[y], real[y]));
+            float phase = atan2f(imag[y], real[y]);
             ((uint16_t *)m_writebuf)[y * 2] = uint16_t((mag / factor) * 65535.0);
             ((uint16_t *)m_writebuf)[y * 2 + 1] = uint16_t(int16_t((phase * 32767) / M_PI));
         }
         break;
 

     case Polar:
         for (size_t y = 0; y < h; ++y) {
             float mag = sqrtf(real[y] * real[y] + imag[y] * imag[y]);
             if (mag > factor) factor = mag;
             ((float *)m_writebuf)[y * 2] = mag;
-            float phase = princargf(atan2f(imag[y], real[y]));
+            float phase = atan2f(imag[y], real[y]);
             ((float *)m_writebuf)[y * 2 + 1] = phase;
         }
         break;
     }