Changeset 283a619a

Timestamp:

Dec 6, 2018, 11:30:54 AM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

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

Children:

3a96d3d

Parents:

633400d

Message:

[pitchshift] check if hopsize and samplerate are valid, use _set_transpose in new_, comment about final always 0

File:

• src/effects/pitchshift_rubberband.c (modified) (4 diffs)

src/effects/pitchshift_rubberband.c

@@ -50 +50 @@
   p->hopsize = hopsize;
   p->pitchscale = 1.;
-  if (transpose >= -24. && transpose <= 24.) {
-    p->pitchscale = POW(2., transpose / 12.);
-  } else {
-    AUBIO_ERR("pitchshift: transpose should be in the range [-24, 24], got %f\n", transpose);
+  if ((sint_t)hopsize <= 0) {
+    AUBIO_ERR("pitchshift: hop_size should be >= 0, got %d\n", hopsize);
+    goto beach;
+  }
+  if ((sint_t)samplerate <= 0) {
+    AUBIO_ERR("pitchshift: samplerate should be >= 0, got %d\n", samplerate);
     goto beach;
   }
@@ -62 +64 @@
     goto beach;
   }
+
   //AUBIO_MSG("pitchshift: using pitch shifting method %s\n", mode);
 
@@ -67 +70 @@
   rubberband_set_max_process_size(p->rb, p->hopsize);
   //rubberband_set_debug_level(p->rb, 10);
+
+  if (aubio_pitchshift_set_transpose(p, transpose)) goto beach;
 
 #if 1
@@ -140 +145 @@
 aubio_pitchshift_do (aubio_pitchshift_t * p, const fvec_t * in, fvec_t * out)
 {
-  int output = 0;
-  rubberband_process(p->rb, (const float* const*)&(in->data), p->hopsize, output);
+  // third parameter is always 0 since we are never expecting a final frame
+  rubberband_process(p->rb, (const float* const*)&(in->data), p->hopsize, 0);
   if (rubberband_available(p->rb) >= (int)p->hopsize) {
     rubberband_retrieve(p->rb, (float* const*)&(out->data), p->hopsize);