Mercurial > hg > match-vamp
comparison src/MatchFeatureFeeder.cpp @ 183:24ddab06aace re-minimise
Toward allowing types to be small again. Doesn't currently build
author | Chris Cannam |
---|---|
date | Thu, 19 Feb 2015 17:17:20 +0000 |
parents | 8e7f96432570 |
children | f415747b151b |
comparison
equal
deleted
inserted
replaced
182:a67663dc698d | 183:24ddab06aace |
---|---|
28 MatchFeatureFeeder::~MatchFeatureFeeder() | 28 MatchFeatureFeeder::~MatchFeatureFeeder() |
29 { | 29 { |
30 } | 30 } |
31 | 31 |
32 void | 32 void |
33 MatchFeatureFeeder::feed(vector<double> f1, vector<double> f2) | 33 MatchFeatureFeeder::feed(feature_t f1, feature_t f2) |
34 { | 34 { |
35 // We maintain two FIFO queues of feature vectors, one per input | 35 // We maintain two FIFO queues of feature vectors, one per input |
36 // stream. When the match-feeder function is entered, it knows | 36 // stream. When the match-feeder function is entered, it knows |
37 // that it has at least one feature in each queue. It loops, | 37 // that it has at least one feature in each queue. It loops, |
38 // processing up to one feature per matcher, until a queue is | 38 // processing up to one feature per matcher, until a queue is |
56 { | 56 { |
57 if (m_pm1->getFrameCount() == 0 || m_pm2->getFrameCount() == 0) { | 57 if (m_pm1->getFrameCount() == 0 || m_pm2->getFrameCount() == 0) { |
58 return 0; | 58 return 0; |
59 } | 59 } |
60 int bestRow = 0; | 60 int bestRow = 0; |
61 double bestCost = 0; | 61 pathcost_t bestCost = 0; |
62 if (!m_finder.getBestColCost(m_pm2->getFrameCount()-1, bestRow, bestCost)) { | 62 if (!m_finder.getBestColCost(m_pm2->getFrameCount()-1, bestRow, bestCost)) { |
63 return -1; | 63 return -1; |
64 } else { | 64 } else { |
65 return bestRow; | 65 return bestRow; |
66 } | 66 } |