Changeset 04ebe31

Timestamp:

Mar 11, 2017, 12:20:39 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:

90e25cc

Parents:

6352034

Message:

src/spectral/awhitening.c: use 1.e-4 for floor, make sure we peak values stay above it

File:

• src/spectral/awhitening.c (modified) (3 diffs)

src/spectral/awhitening.c

@@ -25 +25 @@
 #include "spectral/awhitening.h"
 
-#define aubio_spectral_whitening_default_relax_time   30    // in seconds
+#define aubio_spectral_whitening_default_relax_time   250   // in seconds, between 22 and 446
 #define aubio_spectral_whitening_default_decay        0.001 // -60dB attenuation
+#define aubio_spectral_whitening_default_floor        1.e-4 // from 1.e-6 to .2
 
 /** structure to store object state */
@@ -44 +45 @@
   uint_t i = 0;
   for (i = 0; i < o->peak_values->length; i++) {
-    o->peak_values->data[i] =
-      MAX(fftgrain->norm[i], o->r_decay * o->peak_values->data[i]);
+    smpl_t tmp = MAX(o->r_decay * o->peak_values->data[i], o->floor);
+    o->peak_values->data[i] = MAX(fftgrain->norm[i], tmp);
     fftgrain->norm[i] /= o->peak_values->data[i];
   }
@@ -68 +69 @@
   o->hop_size = hop_size;
   o->samplerate = samplerate;
-  o->floor = 1.e-6; // from 1.e-6 to 0.2
+  o->floor = aubio_spectral_whitening_default_floor;
   aubio_spectral_whitening_set_relax_time (o, aubio_spectral_whitening_default_relax_time);
   aubio_spectral_whitening_reset (o);