diff Matcher.h @ 21:b15106b0abcd

Separate out feature extraction from distance calculations

--- a/Matcher.h	Fri Oct 10 14:45:15 2014 +0100
+++ b/Matcher.h	Fri Oct 10 15:58:19 2014 +0100
@@ -297,7 +297,7 @@
      *  mapping is one to one. Where the spacing is greater than 0.5
      *  semitones, the FFT energy is mapped into semitone-wide
      *  bins. No scaling is performed; that is the energy is summed
-     *  into the comparison bins. See also processFrame()
+     *  into the comparison bins. See also consumeFrame()
      */
     void makeStandardFrequencyMap();
 
@@ -316,7 +316,7 @@
      *  Return value is the frame (post-processed, with warping,
      *  rectification, and normalisation as appropriate).
      */
-    std::vector<double> processFrame(double *reBuffer, double *imBuffer);
+    std::vector<double> consumeFrame(double *reBuffer, double *imBuffer);
 
     /** Calculates the Manhattan distance between two vectors, with an
      *  optional normalisation by the combined values in the
@@ -349,6 +349,9 @@
      */
     void setValue(int i, int j, int dir, int value, int dMN);
 
+    vector<double> processFrameFromFreqData(double *, double *);
+    void calcAdvance();
+
     friend class MatchFeeder;
     friend class Finder;