From: Paul Brossier Date: Wed, 7 Oct 2009 16:28:53 +0000 (+0200) Subject: src/onset/onsetdetection.{c,h}: no need for function specific prototypes to be public X-Git-Tag: bzr2git~200 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b8828918ce4056f810fced1cc836e871af834ad;p=aubio.git src/onset/onsetdetection.{c,h}: no need for function specific prototypes to be public --- diff --git a/src/onset/onsetdetection.c b/src/onset/onsetdetection.c index b52c94ef..837b398b 100644 --- a/src/onset/onsetdetection.c +++ b/src/onset/onsetdetection.c @@ -25,6 +25,103 @@ #include "utils/hist.h" #include "onset/onsetdetection.h" +/** Energy based onset detection function + + This function calculates the local energy of the input spectral frame. + + \param o onset detection object as returned by new_aubio_onsetdetection() + \param fftgrain input spectral frame + \param onset output onset detection function + +*/ +void aubio_onsetdetection_energy(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); +/** High Frequency Content onset detection function + + This method computes the High Frequency Content (HFC) of the input spectral + frame. The resulting function is efficient at detecting percussive onsets. + + Paul Masri. Computer modeling of Sound for Transformation and Synthesis of + Musical Signal. PhD dissertation, University of Bristol, UK, 1996. + + \param o onset detection object as returned by new_aubio_onsetdetection() + \param fftgrain input spectral frame + \param onset output onset detection function + +*/ +void aubio_onsetdetection_hfc(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); +/** Complex Domain Method onset detection function + + Christopher Duxbury, Mike E. Davies, and Mark B. Sandler. Complex domain + onset detection for musical signals. In Proceedings of the Digital Audio + Effects Conference, DAFx-03, pages 90-93, London, UK, 2003. + + \param o onset detection object as returned by new_aubio_onsetdetection() + \param fftgrain input spectral frame + \param onset output onset detection function + +*/ +void aubio_onsetdetection_complex(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); +/** Phase Based Method onset detection function + + Juan-Pablo Bello, Mike P. Davies, and Mark B. Sandler. Phase-based note onset + detection for music signals. In Proceedings of the IEEE International + Conference on Acoustics Speech and Signal Processing, pages 441­444, + Hong-Kong, 2003. + + \param o onset detection object as returned by new_aubio_onsetdetection() + \param fftgrain input spectral frame + \param onset output onset detection function + +*/ +void aubio_onsetdetection_phase(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); +/** Spectral difference method onset detection function + + Jonhatan Foote and Shingo Uchihashi. The beat spectrum: a new approach to + rhythm analysis. In IEEE International Conference on Multimedia and Expo + (ICME 2001), pages 881­884, Tokyo, Japan, August 2001. + + \param o onset detection object as returned by new_aubio_onsetdetection() + \param fftgrain input spectral frame + \param onset output onset detection function + +*/ +void aubio_onsetdetection_specdiff(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); +/** Kullback-Liebler onset detection function + + Stephen Hainsworth and Malcom Macleod. Onset detection in music audio + signals. In Proceedings of the International Computer Music Conference + (ICMC), Singapore, 2003. + + \param o onset detection object as returned by new_aubio_onsetdetection() + \param fftgrain input spectral frame + \param onset output onset detection function + +*/ +void aubio_onsetdetection_kl(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); +/** Modified Kullback-Liebler onset detection function + + Paul Brossier, ``Automatic annotation of musical audio for interactive + systems'', Chapter 2, Temporal segmentation, PhD thesis, Centre for Digital + music, Queen Mary University of London, London, UK, 2006. + + \param o onset detection object as returned by new_aubio_onsetdetection() + \param fftgrain input spectral frame + \param onset output onset detection function + +*/ +void aubio_onsetdetection_mkl(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); +/** Spectral Flux + + Simon Dixon, Onset Detection Revisited, in ``Proceedings of the 9th + International Conference on Digital Audio Effects'' (DAFx-06), Montreal, + Canada, 2006. + + \param o onset detection object as returned by new_aubio_onsetdetection() + \param fftgrain input spectral frame + \param onset output onset detection function + +*/ +void aubio_onsetdetection_specflux(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); /** structure to store object state */ struct _aubio_onsetdetection_t { diff --git a/src/onset/onsetdetection.h b/src/onset/onsetdetection.h index ba1c1329..0c044ceb 100644 --- a/src/onset/onsetdetection.h +++ b/src/onset/onsetdetection.h @@ -52,103 +52,6 @@ typedef enum { /** onsetdetection structure */ typedef struct _aubio_onsetdetection_t aubio_onsetdetection_t; -/** Energy based onset detection function - - This function calculates the local energy of the input spectral frame. - - \param o onset detection object as returned by new_aubio_onsetdetection() - \param fftgrain input spectral frame - \param onset output onset detection function - -*/ -void aubio_onsetdetection_energy(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); -/** High Frequency Content onset detection function - - This method computes the High Frequency Content (HFC) of the input spectral - frame. The resulting function is efficient at detecting percussive onsets. - - Paul Masri. Computer modeling of Sound for Transformation and Synthesis of - Musical Signal. PhD dissertation, University of Bristol, UK, 1996. - - \param o onset detection object as returned by new_aubio_onsetdetection() - \param fftgrain input spectral frame - \param onset output onset detection function - -*/ -void aubio_onsetdetection_hfc(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); -/** Complex Domain Method onset detection function - - Christopher Duxbury, Mike E. Davies, and Mark B. Sandler. Complex domain - onset detection for musical signals. In Proceedings of the Digital Audio - Effects Conference, DAFx-03, pages 90-93, London, UK, 2003. - - \param o onset detection object as returned by new_aubio_onsetdetection() - \param fftgrain input spectral frame - \param onset output onset detection function - -*/ -void aubio_onsetdetection_complex(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); -/** Phase Based Method onset detection function - - Juan-Pablo Bello, Mike P. Davies, and Mark B. Sandler. Phase-based note onset - detection for music signals. In Proceedings of the IEEE International - Conference on Acoustics Speech and Signal Processing, pages 441­444, - Hong-Kong, 2003. - - \param o onset detection object as returned by new_aubio_onsetdetection() - \param fftgrain input spectral frame - \param onset output onset detection function - -*/ -void aubio_onsetdetection_phase(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); -/** Spectral difference method onset detection function - - Jonhatan Foote and Shingo Uchihashi. The beat spectrum: a new approach to - rhythm analysis. In IEEE International Conference on Multimedia and Expo - (ICME 2001), pages 881­884, Tokyo, Japan, August 2001. - - \param o onset detection object as returned by new_aubio_onsetdetection() - \param fftgrain input spectral frame - \param onset output onset detection function - -*/ -void aubio_onsetdetection_specdiff(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); -/** Kullback-Liebler onset detection function - - Stephen Hainsworth and Malcom Macleod. Onset detection in music audio - signals. In Proceedings of the International Computer Music Conference - (ICMC), Singapore, 2003. - - \param o onset detection object as returned by new_aubio_onsetdetection() - \param fftgrain input spectral frame - \param onset output onset detection function - -*/ -void aubio_onsetdetection_kl(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); -/** Modified Kullback-Liebler onset detection function - - Paul Brossier, ``Automatic annotation of musical audio for interactive - systems'', Chapter 2, Temporal segmentation, PhD thesis, Centre for Digital - music, Queen Mary University of London, London, UK, 2006. - - \param o onset detection object as returned by new_aubio_onsetdetection() - \param fftgrain input spectral frame - \param onset output onset detection function - -*/ -void aubio_onsetdetection_mkl(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); -/** Spectral Flux - - Simon Dixon, Onset Detection Revisited, in ``Proceedings of the 9th - International Conference on Digital Audio Effects'' (DAFx-06), Montreal, - Canada, 2006. - - \param o onset detection object as returned by new_aubio_onsetdetection() - \param fftgrain input spectral frame - \param onset output onset detection function - -*/ -void aubio_onsetdetection_specflux(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset); /** execute onset detection function on a spectral frame Generic function to compute onset detection.