Changes in / [763a7f1:be6e8e6]

Location:

src

Files:

• aubio.h (modified) (1 diff)
• onset/onset.c (modified) (5 diffs)
• spectral/awhitening.c (added)
• spectral/awhitening.h (added)

src/aubio.h

@@ -179 +179 @@
 #include "spectral/mfcc.h"
 #include "spectral/specdesc.h"
+#include "spectral/awhitening.h"
 #include "spectral/tss.h"
 #include "pitch/pitch.h"

src/onset/onset.c

@@ -24 +24 @@
 #include "spectral/specdesc.h"
 #include "spectral/phasevoc.h"
+#include "spectral/awhitening.h"
 #include "onset/peakpicker.h"
 #include "mathutils.h"
@@ -43 +44 @@
   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;
 };
 
@@ -50 +54 @@
   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);
@@ -215 +228 @@
   aubio_onset_set_silence(o, -70.);
 
+  o->spectral_whitening = new_aubio_spectral_whitening(buf_size, hop_size, samplerate);
+  o->apply_adaptive_whitening = 1;
+
   /* initialize internal variables */
   o->last_onset = 0;
@@ -227 +243 @@
 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);