annotate dsp/chromagram/ChromaProcess.h @ 298:255e431ae3d4

* 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 Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 05 Jun 2009 15:12:39 +0000
parents 49844bc8a895
children
rev   line source
c@225 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
c@225 2
c@225 3 /*
c@225 4 QM DSP Library
c@225 5
c@225 6 Centre for Digital Music, Queen Mary, University of London.
c@225 7 This file copyright 2005-2006 Christian Landone.
c@225 8 All rights reserved.
c@225 9 */
c@225 10
c@225 11 #ifndef CHROMAPROCESS_H
c@225 12 #define CHROMAPROCESS_H
c@225 13
c@225 14 #include <vector>
c@225 15
c@225 16 using namespace std;
c@225 17
c@225 18 class ChromaProcess
c@225 19 {
c@225 20 public:
c@225 21 void findHistMaxMin( vector<double> hist, double* max, int*maxIdx, double* min, int* minIdx );
c@225 22 vector <int> mod( vector <int> input, int res );
c@225 23 vector <int> getPeaks( vector <double> chroma, unsigned int BPO );
c@225 24 int findChromaBias( vector<double> chromaVector, unsigned int BPO, unsigned int frames );
c@225 25 ChromaProcess();
c@225 26 virtual ~ChromaProcess();
c@225 27
c@225 28 };
c@225 29
c@225 30 #endif // !defined(CHROMAPROCESS_H)