comparison src/Silvet.cpp @ 301:00fab71b80ec livemode

More tweaking of frequencies

     if (shiftCount > 1) {
         pshift = 
             float((shiftCount - shift) - int(shiftCount / 2) - 1) / shiftCount;
     }
 
-    return float(27.5 * pow(2.0, (note + pshift) / 12.0));
+    float freq = float(27.5 * pow(2.0, (note + pshift) / 12.0));
+
+    cerr << "note = " << note << ", shift = " << shift << ", shiftCount = "
+         << shiftCount << ", obtained freq = " << freq << endl;
+    
+    return freq;
 }
 
 bool
 Silvet::initialise(size_t channels, size_t stepSize, size_t blockSize)
 {

     }
 
     m_flattener = new FlattenDynamics(m_inputSampleRate); // before resampling
     m_flattener->reset();
 
+    // this happens to be processingSampleRate / 3, and is the top
+    // freq used for the EM templates:
+    double maxFreq = 14700;
+
+    if (m_mode == LiveMode) {
+        // We only have 12 bpo rather than 60, so we need the top bin
+        // to be the middle one of the top 5, i.e. 2/5 of a semitone
+        // lower than 14700
+        maxFreq *= powf(2.0, -1.0 / 30.0);
+    }
+    
     double minFreq = 27.5;
 
     if (m_mode != HighQualityMode) {
         // We don't actually return any notes from the bottom octave,
         // so we can just pad with zeros
         minFreq *= 2;
     }
 
     int bpo = 12 *
         (m_mode == LiveMode ? binsPerSemitoneLive : binsPerSemitoneNormal);
-        
+
     CQParameters params(processingSampleRate,
                         minFreq, 
                         processingSampleRate / 3,
                         bpo);
 

     params.threshold = 0.0005;
     params.window = CQParameters::Hann;
 
     m_cq = new CQSpectrogram(params, CQSpectrogram::InterpolateLinear);
 
-    cerr << "cq latency = " << m_cq->getLatency() << endl;
+    cerr << "CQ bins = " << m_cq->getTotalBins() << endl;
+    cerr << "CQ min freq = " << m_cq->getMinFrequency() << " (and for confirmation, freq of bin 0 = " << m_cq->getBinFrequency(0) << ")" << endl;
     
     m_colsPerSec = (m_mode == DraftMode ? 25 : 50);
 
     for (int i = 0; i < (int)m_postFilter.size(); ++i) {
         delete m_postFilter[i];