Changes in src/onset/onset.c [763a7f1:9f060d1]

File:

• src/onset/onset.c (modified) (6 diffs)

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);
@@ -68 +81 @@
     }
   } else {
-    // we are at the beginning of the file
-    if (o->total_frames <= o->delay) {
-      // and we don't find silence
-      if (aubio_silence_detection(input, o->silence) == 0) {
-        uint_t new_onset = o->total_frames;
-        if (o->total_frames == 0 || o->last_onset + o->minioi < new_onset) {
-          isonset = o->delay / o->hop_size;
-          o->last_onset = o->total_frames + o->delay;
-        }
-      }
+    // we are at the beginning of the file, and we don't find silence
+    if (o->total_frames <= o->delay && o->last_onset < o ->minioi && aubio_silence_detection(input, o->silence) == 0) {
+      //AUBIO_DBG ("beginning of file is not silent, marking as onset\n");
+      isonset = o->delay / o->hop_size;
+      o->last_onset = o->delay;
     }
   }
@@ -215 +223 @@
   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 +238 @@
 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);