comparison data/model/FFTModel.cpp @ 1093:44b079427b36 simple-fft-model

Make a small cache of recently-used columns

     m_windowType(windowType),
     m_windowSize(windowSize),
     m_windowIncrement(windowIncrement),
     m_fftSize(fftSize),
     m_windower(windowType, windowSize),
-    m_fft(fftSize)
+    m_fft(fftSize),
+    m_cacheSize(3)
 {
     if (m_windowSize > m_fftSize) {
         cerr << "ERROR: FFTModel::FFTModel: window size (" << m_windowSize
              << ") must be at least FFT size (" << m_fftSize << ")" << endl;
         throw invalid_argument("FFTModel window size must be at least FFT size");

 }
 
 float
 FFTModel::getMagnitudeAt(int x, int y) const
 {
-    //!!! 
-    return abs(getFFTColumn(x)[y]);
+    if (x < 0 || x >= getWidth() || y < 0 || y >= getHeight()) return 0.f;
+    auto col = getFFTColumn(x);
+    return abs(col[y]);
 }
 
 float
 FFTModel::getMaximumMagnitudeAt(int x) const
 {

 }
 
 float
 FFTModel::getPhaseAt(int x, int y) const
 {
-    //!!! 
+    if (x < 0 || x >= getWidth() || y < 0 || y >= getHeight()) return 0.f;
     return arg(getFFTColumn(x)[y]);
 }
 
 void
 FFTModel::getValuesAt(int x, int y, float &re, float &im) const

     re = col[y].real();
     im = col[y].imag();
 }
 
 bool
-FFTModel::isColumnAvailable(int ) const
+FFTModel::isColumnAvailable(int) const
 {
     //!!!
     return true;
 }
 

     }
     return samples;
 }
 
 vector<complex<float>>
-FFTModel::getFFTColumn(int column) const
-{
-    auto samples = getSourceSamples(column);
+FFTModel::getFFTColumn(int n) const
+{
+    for (auto &incache : m_cached) {
+        if (incache.n == n) {
+            return incache.col;
+        }
+    }
+    
+    auto samples = getSourceSamples(n);
     m_windower.cut(&samples[0]);
-    return m_fft.process(samples);
+    auto col = m_fft.process(samples);
+
+    SavedColumn sc { n, col };
+    if (m_cached.size() >= m_cacheSize) {
+        m_cached.pop_front();
+    }
+    m_cached.push_back(sc);
+
+    return col;
 }
 
 bool
 FFTModel::estimateStableFrequency(int x, int y, double &frequency)
 {