Changeset 46243dd4 for src

Timestamp:

Sep 20, 2016, 11:13:53 AM (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:

b3f79ca

Parents:

ed9696f

Message:

src/effects/pitchshift.c: fix max_process_size, simplify warm-up

File:

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

src/effects/pitchshift.c

@@ -96 +96 @@
   //p->rboptions |= RubberBandOptionPitchHighConsistency;
   p->rb = rubberband_new(samplerate, 1, p->rboptions, p->timeratio, p->pitchscale);
-  rubberband_set_max_process_size(p->rb, p->hopsize * 4);
+  rubberband_set_max_process_size(p->rb, p->hopsize);
   //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);
+  unsigned int latency = MAX(p->hopsize, rubberband_get_latency(p->rb));
+  int available = rubberband_available(p->rb);
   fvec_t *zeros = new_fvec(p->hopsize);
-  while (available <= (int)latency) {
+  while (available <= latency) {
     rubberband_process(p->rb, (const float* const*)&(zeros->data), p->hopsize, 0);
     available = rubberband_available(p->rb);