comparison src/FeatureExtractor.cpp @ 180:d1bc89794cd4 tuning-rescale

Build with -Wconversion

     // referenceFrequency when creating the map -- setting it up for
     // 440Hz -- and then use it to scale the individual
     // frequency-domain audio frames before applying the map to them.
     
     double refFreq = 440.; // See above -- *not* the parameter!
-    double binWidth = m_params.sampleRate / m_params.fftSize;
+    double binWidth = double(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);
+    int crossoverMidi = int(log(crossoverBin * binWidth / refFreq)/
+                            log(2.0) * 12 + 69 + 0.5);
 
     int i = 0;
     while (i <= crossoverBin) {
         double freq = i * binWidth;
         if (freq < m_params.minFrequency || freq > m_params.maxFrequency) {

         if (freq < m_params.minFrequency || freq > m_params.maxFrequency) {
             m_freqMap[i++] = -1;
         } else {
             double midi = log(freq / refFreq) / log(2.0) * 12 + 69;
             if (midi > 127) midi = 127;
-            int target = crossoverBin + lrint(midi) - crossoverMidi;
+            int target = crossoverBin + int(midi + 0.5) - crossoverMidi;
             if (target >= m_featureSize) target = m_featureSize - 1;
             m_freqMap[i++] = target;
         }
     }
 

 
 void
 FeatureExtractor::makeChromaFrequencyMap()
 {
     double refFreq = m_params.referenceFrequency;
-    double binWidth = m_params.sampleRate / m_params.fftSize;
+    double binWidth = double(m_params.sampleRate) / m_params.fftSize;
     int crossoverBin = (int)(1 / (pow(2, 1/12.0) - 1));
     int i = 0;
     while (i <= crossoverBin) {
         double freq = i * binWidth;
         if (freq < m_params.minFrequency || freq > m_params.maxFrequency) {

         double freq = i * binWidth;
         if (freq < m_params.minFrequency || freq > m_params.maxFrequency) {
             m_freqMap[i++] = -1;
         } else {
             double midi = log(freq / refFreq) / log(2.0) * 12 + 69;
-            m_freqMap[i++] = (lrint(midi)) % 12 + 1;
+            m_freqMap[i++] = (int(midi + 0.5)) % 12 + 1;
         }
     }
 }
 
 vector<double>

 
     if (m_params.useChromaFrequencyMap) return mags;
 
     double ratio = 440. / m_params.referenceFrequency;
 
-    int n = mags.size();
+    int n = static_cast<int>(mags.size());
 
     vector<double> scaled(n, 0.0);
 
     for (int target = 0; target < n; ++target) {