Changeset 340f5c7

Timestamp:

Mar 26, 2017, 5:45:07 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:

7b711b3

Parents:

b63c7d3

Message:

src/onset/onset.h: rename logmag_compression to compression

Location:

src/onset

Files:

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

src/onset/onset.c

@@ -129 +129 @@
 }
 
-uint_t aubio_onset_set_logmag_compression (aubio_onset_t *o, smpl_t lambda)
+uint_t aubio_onset_set_compression (aubio_onset_t *o, smpl_t lambda)
 {
   if (lambda < 0.) {
@@ -139 +139 @@
 }
 
-smpl_t aubio_onset_get_logmag_compression (aubio_onset_t *o)
+smpl_t aubio_onset_get_compression (aubio_onset_t *o)
 {
   return o->apply_compression ? o->lambda_compression : 0;
@@ -285 +285 @@
   aubio_onset_set_awhitening (o, 0);
   // disable logarithmic magnitude
-  aubio_onset_set_logmag_compression (o, 0.);
+  aubio_onset_set_compression (o, 0.);
 
   /* method specific optimisations */
@@ -291 +291 @@
   } 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);
+    aubio_onset_set_compression (o, 1.);
   } else if (strcmp (onset_mode, "complexdomain") == 0
              || strcmp (onset_mode, "complex") == 0) {

src/onset/onset.h

@@ -140 +140 @@
 
   \param o onset detection object as returned by new_aubio_onset()
-  \param lambda logarithmic compression factor
+  \param lambda logarithmic compression factor, 0 to disable
 
   \return 0 if successful, 1 otherwise
 
  */
-uint_t aubio_onset_set_logmag_compression(aubio_onset_t *o, smpl_t lambda);
+uint_t aubio_onset_set_compression(aubio_onset_t *o, smpl_t lambda);
 
 /** get onset detection log compression
+
+  \param o onset detection object as returned by new_aubio_onset()
+
+  \returns 0 if disabled, compression factor otherwise
+
  */
-smpl_t aubio_onset_get_logmag_compression(aubio_onset_t *o);
+smpl_t aubio_onset_get_compression(aubio_onset_t *o);
 
 /** set onset detection silence threshold