comparison src/Silvet.cpp @ 173:26d054291412

In draft mode, make the CQ transform one octave shorter (bottom octave empty)

 	m_resampler = new Resampler(m_inputSampleRate, processingSampleRate);
     } else {
 	m_resampler = 0;
     }
 
+    double minFreq = 27.5;
+
+    if (!m_hqMode) {
+        // We don't actually return any notes from the bottom octave,
+        // so we can just pad with zeros
+        minFreq *= 2;
+    }
+
     CQParameters params(processingSampleRate,
-                        27.5, 
+                        minFreq, 
                         processingSampleRate / 3,
                         processingBPO);
 
     params.q = 0.95; // MIREX code uses 0.8, but it seems 0.9 or lower
                      // drops the FFT size to 512 from 1024 and alters

     if (m_resampler) {
 	data = m_resampler->process(data.data(), data.size());
     }
 
     Grid cqout = m_cq->process(data);
+
+    if (!m_hqMode) {
+        // Our CQ is one octave shorter in draft mode, so pad with
+        // zeros
+        vector<double> octave(m_cq->getBinsPerOctave(), 0.0);
+        for (int i = 0; i < int(cqout.size()); ++i) {
+            cqout[i].insert(cqout[i].end(), octave.begin(), octave.end());
+        }
+    }
+    
     FeatureSet fs = transcribe(cqout);
     return fs;
 }
 
 Silvet::FeatureSet