comparison dsp/transforms/FFT.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 2af6edd98dfa
children 769da847732b
comparison
equal deleted inserted replaced
72:d0b35b1e3a98 73:dcb555b90924
276 double *rout, double *iout) 276 double *rout, double *iout)
277 { 277 {
278 KissFFTRealRec *rec = (KissFFTRealRec *)m_private; 278 KissFFTRealRec *rec = (KissFFTRealRec *)m_private;
279 if (inverse) { 279 if (inverse) {
280 kiss_fftr(rec->inverse, rin, rec->out); 280 kiss_fftr(rec->inverse, rin, rec->out);
281 for (int i = 0; i < m_n; ++i) {
282 rout[i] = rec->out[i].r;
283 iout[i] = rec->out[i].i;
284 }
281 } else { 285 } else {
282 kiss_fftr(rec->forward, rin, rec->out); 286 kiss_fftr(rec->forward, rin, rec->out);
283 } 287 rout[0] = rec->out[0].r;
284 for (int i = 0; i < m_n; ++i) { 288 iout[0] = rec->out[0].i;
285 rout[i] = rec->out[i].r; 289 for (int i = 1; i < m_n/2; ++i) {
286 iout[i] = rec->out[i].i; 290 rout[m_n-i] = rout[i] = rec->out[i].r;
291 }
292 for (int i = 1; i < m_n/2; ++i) {
293 iout[i] = rec->out[i].i;
294 iout[m_n-i] = -iout[i];
295 }
296 rout[m_n/2] = rec->out[m_n/2].r;
297 iout[m_n/2] = rec->out[m_n/2].i;
287 } 298 }
288 } 299 }
289 300
290 #endif 301 #endif