Mercurial > hg > qm-dsp
diff dsp/onsets/DetectionFunction.h @ 227:f06672e8db10
* Make it possible to provide the detection function with frequency domain
inputs (i.e. phase vocoder already run)
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Mon, 15 May 2006 11:21:47 +0000 |
| parents | 49844bc8a895 |
| children | da277e8b5244 |
line wrap: on
line diff
--- a/dsp/onsets/DetectionFunction.h Thu Apr 06 12:02:03 2006 +0000 +++ b/dsp/onsets/DetectionFunction.h Mon May 15 11:21:47 2006 +0000 @@ -35,8 +35,11 @@ DetectionFunction( DFConfig Config ); virtual ~DetectionFunction(); double process( double* TDomain ); + double process( double* magnitudes, double* phases ); private: + double runDF(); + double HFC( unsigned int length, double* src); double specDiff( unsigned int length, double* src); double phaseDev(unsigned int length, double *srcMagnitude, double *srcPhase); @@ -50,23 +53,16 @@ unsigned int m_dataLength; unsigned int m_halfLength; - double* magHistory; - double* phaseHistory; - double* phaseHistoryOld; + double* m_magHistory; + double* m_phaseHistory; + double* m_phaseHistoryOld; double* m_DFWindowedFrame; // Array for windowed analysis frame double* m_magnitude; // Magnitude of analysis frame ( frequency domain ) double* m_thetaAngle;// Phase of analysis frame ( frequency domain ) - - vector < ComplexData > meas ; - - ComplexData j; - Window<double> *m_window; - - PhaseVocoder* m_phaseVoc; // Phase Vocoder - + PhaseVocoder* m_phaseVoc; // Phase Vocoder }; #endif