comparison data/model/FFTModel.cpp @ 1100:5cbf71022679 simple-fft-model

Smooth signal flow through from file to fft model

 {
 //    cerr << "getSourceData(" << range.first << "," << range.second
 //         << "): saved range is (" << m_savedData.range.first
 //         << "," << m_savedData.range.second << ")" << endl;
 
-    if (m_savedData.range == range) return m_savedData.data;
+    if (m_savedData.range == range) {
+        return m_savedData.data;
+    }
 
     if (range.first < m_savedData.range.second &&
         range.first >= m_savedData.range.first &&
         range.second > m_savedData.range.second) {
 
-        //!!! Need FFTModel overlap tests to exercise this
-        
-        sv_frame_t off = range.first - m_savedData.range.first;
-                
-        vector<float> acc(m_savedData.data.begin() + off, m_savedData.data.end());
+        sv_frame_t discard = range.first - m_savedData.range.first;
+
+        vector<float> acc(m_savedData.data.begin() + discard,
+                          m_savedData.data.end());
 
         vector<float> rest =
             getSourceDataUncached({ m_savedData.range.second, range.second });
+
+        acc.insert(acc.end(), rest.begin(), rest.end());
         
-        acc.insert(acc.end(), rest.begin(), rest.end());
-
         m_savedData = { range, acc };
         return acc;
 
     } else {
 

     if (m_channel == -1) {
 	int channels = m_model->getChannelCount();
 	if (channels > 1) {
             int n = int(data.size());
             float factor = 1.f / float(channels);
+            // use mean instead of sum for fft model input
 	    for (int i = 0; i < n; ++i) {
 		data[i] *= factor;
 	    }
 	}
     }

             return incache.col;
         }
     }
     
     auto samples = getSourceSamples(n);
-    m_windower.cut(&samples[0]);
+    m_windower.cut(samples.data());
     auto col = m_fft.process(samples);
 
     SavedColumn sc { n, col };
     if (m_cached.size() >= m_cacheSize) {
         m_cached.pop_front();