diff src/MatchPipeline.cpp @ 166:d23dad16d6f9 refactors

Simplify freq handling

--- a/src/MatchPipeline.cpp	Fri Jan 30 14:54:18 2015 +0000
+++ b/src/MatchPipeline.cpp	Thu Feb 05 11:53:23 2015 +0000
@@ -23,7 +23,7 @@
 			     Matcher::Parameters matchParams,
                              double secondReferenceFrequency) :
     m_fe1(feParams),
-    m_fe2(feParams),
+    m_fe2(paramsWithFreq(feParams, secondReferenceFrequency)),
     m_fc1(fcParams),
     m_fc2(fcParams),
     m_pm1(matchParams, dParams, 0),
@@ -33,11 +33,6 @@
     m_lastFrameIn2(0),
     m_frameNo(0)
 {
-    if (secondReferenceFrequency != 0.0) {
-        feParams.referenceFrequency = secondReferenceFrequency;
-        m_fe2 = FeatureExtractor(feParams);
-    }
-    
     m_pm1.setOtherMatcher(&m_pm2);
 }
 
@@ -45,6 +40,14 @@
 {
 }
 
+FeatureExtractor::Parameters
+MatchPipeline::paramsWithFreq(FeatureExtractor::Parameters params, double freq)
+{
+    if (freq == 0.0) return params;
+    params.referenceFrequency = freq;
+    return params;
+}
+
 void
 MatchPipeline::feedFrequencyDomainAudio(const float *arr1, const float *arr2)
 {