Changeset dddf1f5 for src/onset

Timestamp:

Nov 29, 2007, 5:34:18 PM (17 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

212da72

Parents:

66a1b955 (diff), 6c7d49b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with main branch

Location:

src/onset

Files:

• onset.c (moved) (moved from src/onset.c) (1 diff)
• onset.h (moved) (moved from src/onset.h)
• onsetdetection.c (added)
• onsetdetection.h (moved) (moved from src/onsetdetection.h) (2 diffs)
• peakpick.c (moved) (moved from src/peakpick.c) (1 diff)
• peakpick.h (moved) (moved from src/peakpick.h)

src/onset/onset.c

@@ -19 +19 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
-#include "onsetdetection.h"
-#include "phasevoc.h"
-#include "peakpick.h"
+#include "fvec.h"
+#include "cvec.h"
+#include "onset/onsetdetection.h"
+#include "spectral/phasevoc.h"
+#include "onset/peakpick.h"
 #include "mathutils.h"
-#include "onset.h"
+#include "onset/onset.h"
 
 /** structure to store object state */

src/onset/onsetdetection.h

@@ -47 +47 @@
         aubio_onset_phase,          /**< phase fast */            
         aubio_onset_kl,             /**< Kullback Liebler */
-        aubio_onset_mkl             /**< modified Kullback Liebler */
+        aubio_onset_mkl,            /**< modified Kullback Liebler */
+        aubio_onset_specflux,       /**< spectral flux */
 } aubio_onsetdetection_type;
 
@@ -137 +138 @@
 */
 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 
 

src/onset/peakpick.c

@@ -19 +19 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "mathutils.h"
-#include "biquad.h"
-#include "peakpick.h"
+#include "temporal/biquad.h"
+#include "onset/peakpick.h"
 
 /* peak picking parameters, default values in brackets