comparison src/FeatureExtractor.cpp @ 166:d23dad16d6f9 refactors

Simplify freq handling

 #include <cassert>
 #include <cmath>
 
 using namespace std;
 
-//#define DEBUG_FEATURE_EXTRACTOR 1
+#define DEBUG_FEATURE_EXTRACTOR 1
 
 FeatureExtractor::FeatureExtractor(Parameters parameters) :
     m_params(parameters)
 {
     m_featureSize = getFeatureSizeFor(parameters);

     double binWidth = m_params.sampleRate / m_params.fftSize;
     int crossoverBin = (int)(2 / (pow(2, 1/12.0) - 1));
     int crossoverMidi = lrint(log(crossoverBin * binWidth / refFreq)/
                               log(2.0) * 12 + 69);
 
+#ifdef DEBUG_FEATURE_EXTRACTOR
     cerr << "FeatureExtractor::makeStandardFrequencyMap: refFreq = " << refFreq << endl;
+#endif
     
     int i = 0;
     while (i <= crossoverBin) {
         m_freqMap[i] = i;
         ++i;

         if (midi > 127) midi = 127;
         int target = crossoverBin + lrint(midi) - crossoverMidi;
         if (target >= m_featureSize) target = m_featureSize - 1;
         m_freqMap[i++] = target;
     }
+
+#ifdef DEBUG_FEATURE_EXTRACTOR
+    cerr << "FeatureExtractor: crossover bin is " << crossoverBin << " for midi "
+         << crossoverMidi << endl;
+#endif
 }
 
 void
 FeatureExtractor::makeChromaFrequencyMap()
 {