Mercurial > hg > match-vamp

diff src/MatchPipeline.cpp @ 160:581b1118ec28 refactors

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/MatchPipeline.cpp	Thu Jan 29 17:02:48 2015 +0000
+++ b/src/MatchPipeline.cpp	Thu Jan 29 17:07:05 2015 +0000
@@ -20,7 +20,8 @@
 MatchPipeline::MatchPipeline(FeatureExtractor::Parameters feParams,
 			     FeatureConditioner::Parameters fcParams,
                              DistanceMetric::Parameters dParams,
-			     Matcher::Parameters matchParams) :
+			     Matcher::Parameters matchParams,
+                             double secondReferenceFrequency) :
     m_fe1(feParams),
     m_fe2(feParams),
     m_fc1(fcParams),
@@ -32,6 +33,11 @@
     m_lastFrameIn2(0),
     m_frameNo(0)
 {
+    if (secondReferenceFrequency != 0.0) {
+        feParams.referenceFrequency = secondReferenceFrequency;
+        m_fe2 = FeatureExtractor(feParams);
+    }
+    
     m_pm1.setOtherMatcher(&m_pm2);
 }