Changeset 36e9cfeb

Timestamp:

Sep 19, 2016, 8:22:45 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn, feature/crepe, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch

Children:

e467cf9

Parents:

7a5f963c

Message:

src/effects/pitchshift.c: simplify _do, calling available after process

File:

• src/effects/pitchshift.c (modified) (1 diff)

src/effects/pitchshift.c

@@ -174 +174 @@
 {
   int output = 0;
-  // this may occur when RubberBandStretcher initialPitchScale is changed
-  while (rubberband_available(p->rb) <= (int)p->hopsize) {
-    //AUBIO_WRN("pitchshift: catching up, only %d available\n", rubberband_available(p->rb));
-    rubberband_process(p->rb, (const float* const*)&(in->data), 0, output);
-  }
   rubberband_process(p->rb, (const float* const*)&(in->data), p->hopsize, output);
-  rubberband_retrieve(p->rb, (float* const*)&(out->data), p->hopsize);
+  if (rubberband_available(p->rb) >= (int)p->hopsize) {
+    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",
+        rubberband_available(p->rb), p->hopsize, p->pitchscale);
+    fvec_zeros(out);
+  }
 }