Mercurial > hg > match-vamp

diff src/MatchVampPlugin.h @ 74:b9aa663a607b refactors

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pull out feature extractor calls from Matcher, remove MatchFeeder, have only the feeder-from-features and use that in MatchVampPlugin
author Chris Cannam
date Wed, 19 Nov 2014 11:59:03 +0000
parents 8cce4e13ede3
children bdd8158d401f 593054bf6476
line wrap: on
line diff
--- a/src/MatchVampPlugin.h	Wed Nov 19 10:48:27 2014 +0000
+++ b/src/MatchVampPlugin.h	Wed Nov 19 11:59:03 2014 +0000
@@ -28,7 +28,7 @@
 #include "Matcher.h"
 #include "FeatureExtractor.h"
 
-class MatchFeeder;
+class MatchFeatureFeeder;
 
 class MatchVampPlugin : public Vamp::Plugin
 {
@@ -67,10 +67,13 @@
 
 protected:
     void createMatchers();
+    bool aboveThreshold(const float *);
 
-    Matcher *pm1;
-    Matcher *pm2;
-    MatchFeeder *feeder;
+    Matcher *m_pm1;
+    Matcher *m_pm2;
+    FeatureExtractor *m_fe1;
+    FeatureExtractor *m_fe2;
+    MatchFeatureFeeder *m_feeder;
 
     Vamp::RealTime m_startTime;
     int m_stepSize;
@@ -81,6 +84,10 @@
     bool m_locked;
     bool m_smooth;
 
+    int m_frameNo;
+    int m_lastFrameIn1;
+    int m_lastFrameIn2;
+    
     Matcher::Parameters m_params;
     Matcher::Parameters m_defaultParams;