comparison dsp/onsets/DetectionFunction.h @ 12:da277e8b5244

* Some fixes to peak picker
* Add broadband energy rise detection function (same as the percussive
  onset detector in the Vamp example plugins)

 
 #define DF_HFC (1)
 #define DF_SPECDIFF (2)
 #define DF_PHASEDEV (3)
 #define DF_COMPLEXSD (4)
+#define DF_BROADBAND (5)
 
 struct DFConfig{
     double stepSecs; // DF step in seconds
     unsigned int stepSize; // DF step in samples
     unsigned int frameLength; // DF analysis window - usually 2*step
     int DFType; // type of detection function ( see defines )
+    double dbRise; // only used for broadband df (and required for it)
 };
 
 class DetectionFunction  
 {
 public:

 
     double HFC( unsigned int length, double* src);
     double specDiff( unsigned int length, double* src);
     double phaseDev(unsigned int length, double *srcMagnitude, double *srcPhase);
     double complexSD(unsigned int length, double *srcMagnitude, double *srcPhase);
+    double broadband(unsigned int length, double *srcMagnitude, double *srcPhase);
 	
 private:
     void initialise( DFConfig Config );
     void deInitialise();
 
     int m_DFType;
     unsigned int m_dataLength;
     unsigned int m_halfLength;
+    double m_dbRise;
 
     double* m_magHistory;
     double* m_phaseHistory;
     double* m_phaseHistoryOld;