#include "cvec.h"
#include "spectral/specdesc.h"
#include "spectral/phasevoc.h"
+#include "spectral/awhitening.h"
#include "onset/peakpicker.h"
#include "mathutils.h"
#include "onset/onset.h"
+void aubio_onset_default_parameters (aubio_onset_t *o, char_t * method);
+
/** structure to store object state */
struct _aubio_onset_t {
aubio_pvoc_t * pv; /**< phase vocoder */
uint_t total_frames; /**< total number of frames processed since the beginning */
uint_t last_onset; /**< last detected onset location, in frames */
+
+ uint_t apply_adaptive_whitening;
+ aubio_spectral_whitening_t *spectral_whitening;
};
/* execute onset detection function on iput buffer */
{
smpl_t isonset = 0;
aubio_pvoc_do (o->pv,input, o->fftgrain);
+ /*
+ if (apply_filtering) {
+ }
+ if (apply_compression) {
+ }
+ */
+ if (o->apply_adaptive_whitening) {
+ aubio_spectral_whitening_do(o->spectral_whitening, o->fftgrain);
+ }
aubio_specdesc_do (o->od, o->fftgrain, o->desc);
aubio_peakpicker_do(o->pp, o->desc, onset);
isonset = onset->data[0];
return aubio_onset_get_last_s (o) * 1000.;
}
+uint_t aubio_onset_set_adaptive_whitening (aubio_onset_t *o, uint_t apply_adaptive_whitening)
+{
+ o->apply_adaptive_whitening = apply_adaptive_whitening;
+ return AUBIO_OK;
+}
+
+uint_t aubio_onset_get_adaptive_whitening (aubio_onset_t *o)
+{
+ return o->apply_adaptive_whitening;
+}
+
uint_t aubio_onset_set_silence(aubio_onset_t * o, smpl_t silence) {
o->silence = silence;
return AUBIO_OK;
}
uint_t aubio_onset_set_minioi_s(aubio_onset_t * o, smpl_t minioi) {
- return aubio_onset_set_minioi (o, minioi * o->samplerate);
+ return aubio_onset_set_minioi (o, (uint_t)ROUND(minioi * o->samplerate));
}
smpl_t aubio_onset_get_minioi_s(const aubio_onset_t * o) {
AUBIO_ERR("onset: got buffer_size %d, but can not be < 2\n", buf_size);
goto beach;
} else if (buf_size < hop_size) {
- AUBIO_ERR("onset: hop size (%d) is larger than win size (%d)\n", buf_size, hop_size);
+ AUBIO_ERR("onset: hop size (%d) is larger than win size (%d)\n", hop_size, buf_size);
goto beach;
} else if ((sint_t)samplerate < 1) {
AUBIO_ERR("onset: samplerate (%d) can not be < 1\n", samplerate);
o->pv = new_aubio_pvoc(buf_size, o->hop_size);
o->pp = new_aubio_peakpicker();
o->od = new_aubio_specdesc(onset_mode,buf_size);
+ if (o->od == NULL) goto beach_specdesc;
o->fftgrain = new_cvec(buf_size);
o->desc = new_fvec(1);
- /* set some default parameter */
- aubio_onset_set_threshold (o, 0.3);
- aubio_onset_set_delay(o, 4.3 * hop_size);
- aubio_onset_set_minioi_ms(o, 20.);
- aubio_onset_set_silence(o, -70.);
+ o->spectral_whitening = new_aubio_spectral_whitening(buf_size, hop_size, samplerate);
+
+ aubio_onset_default_parameters (o, onset_mode);
/* initialize internal variables */
o->last_onset = 0;
o->total_frames = 0;
return o;
+beach_specdesc:
+ del_aubio_peakpicker(o->pp);
+ del_aubio_pvoc(o->pv);
beach:
AUBIO_FREE(o);
return NULL;
}
+void aubio_onset_default_parameters (aubio_onset_t * o, char_t * onset_mode)
+{
+ /* set some default parameter */
+ aubio_onset_set_threshold (o, 0.3);
+ aubio_onset_set_delay (o, 4.3 * o->hop_size);
+ aubio_onset_set_minioi_ms (o, 50.);
+ aubio_onset_set_silence (o, -70.);
+ aubio_onset_set_adaptive_whitening (o, 1);
+
+ /* method specific optimisations */
+ if (strcmp (onset_mode, "energy") == 0) {
+ } else if (strcmp (onset_mode, "hfc") == 0 || strcmp (onset_mode, "default") == 0) {
+ aubio_onset_set_adaptive_whitening (o, 0);
+ } else if (strcmp (onset_mode, "complexdomain") == 0
+ || strcmp (onset_mode, "complex") == 0) {
+ aubio_onset_set_delay (o, 4.6 * o->hop_size);
+ aubio_onset_set_threshold (o, 0.15);
+ } else if (strcmp (onset_mode, "phase") == 0) {
+ aubio_onset_set_adaptive_whitening (o, 0);
+ } else if (strcmp (onset_mode, "mkl") == 0) {
+ aubio_onset_set_threshold (o, 0.05);
+ } else if (strcmp (onset_mode, "kl") == 0) {
+ aubio_onset_set_threshold (o, 0.35);
+ } else if (strcmp (onset_mode, "specflux") == 0) {
+ aubio_onset_set_threshold (o, 0.4);
+ } else if (strcmp (onset_mode, "specdiff") == 0) {
+ } else {
+ AUBIO_ERR ("onset: unknown spectral descriptor type %s, "
+ "using default parameters.\n", onset_mode);
+ }
+}
+
void del_aubio_onset (aubio_onset_t *o)
{
+ del_aubio_spectral_whitening(o->spectral_whitening);
del_aubio_specdesc(o->od);
del_aubio_peakpicker(o->pp);
del_aubio_pvoc(o->pv);