Mercurial > hg > match-vamp
comparison src/MatchPipeline.cpp @ 160:581b1118ec28 refactors
Permit overriding reference frequency for second input in MatchPipeline
author | Chris Cannam |
---|---|
date | Thu, 29 Jan 2015 17:07:05 +0000 |
parents | 6914a6a01ffc |
children | d23dad16d6f9 |
comparison
equal
deleted
inserted
replaced
159:cdbee79699b0 | 160:581b1118ec28 |
---|---|
18 //#define DEBUG_MATCH_PIPELINE 1 | 18 //#define DEBUG_MATCH_PIPELINE 1 |
19 | 19 |
20 MatchPipeline::MatchPipeline(FeatureExtractor::Parameters feParams, | 20 MatchPipeline::MatchPipeline(FeatureExtractor::Parameters feParams, |
21 FeatureConditioner::Parameters fcParams, | 21 FeatureConditioner::Parameters fcParams, |
22 DistanceMetric::Parameters dParams, | 22 DistanceMetric::Parameters dParams, |
23 Matcher::Parameters matchParams) : | 23 Matcher::Parameters matchParams, |
24 double secondReferenceFrequency) : | |
24 m_fe1(feParams), | 25 m_fe1(feParams), |
25 m_fe2(feParams), | 26 m_fe2(feParams), |
26 m_fc1(fcParams), | 27 m_fc1(fcParams), |
27 m_fc2(fcParams), | 28 m_fc2(fcParams), |
28 m_pm1(matchParams, dParams, 0), | 29 m_pm1(matchParams, dParams, 0), |
30 m_feeder(&m_pm1, &m_pm2), | 31 m_feeder(&m_pm1, &m_pm2), |
31 m_lastFrameIn1(0), | 32 m_lastFrameIn1(0), |
32 m_lastFrameIn2(0), | 33 m_lastFrameIn2(0), |
33 m_frameNo(0) | 34 m_frameNo(0) |
34 { | 35 { |
36 if (secondReferenceFrequency != 0.0) { | |
37 feParams.referenceFrequency = secondReferenceFrequency; | |
38 m_fe2 = FeatureExtractor(feParams); | |
39 } | |
40 | |
35 m_pm1.setOtherMatcher(&m_pm2); | 41 m_pm1.setOtherMatcher(&m_pm2); |
36 } | 42 } |
37 | 43 |
38 MatchPipeline::~MatchPipeline() | 44 MatchPipeline::~MatchPipeline() |
39 { | 45 { |