Changeset e467cf9

Timestamp:

Sep 19, 2016, 8:30:05 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:

ed9696f

Parents:

36e9cfeb

Message:

src/effects/pitchshift.c: simplify warm-up code, remove old strcmp

File:

• src/effects/pitchshift.c (modified) (2 diffs)

src/effects/pitchshift.c

@@ -45 +45 @@
 {
   aubio_pitchshift_t *p = AUBIO_NEW (aubio_pitchshift_t);
-  int available = 0; unsigned int latency = 0;
   p->samplerate = samplerate;
-  if (strcmp (mode, "default") != 0) {
-    AUBIO_ERR ("unknown pitch shifting method %s\n", mode);
-    goto beach;
-  }
-  //p->mode = pitch_type;
   p->hopsize = hopsize;
   p->timeratio = 1.;
@@ -97 +91 @@
   //rubberband_set_debug_level(p->rb, 10);
 
+#if 1
+  // warm up rubber band
+  unsigned int latency = 0; int available = 0;
   latency = MAX(rubberband_get_latency(p->rb), p->hopsize);
-
-  // warm up
   fvec_t *zeros = new_fvec(p->hopsize);
   while (available <= (int)latency) {
     rubberband_process(p->rb, (const float* const*)&(zeros->data), p->hopsize, 0);
     available = rubberband_available(p->rb);
-#if 0
-    int samples_required = rubberband_get_samples_required(p->rb);
-    AUBIO_DBG("pitchshift: warmup "
-        "samples_required: %d, available: %d, hopsize: %d, latency: %d\n",
-        samples_required, available, p->hopsize, latency);
+  }
+  del_fvec(zeros);
 #endif
-  }
-  del_fvec(zeros);
 
   return p;