Changes in / [22d7902:0770148]

Files:

• python/lib/gen_external.py (modified) (1 diff)
• src/aubio.h (modified) (1 diff)
• src/effects/pitchshift.h (modified) (3 diffs)
• src/effects/pitchshift_rubberband.c (modified) (5 diffs)
• src/effects/rubberband_utils.c (modified) (3 diffs)
• src/effects/timestretch.h (deleted)
• src/effects/timestretch_dummy.c (deleted)
• src/effects/timestretch_rubberband.c (deleted)
• tests/src/effects/test-pitchshift.c (modified) (1 diff)
• tests/src/effects/test-timestretch.c (deleted)

python/lib/gen_external.py

@@ -47 +47 @@
     'audio_unit',
     'spectral_whitening',
-    'timestretch', # TODO fix parsing of uint_t *read in _do
 ]
 

src/aubio.h

@@ -222 +222 @@
 #include "tempo/beattracking.h"
 #include "effects/pitchshift.h"
-#include "effects/timestretch.h"
 #include "utils/scale.h"
 #include "utils/hist.h"

src/effects/pitchshift.h

@@ -46 +46 @@
 
 */
-void aubio_pitchshift_do (aubio_pitchshift_t * o, const fvec_t * in,
-        fvec_t * out);
+void aubio_pitchshift_do (aubio_pitchshift_t * o, const fvec_t * in, fvec_t * out);
 
 /** deletion of the pitch shifting object
@@ -83 +82 @@
   \param pitchscale new pitch scale of the pitch shifting object
 
-  pitchscale is a frequency ratio. It should be in the range [0.25, 4].
-
   \return 0 if successfull, non-zero otherwise
 
 */
-uint_t aubio_pitchshift_set_pitchscale (aubio_pitchshift_t * o,
-        smpl_t pitchscale);
+uint_t aubio_pitchshift_set_pitchscale (aubio_pitchshift_t * o, smpl_t pitchscale);
 
 /** get the pitchscale of the pitch shifting object
@@ -103 +99 @@
 
   \param o pitch shifting object as returned by new_aubio_pitchshift()
-  \param transpose new pitch transposition of the pitch shifting object,
-  expressed in semitones (should be in the range [-24;+24])
+  \param transpose new pitch transposition of the pitch shifting object, expressed
+  in semitones (should be in the range [-24;+24])
 
   \return 0 if successfull, non-zero otherwise
 
 */
-uint_t aubio_pitchshift_set_transpose (aubio_pitchshift_t * o,
-        smpl_t transpose);
+uint_t aubio_pitchshift_set_transpose (aubio_pitchshift_t * o, smpl_t transpose);
 
 /** get the transposition of the pitch shifting object, in semitones

src/effects/pitchshift_rubberband.c

@@ -26 +26 @@
 #include "effects/pitchshift.h"
 
-#include <rubberband/rubberband-c.h>
+#include "rubberband/rubberband-c.h"
 
 /** generic pitch shifting structure */
@@ -79 +79 @@
   fvec_t *zeros = new_fvec(p->hopsize);
   while (available <= (int)latency) {
-    rubberband_process(p->rb,
-        (const float* const*)&(zeros->data), p->hopsize, 0);
+    rubberband_process(p->rb, (const float* const*)&(zeros->data), p->hopsize, 0);
     available = rubberband_available(p->rb);
   }
@@ -114 +113 @@
     return AUBIO_OK;
   } else {
-    AUBIO_ERR("pitchshift: could not set pitchscale to '%f',"
-        " should be in the range [0.25, 4.].\n", pitchscale);
+    AUBIO_ERR("pitchshift: could not set pitchscale to %.2f\n", pitchscale);
     return AUBIO_FAIL;
   }
@@ -133 +131 @@
     return aubio_pitchshift_set_pitchscale(p, pitchscale);
   } else {
-    AUBIO_ERR("pitchshift: could not set transpose to '%f',"
-        " should be in the range [-24; 24.].\n", transpose);
+    AUBIO_ERR("pitchshift: could not set transpose to %.2f\n", transpose);
     return AUBIO_FAIL;
   }
@@ -153 +150 @@
     rubberband_retrieve(p->rb, (float* const*)&(out->data), p->hopsize);
   } else {
-    AUBIO_WRN("pitchshift: catching up with zeros"
-        ", only %d available, needed: %d, current pitchscale: %f\n",
+    AUBIO_WRN("pitchshift: catching up with zeros, only %d available, needed: %d, "
+        "current pitchscale: %f\n",
         rubberband_available(p->rb), p->hopsize, p->pitchscale);
     fvec_zeros(out);

src/effects/rubberband_utils.c

@@ -5 +5 @@
 #ifdef HAVE_RUBBERBAND
 
-#include <rubberband/rubberband-c.h>
+#include "rubberband/rubberband-c.h"
 
 // check rubberband is 1.8.1, warn if 1.3
@@ -14 +14 @@
 #define RubberBandOptionDetectorSoft 0x00000000
 #endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-char_t** aubio_split_str(const char_t* str, const char_t sep) {
-  char_t** result = 0;
-  uint_t count = 0;
-  char_t input[PATH_MAX];
-  char_t* in_ptr = input;
-  char_t* last_sep = 0;
-  char_t delim[2]; delim[0] = sep; delim[1] = 0;
-
-  strncpy(input, str, PATH_MAX);
-  input[PATH_MAX - 1] = '\0';
-
-  // count number of elements
-  while (*in_ptr) {
-    if (sep == *in_ptr) {
-      count++;
-      last_sep = in_ptr;
-    }
-    in_ptr++;
-  }
-  // add space for trailing token.
-  count += last_sep < (input + strlen(input) - 1);
-  count++;
-
-  result = AUBIO_ARRAY(char_t*, count);
-  if (result) {
-    uint_t idx  = 0;
-    char_t* params = strtok(input, delim);
-    while (params) {
-      // make sure we don't got in the wild
-      assert(idx < count);
-      *(result + idx++) = strdup(params);
-      params = strtok(0, delim);
-    }
-    assert(idx == count - 1);
-    // add null string at the end
-    *(result + idx) = 0;
-  }
-  return result;
-}
 
 RubberBandOptions aubio_get_rubberband_opts(const char_t *mode)
@@ -89 +44 @@
     // nothing to do
   } else {
-    // attempt to parse a list of options, separated with ','
-    char_t **params = aubio_split_str(mode, ':');
-    uint_t i = 0;
-    if (!params || !params[0]) {
-      // memory failure occurred or empty string was passed
-      AUBIO_ERR("rubberband_utils: failed parsing options\n");
-      rboptions = -1;
-    }
-    while (*(params + i) != NULL) {
-      if ( strcmp(params[i], "ProcessOffline" ) == 0 )        {
-             rboptions = RubberBandOptionProcessOffline;
-        // TODO: add wrapper to rb study(smpl_t *input, uint_t write)
-        AUBIO_ERR("rubberband_utils: RubberBandOptionProcessOffline is not available\n");
-        rboptions = -1;
-      }
-      else if ( strcmp(params[i], "ProcessRealTime" ) == 0 )       rboptions |= RubberBandOptionProcessRealTime;
-      else if ( strcmp(params[i], "StretchElastic" ) == 0 )        rboptions |= RubberBandOptionStretchElastic;
-      else if ( strcmp(params[i], "StretchPrecise" ) == 0 )        rboptions |= RubberBandOptionStretchPrecise;
-      else if ( strcmp(params[i], "TransientsCrisp" ) == 0 )       rboptions |= RubberBandOptionTransientsCrisp;
-      else if ( strcmp(params[i], "TransientsMixed" ) == 0 )       rboptions |= RubberBandOptionTransientsMixed;
-      else if ( strcmp(params[i], "TransientsSmooth" ) == 0 )      rboptions |= RubberBandOptionTransientsSmooth;
-      else if ( strcmp(params[i], "DetectorCompound" ) == 0 )      rboptions |= RubberBandOptionDetectorCompound;
-      else if ( strcmp(params[i], "DetectorPercussive" ) == 0 )    rboptions |= RubberBandOptionDetectorPercussive;
-      else if ( strcmp(params[i], "DetectorSoft" ) == 0 )          rboptions |= RubberBandOptionDetectorSoft;
-      else if ( strcmp(params[i], "PhaseLaminar" ) == 0 )          rboptions |= RubberBandOptionPhaseLaminar;
-      else if ( strcmp(params[i], "PhaseIndependent" ) == 0 )      rboptions |= RubberBandOptionPhaseIndependent;
-      else if ( strcmp(params[i], "ThreadingAuto" ) == 0 )         rboptions |= RubberBandOptionThreadingAuto;
-      else if ( strcmp(params[i], "ThreadingNever" ) == 0 )        rboptions |= RubberBandOptionThreadingNever;
-      else if ( strcmp(params[i], "ThreadingAlways" ) == 0 )       rboptions |= RubberBandOptionThreadingAlways;
-      else if ( strcmp(params[i], "WindowStandard" ) == 0 )        rboptions |= RubberBandOptionWindowStandard;
-      else if ( strcmp(params[i], "WindowShort" ) == 0 )           rboptions |= RubberBandOptionWindowShort;
-      else if ( strcmp(params[i], "WindowLong" ) == 0 )            rboptions |= RubberBandOptionWindowLong;
-      else if ( strcmp(params[i], "SmoothingOff" ) == 0 )          rboptions |= RubberBandOptionSmoothingOff;
-      else if ( strcmp(params[i], "SmoothingOn" ) == 0 )           rboptions |= RubberBandOptionSmoothingOn;
-      else if ( strcmp(params[i], "FormantShifted" ) == 0 )        rboptions |= RubberBandOptionFormantShifted;
-      else if ( strcmp(params[i], "FormantPreserved" ) == 0 )      rboptions |= RubberBandOptionFormantPreserved;
-      else if ( strcmp(params[i], "PitchHighSpeed" ) == 0 )        rboptions |= RubberBandOptionPitchHighSpeed;
-      else if ( strcmp(params[i], "PitchHighQuality" ) == 0 )      rboptions |= RubberBandOptionPitchHighQuality;
-      else if ( strcmp(params[i], "PitchHighConsistency" ) == 0 )  rboptions |= RubberBandOptionPitchHighConsistency;
-      else if ( strcmp(params[i], "ChannelsApart" ) == 0 )         rboptions |= RubberBandOptionChannelsApart;
-      else if ( strcmp(params[i], "ChannelsTogether" ) == 0 )      rboptions |= RubberBandOptionChannelsTogether;
-      else {
-        AUBIO_ERR("rubberband_utils: did not understand option '%s', should be one of: "
-          "StretchElastic|StretchPrecise, TransientsCrisp|TransientsMixed|TransientsSmooth, "
-          "DetectorCompound|DetectorPercussive|DetectorSoft, PhaseLaminar|PhaseIndependent, "
-          "ThreadingAuto|ThreadingNever|ThreadingAlways, WindowStandard|WindowLong|WindowShort, "
-          "SmoothingOn|SmoothingOff, FormantShifted|FormantPreserved, "
-          "PitchHighSpeed|PitchHighQuality|PitchHighConsistency, ChannelsApart|ChannelsTogether\n"
-          , params[i]);
-        rboptions = -1;
-      }
-      AUBIO_FREE(params[i]);
-      i++;
-    }
-    AUBIO_FREE(params);
+    // failed parsing option string
+    return -1;
   }
+  // other options to include
+  //p->rboptions |= RubberBandOptionWindowStandard;
+  //p->rboptions |= RubberBandOptionSmoothingOff;
+  //p->rboptions |= RubberBandOptionFormantShifted;
+  //p->rboptions |= RubberBandOptionPitchHighConsistency;
   return rboptions;
 }

tests/src/effects/test-pitchshift.c

@@ -76 +76 @@
   del_fvec(out);
 beach_fvec:
-  aubio_cleanup();
 #else
   err = 0;