comparison data/model/FFTModel.cpp @ 1095:b66734b5f806 simple-fft-model

Fix to fft cache

 
         //!!! Need FFTModel overlap tests to exercise this
         
         sv_frame_t off = range.first - m_savedData.range.first;
                 
-        vector<float> partial(m_savedData.data.begin() + off, m_savedData.data.end());
-
-        vector<float> rest = getSourceData({ m_savedData.range.second, range.second });
+        vector<float> acc(m_savedData.data.begin() + off, m_savedData.data.end());
+
+        vector<float> rest =
+            getSourceDataUncached({ m_savedData.range.second, range.second });
         
-        partial.insert(partial.end(), rest.begin(), rest.end());
-        return partial;
-    }
-
+        acc.insert(acc.end(), rest.begin(), rest.end());
+
+        m_savedData = { range, acc };
+        return acc;
+
+    } else {
+
+        auto data = getSourceDataUncached(range);
+        m_savedData = { range, data };
+        return data;
+    }
+}
+
+vector<float>
+FFTModel::getSourceDataUncached(pair<sv_frame_t, sv_frame_t> range) const
+{
     vector<float> data(range.second - range.first, 0.f);
     decltype(range.first) pfx = 0;
     if (range.first < 0) {
         pfx = -range.first;
         range = { 0, range.second };

 	    for (int i = 0; in_range_for(data, i); ++i) {
 		data[i] /= float(channels);
 	    }
 	}
     }
-
-    m_savedData = { range, data };
     
     return data;
 }
 
 vector<complex<float>>