comparison dsp/chromagram/Chromagram.cpp @ 468:a72d98f8baa3

Revise mechanism for extending chromagram to round number of octaves -
do it only in the chromagram itself, so that we can still create deviant
constant-Q spectrograms if desired

     m_FMin = Config.min;		// min freq
     m_FMax = Config.max;		// max freq
     m_BPO  = Config.BPO;		// bins per octave
     m_normalise = Config.normalise;     // if frame normalisation is required
 
-    // No. of constant Q bins, extended to a full octave
-    m_uK = m_BPO * int(ceil(log(m_FMax/m_FMin)/log(2.0)));
+    // Extend range to a full octave
+    double octaves = log(m_FMax / m_FMin) / log(2.0);
+    m_FMax = m_FMin * pow(2.0, ceil(octaves));
 
     // Create array for chroma result
     m_chromadata = new double[ m_BPO ];
 
     // Create Config Structure for ConstantQ operator

     ConstantQConfig.BPO = m_BPO;
     ConstantQConfig.CQThresh = Config.CQThresh;
 	
     // Initialise ConstantQ operator
     m_ConstantQ = new ConstantQ( ConstantQConfig );
+
+    // No. of constant Q bins
+    m_uK = m_ConstantQ->getK();
 
     // Initialise working arrays
     m_frameSize = m_ConstantQ->getfftlength();
     m_hopSize = m_ConstantQ->gethop();