annotate src/MatchFeatureFeeder.cpp @ 146:214b72d55796 noise

Update unit tests
author Chris Cannam
date Fri, 16 Jan 2015 16:48:55 +0000
parents 42381e437fcd
children 4159f6b71942
rev   line source
cannam@0 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
cannam@0 2
cannam@0 3 /*
cannam@0 4 Vamp feature extraction plugin using the MATCH audio alignment
cannam@0 5 algorithm.
cannam@0 6
cannam@0 7 Centre for Digital Music, Queen Mary, University of London.
cannam@0 8 This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
cannam@0 9
cannam@0 10 This program is free software; you can redistribute it and/or
cannam@0 11 modify it under the terms of the GNU General Public License as
cannam@0 12 published by the Free Software Foundation; either version 2 of the
cannam@0 13 License, or (at your option) any later version. See the file
cannam@0 14 COPYING included with this distribution for more information.
cannam@0 15 */
cannam@0 16
Chris@24 17 #include "MatchFeatureFeeder.h"
cannam@0 18
Chris@14 19 using std::vector;
Chris@14 20
Chris@24 21 MatchFeatureFeeder::MatchFeatureFeeder(Matcher *m1, Matcher *m2) :
Chris@74 22 m_pm1(m1), m_pm2(m2)
cannam@0 23 {
Chris@74 24 m_finder = new Finder(m1);
cannam@0 25 }
cannam@0 26
Chris@24 27 MatchFeatureFeeder::~MatchFeatureFeeder()
cannam@0 28 {
Chris@74 29 delete m_finder;
cannam@0 30 }
cannam@0 31
cannam@0 32 void
Chris@24 33 MatchFeatureFeeder::feed(vector<double> f1, vector<double> f2)
cannam@0 34 {
Chris@49 35 // We maintain two FIFO queues of feature vectors, one per input
Chris@49 36 // stream. When the match-feeder function is entered, it knows
Chris@49 37 // that it has at least one feature in each queue. It loops,
Chris@49 38 // processing up to one feature per matcher, until a queue is
Chris@49 39 // empty. Then it returns, to be called again with more data.
Chris@49 40
Chris@60 41 if (!f1.empty()) {
Chris@74 42 m_q1.push(f1);
Chris@60 43 }
Chris@60 44
Chris@60 45 if (!f2.empty()) {
Chris@74 46 m_q2.push(f2);
Chris@60 47 }
Chris@14 48
Chris@74 49 while (!m_q1.empty() && !m_q2.empty()) {
Chris@63 50 feedBlock();
Chris@63 51 }
Chris@63 52 }
Chris@63 53
Chris@63 54 void
Chris@63 55 MatchFeatureFeeder::finish()
Chris@63 56 {
Chris@74 57 while (!m_q1.empty() || !m_q2.empty()) {
Chris@24 58 feedBlock();
Chris@14 59 }
Chris@14 60 }
Chris@14 61
Chris@24 62 void
Chris@24 63 MatchFeatureFeeder::feedBlock()
Chris@14 64 {
Chris@74 65 if (m_q1.empty()) { // ended
Chris@60 66 feed2();
Chris@74 67 } else if (m_q2.empty()) { // ended
Chris@60 68 feed1();
Chris@78 69 } else if (m_pm1->getFrameCount() < m_pm1->getBlockSize()) { // fill initial block
Chris@24 70 feed1();
Chris@24 71 feed2();
Chris@78 72 } else if (m_pm1->isOverrunning()) { // slope constraints
Chris@24 73 feed2();
Chris@78 74 } else if (m_pm2->isOverrunning()) {
Chris@24 75 feed1();
cannam@0 76 } else {
Chris@74 77 switch (m_finder->getExpandDirection
Chris@78 78 (m_pm1->getFrameCount()-1, m_pm2->getFrameCount()-1)) {
Chris@45 79 case Matcher::AdvanceThis:
Chris@24 80 feed1();
cannam@0 81 break;
Chris@45 82 case Matcher::AdvanceOther:
Chris@24 83 feed2();
cannam@0 84 break;
Chris@45 85 case Matcher::AdvanceBoth:
Chris@24 86 feed1();
Chris@24 87 feed2();
cannam@0 88 break;
Chris@45 89 case Matcher::AdvanceNone:
Chris@74 90 cerr << "m_finder says AdvanceNone!" << endl;
Chris@45 91 break;
cannam@0 92 }
cannam@0 93 }
Chris@135 94
Chris@135 95 m_fpx.push_back(m_pm2->getFrameCount());
Chris@135 96 m_fpy.push_back(m_pm1->getFrameCount());
cannam@0 97 }
cannam@0 98
Chris@24 99 void
Chris@24 100 MatchFeatureFeeder::feed1()
cannam@0 101 {
Chris@74 102 m_pm1->consumeFeatureVector(m_q1.front());
Chris@74 103 m_q1.pop();
cannam@0 104 }
cannam@0 105
Chris@24 106 void
Chris@24 107 MatchFeatureFeeder::feed2()
cannam@0 108 {
Chris@74 109 m_pm2->consumeFeatureVector(m_q2.front());
Chris@74 110 m_q2.pop();
cannam@0 111 }
cannam@0 112