view src/MatchFeatureFeeder.cpp @ 45:a1b7df871496 refactors

Replace char dist (inc dir in masked section) with float dist + separate dir

/* -*- 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->m_frameCount < pm1->m_blockSize) {		// fill initial block
        feed1();
        feed2();
    }
    else if (pm1->m_runCount >= pm1->m_params.maxRunCount) {  // slope constraints
        feed2();
    } else if (pm2->m_runCount >= pm2->m_params.maxRunCount) {
        feed1();
    } else {
        switch (finder->getExpandDirection
                (pm1->m_frameCount-1, pm2->m_frameCount-1)) {
        case Matcher::AdvanceThis:
            feed1();
            break;
        case Matcher::AdvanceOther:
            feed2();
            break;
        case Matcher::AdvanceBoth:
            feed1();
            feed2();
            break;
        case Matcher::AdvanceNone:
            cerr << "finder says AdvanceNone!" << endl;
            break;
        }
    }
}

void
MatchFeatureFeeder::feed1()
{
    pm1->consumeFeatureVector(q1.front());
    q1.pop();
}

void
MatchFeatureFeeder::feed2()
{
    pm2->consumeFeatureVector(q2.front());
    q2.pop();
}