Changeset 6352034

Timestamp:

Mar 11, 2017, 12:12:44 AM (8 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, sampler

Children:

04ebe31

Parents:

2f99427

Message:

src/onset/onset.c: add logarithmic compression

Using these default parameters with the good old HFC, we reach the
following scores:

mirex-2005 | F 80.393 | P 80.841 | R 79.950 | TP 7616 | FP 1360 | Tot 9526
holzapfel | F 69.441 | P 77.803 | R 62.702 | TP 1360 | FP 388 | Tot 2169

File:

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

src/onset/onset.c

@@ -47 +47 @@
   uint_t last_onset;            /**< last detected onset location, in frames */
 
+  uint_t apply_compression;
+  smpl_t lambda_compression;
   uint_t apply_adaptive_whitening;
   aubio_spectral_whitening_t *spectral_whitening;
@@ -59 +61 @@
   if (apply_filtering) {
   }
-  if (apply_compression) {
-  }
   */
   if (o->apply_adaptive_whitening) {
     aubio_spectral_whitening_do(o->spectral_whitening, o->fftgrain);
+  }
+  if (o->apply_compression) {
+    cvec_logmag(o->fftgrain, o->apply_compression);
   }
   aubio_specdesc_do (o->od, o->fftgrain, o->desc);
@@ -260 +263 @@
   aubio_onset_set_minioi_ms (o, 50.);
   aubio_onset_set_silence (o, -70.);
-  aubio_onset_set_adaptive_whitening (o, 1);
+  aubio_onset_set_adaptive_whitening (o, 0);
+
+  o->apply_compression = 0;
+  o->lambda_compression = 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_threshold (o, 0.058);
+    o->apply_compression = 1;
+    o->lambda_compression = 1.;
     aubio_onset_set_adaptive_whitening (o, 0);
   } else if (strcmp (onset_mode, "complexdomain") == 0
@@ -270 +279 @@
     aubio_onset_set_delay (o, 4.6 * o->hop_size);
     aubio_onset_set_threshold (o, 0.15);
+    o->apply_compression = 1;
+    o->lambda_compression = 1.;
   } else if (strcmp (onset_mode, "phase") == 0) {
+    o->apply_compression = 0;
     aubio_onset_set_adaptive_whitening (o, 0);
   } else if (strcmp (onset_mode, "mkl") == 0) {