comparison dsp/chromagram/Chromagram.cpp @ 466:46375e6d1b54

Apply fix from daschuer/mixxx:b9c6bde3 Extend the number of Q bins always to a full octave

     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
-    m_uK = (int) ceil( m_BPO * log(m_FMax/m_FMin)/log(2.0));	
+    // No. of constant Q bins, extended to a full octave
+    m_uK = m_BPO * int(ceil(log(m_FMax/m_FMin)/log(2.0)));
 
     // Create array for chroma result
     m_chromadata = new double[ m_BPO ];
 
     // Create Config Structure for ConstantQ operator

 
     // Calculate ConstantQ frame
     m_ConstantQ->process( real, imag, m_CQRe, m_CQIm );
 	
     // add each octave of cq data into Chromagram
-    const int octaves = (int)floor(double( m_uK/m_BPO))-1;
-    for (int octave = 0; octave <= octaves; octave++) 
+    const int octaves = m_uK / m_BPO;
+    for (int octave = 0; octave < octaves; octave++) 
     {
 	int firstBin = octave*m_BPO;
 	for (int i = 0; i < m_BPO; i++) 
 	{
 	    m_chromadata[i] += kabs( m_CQRe[ firstBin + i ], m_CQIm[ firstBin + i ]);