comparison dsp/onsets/DetectionFunction.h @ 54:5bec06ecc88a

* First cut at Matthew's downbeat estimator -- untested so far
author cannam
date Tue, 10 Feb 2009 12:52:43 +0000
parents 2e3f5d2d62c1
children 7fe29d8a7eaf
comparison
equal deleted inserted replaced
53:796170a9c8e4 54:5bec06ecc88a
21 #define DF_PHASEDEV (3) 21 #define DF_PHASEDEV (3)
22 #define DF_COMPLEXSD (4) 22 #define DF_COMPLEXSD (4)
23 #define DF_BROADBAND (5) 23 #define DF_BROADBAND (5)
24 24
25 struct DFConfig{ 25 struct DFConfig{
26 double stepSecs; // DF step in seconds
27 unsigned int stepSize; // DF step in samples 26 unsigned int stepSize; // DF step in samples
28 unsigned int frameLength; // DF analysis window - usually 2*step 27 unsigned int frameLength; // DF analysis window - usually 2*step
29 int DFType; // type of detection function ( see defines ) 28 int DFType; // type of detection function ( see defines )
30 double dbRise; // only used for broadband df (and required for it) 29 double dbRise; // only used for broadband df (and required for it)
31 bool adaptiveWhitening; // perform adaptive whitening 30 bool adaptiveWhitening; // perform adaptive whitening
57 void deInitialise(); 56 void deInitialise();
58 57
59 int m_DFType; 58 int m_DFType;
60 unsigned int m_dataLength; 59 unsigned int m_dataLength;
61 unsigned int m_halfLength; 60 unsigned int m_halfLength;
62 double m_stepSecs;
63 unsigned int m_stepSize; 61 unsigned int m_stepSize;
64 double m_dbRise; 62 double m_dbRise;
65 bool m_whiten; 63 bool m_whiten;
66 double m_whitenRelaxCoeff; 64 double m_whitenRelaxCoeff;
67 double m_whitenFloor; 65 double m_whitenFloor;