diff MatchFeatureFeeder.cpp @ 24:89929e9e54fb

Add MatchFeatureFeeder, permitting the aligner to be driven from external data

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MatchFeatureFeeder.cpp	Fri Oct 10 17:45:28 2014 +0100
@@ -0,0 +1,84 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Vamp feature extraction plugin using the MATCH audio alignment
+    algorithm.
+
+    Centre for Digital Music, Queen Mary, University of London.
+    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#include "MatchFeatureFeeder.h"
+
+using std::vector;
+
+MatchFeatureFeeder::MatchFeatureFeeder(Matcher *m1, Matcher *m2) :
+    pm1(m1), pm2(m2)
+{
+    finder = new Finder(m1, m2);
+}
+
+MatchFeatureFeeder::~MatchFeatureFeeder()
+{
+    delete finder;
+}
+
+void
+MatchFeatureFeeder::feed(vector<double> f1, vector<double> f2)
+{
+    q1.push(f1);
+    q2.push(f2);
+
+    while (!q1.empty() && !q2.empty()) {
+        feedBlock();
+    }
+}
+
+void
+MatchFeatureFeeder::feedBlock()
+{
+    if (pm1->frameCount < pm1->blockSize) {		// fill initial block
+        feed1();
+        feed2();
+    }
+    else if (pm1->runCount >= pm1->params.maxRunCount) {  // slope constraints
+        feed2();
+    } else if (pm2->runCount >= pm2->params.maxRunCount) {
+        feed1();
+    } else {
+        switch (finder->getExpandDirection
+                (pm1->frameCount-1, pm2->frameCount-1)) {
+        case ADVANCE_THIS:
+            feed1();
+            break;
+        case ADVANCE_OTHER:
+            feed2();
+            break;
+        case ADVANCE_BOTH:
+            feed1();
+            feed2();
+            break;
+        }
+    }
+}
+
+void
+MatchFeatureFeeder::feed1()
+{
+    pm1->consumeFeatureVector(q1.front());
+    q1.pop();
+}
+
+void
+MatchFeatureFeeder::feed2()
+{
+    pm2->consumeFeatureVector(q2.front());
+    q2.pop();
+}
+