comparison src/MatchVampPlugin.cpp @ 177:937951e66c5b refactors

Add parameters for min & max frequency

     desc.defaultValue = (float)m_defaultFeParams.referenceFrequency;
     desc.isQuantized = false;
     desc.unit = "Hz";
     list.push_back(desc);
 
+    desc.identifier = "minfreq";
+    desc.name = "Minimum frequency";
+    desc.description = "Minimum frequency to include in features.";
+    desc.minValue = 0.0;
+    desc.maxValue = (float)m_inputSampleRate / 4.f;
+    desc.defaultValue = (float)m_defaultFeParams.minFrequency;
+    desc.isQuantized = false;
+    desc.unit = "Hz";
+    list.push_back(desc);
+
+    desc.identifier = "maxfreq";
+    desc.name = "Maximum frequency";
+    desc.description = "Maximum frequency to include in features.";
+    desc.minValue = 1000.0;
+    desc.maxValue = (float)m_inputSampleRate / 2.f;
+    desc.defaultValue = (float)m_defaultFeParams.maxFrequency;
+    desc.isQuantized = false;
+    desc.unit = "Hz";
+    list.push_back(desc);
+    
     desc.unit = "";
     
     desc.identifier = "usechroma";
     desc.name = "Feature type";
     desc.description = "Whether to use warped spectrogram or chroma frequency map";

         return m_dParams.noise;
     } else if (name == "freq1") {
         return (float)m_feParams.referenceFrequency;
     } else if (name == "freq2") {
         return (float)m_secondReferenceFrequency;
+    } else if (name == "minfreq") {
+        return (float)m_feParams.minFrequency;
+    } else if (name == "maxfreq") {
+        return (float)m_feParams.maxFrequency;
     }
     
     return 0.0;
 }
 

         m_dParams.noise = (DistanceMetric::NoiseAddition)(int(value + 0.1));
     } else if (name == "freq1") {
         m_feParams.referenceFrequency = value;
     } else if (name == "freq2") {
         m_secondReferenceFrequency = value;
+    } else if (name == "minfreq") {
+        m_feParams.minFrequency = value;
+    } else if (name == "maxfreq") {
+        m_feParams.maxFrequency = value;
     }
 }
 
 size_t
 MatchVampPlugin::getPreferredStepSize() const