Changeset 40ed6a7

Timestamp:

Mar 26, 2017, 5:38:09 PM (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:

b63c7d3

Parents:

fa3edc6

Message:

src/onset/onset.h: rename to awhitening, add logmap_compression

Location:

src/onset

Files:

• onset.c (modified) (4 diffs)
• onset.h (modified) (1 diff)

src/onset/onset.c

@@ -49 +49 @@
   uint_t apply_compression;
   smpl_t lambda_compression;
-  uint_t apply_adaptive_whitening;
+  uint_t apply_awhitening;      /**< apply adaptive spectral whitening */
   aubio_spectral_whitening_t *spectral_whitening;
 };
@@ -62 +62 @@
   }
   */
-  if (o->apply_adaptive_whitening) {
+  if (o->apply_awhitening) {
     aubio_spectral_whitening_do(o->spectral_whitening, o->fftgrain);
   }
   if (o->apply_compression) {
-    cvec_logmag(o->fftgrain, o->apply_compression);
+    cvec_logmag(o->fftgrain, o->lambda_compression);
   }
   aubio_specdesc_do (o->od, o->fftgrain, o->desc);
@@ -118 +118 @@
 }
 
-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_awhitening (aubio_onset_t *o, uint_t enable)
+{
+  o->apply_awhitening = enable == 1 ? 1 : 0;
+  return AUBIO_OK;
+}
+
+smpl_t aubio_onset_get_awhitening (aubio_onset_t *o)
+{
+  return o->apply_awhitening;
+}
+
+uint_t aubio_onset_set_logmag_compression (aubio_onset_t *o, smpl_t lambda)
+{
+  if (lambda < 0.) {
+    return AUBIO_FAIL;
+  }
+  o->lambda_compression = lambda;
+  o->apply_compression = (o->lambda_compression > 0.) ? 1 : 0;
+  return AUBIO_OK;
+}
+
+smpl_t aubio_onset_get_logmag_compression (aubio_onset_t *o)
+{
+  return o->apply_compression ? o->lambda_compression : 0;
 }
 
@@ -267 +282 @@
   aubio_onset_set_minioi_ms (o, 50.);
   aubio_onset_set_silence (o, -70.);
-  aubio_onset_set_adaptive_whitening (o, 0);
-
-  o->apply_compression = 0;
-  o->lambda_compression = 1.;
+  // disable spectral whitening
+  aubio_onset_set_awhitening (o, 0);
+  // disable logarithmic magnitude
+  aubio_onset_set_logmag_compression (o, 0.);
 
   /* method specific optimisations */

src/onset/onset.h

@@ -121 +121 @@
 
   \param o onset detection object as returned by new_aubio_onset()
-  \param apply_adaptive_whitening 1 to enable, 0 to disable
-
-*/
-uint_t aubio_onset_set_adaptive_whitening(aubio_onset_t * o, uint_t apply_adaptive_whitening);
-
-/** get onset detection silence threshold
-
-  \param o onset detection object as returned by new_aubio_onset()
-
-  \return adaptive whitening mode, 1 if enabled, 0 otherwise
-
-*/
-uint_t aubio_onset_get_adaptive_whitening(aubio_onset_t * o);
+  \param enable 1 to enable, 0 to disable
+
+  \return 0 if successful, 1 otherwise
+
+*/
+uint_t aubio_onset_set_awhitening(aubio_onset_t * o, uint_t enable);
+
+/** get onset detection adaptive whitening
+
+  \param o onset detection object as returned by new_aubio_onset()
+
+  \return 1 if enabled, 0 otherwise
+
+*/
+smpl_t aubio_onset_get_awhitening(aubio_onset_t * o);
+
+/** set or disable log compression
+
+  \param o onset detection object as returned by new_aubio_onset()
+  \param lambda logarithmic compression factor
+
+  \return 0 if successful, 1 otherwise
+
+ */
+uint_t aubio_onset_set_logmag_compression(aubio_onset_t *o, smpl_t lambda);
+
+/** get onset detection log compression
+ */
+smpl_t aubio_onset_get_logmag_compression(aubio_onset_t *o);
 
 /** set onset detection silence threshold