annotate dsp/signalconditioning/Filter.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 e5907ae6de17
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 FILTER_H
c@225 12 #define FILTER_H
c@225 13
c@225 14 #ifndef NULL
c@225 15 #define NULL 0
c@225 16 #endif
c@225 17
c@225 18 struct FilterConfig{
c@225 19 unsigned int ord;
c@225 20 double* ACoeffs;
c@225 21 double* BCoeffs;
c@225 22 };
c@225 23
c@225 24 class Filter
c@225 25 {
c@225 26 public:
c@225 27 Filter( FilterConfig Config );
c@225 28 virtual ~Filter();
c@225 29
c@225 30 void reset();
c@225 31
c@225 32 void process( double *src, double *dst, unsigned int length );
c@225 33
c@225 34
c@225 35 private:
c@225 36 void initialise( FilterConfig Config );
c@225 37 void deInitialise();
c@225 38
c@225 39 unsigned int m_ord;
c@225 40
c@225 41 double* m_inBuffer;
c@225 42 double* m_outBuffer;
c@225 43
c@225 44 double* m_ACoeffs;
c@225 45 double* m_BCoeffs;
c@225 46 };
c@225 47
c@225 48 #endif