comparison dsp/chromagram/Chromagram.cpp @ 73:dcb555b90924

* Key detector: when returning key strengths, use the peak value of the three underlying chromagram correlations (from 36-bin chromagram) corresponding to each key, instead of the mean. Rationale: This is the same method as used when returning the key value, and it's nice to have the same results in both returned value and plot. The peak performed better than the sum with a simple test set of triads, so it seems reasonable to change the plot to match the key output rather than the other way around. * FFT: kiss_fftr returns only the non-conjugate bins, synthesise the rest rather than leaving them (perhaps dangerously) undefined. Fixes an uninitialised data error in chromagram that could cause garbage results from key detector. * Constant Q: remove precalculated values again, I reckon they're not proving such a good tradeoff.
author cannam
date Fri, 05 Jun 2009 15:12:39 +0000
parents 6cb2b3cd5356
children e5907ae6de17
comparison
equal deleted inserted replaced
72:d0b35b1e3a98 73:dcb555b90924
133 m_windowbuf[i] = data[i]; 133 m_windowbuf[i] = data[i];
134 } 134 }
135 m_window->cut(m_windowbuf); 135 m_window->cut(m_windowbuf);
136 136
137 // FFT of current frame 137 // FFT of current frame
138 m_FFT->process(0, m_windowbuf, m_FFTRe, m_FFTIm); 138 m_FFT->process(false, m_windowbuf, m_FFTRe, m_FFTIm);
139 139
140 return process(m_FFTRe, m_FFTIm); 140 return process(m_FFTRe, m_FFTIm);
141 } 141 }
142 142
143 double* Chromagram::process( const double *real, const double *imag ) 143 double* Chromagram::process( const double *real, const double *imag )