Changeset 992ac88

Timestamp:

Dec 7, 2018, 1:28:55 AM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

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

Children:

9bd769a

Parents:

a874c48

git-author:

Paul Brossier <piem@piem.org> (09/29/16 16:31:10)

git-committer:

Paul Brossier <piem@piem.org> (12/07/18 01:28:55)

Message:

src/effects/timestretch_rubberband.c: factorise into aubio_timestretch_fetch

File:

• src/effects/timestretch_rubberband.c (modified) (8 diffs)

src/effects/timestretch_rubberband.c

@@ -43 +43 @@
 
   aubio_source_t *source;
+  uint_t source_hopsize;          /**< hop size at which the source is read */
   fvec_t *in;
   uint_t eof;
@@ -53 +54 @@
 
 static void aubio_timestretch_warmup (aubio_timestretch_t * p);
-static sint_t aubio_timestretch_fetch(aubio_timestretch_t *p);
+static sint_t aubio_timestretch_fetch(aubio_timestretch_t *p, uint_t fetch);
 
 aubio_timestretch_t *
@@ -62 +63 @@
   p->samplerate = samplerate;
   p->hopsize = hopsize;
+  p->source_hopsize = hopsize;
   p->pitchscale = 1.;
   p->eof = 0;
 
-  p->source = new_aubio_source(uri, samplerate, hopsize);
+  p->source = new_aubio_source(uri, samplerate, p->source_hopsize);
   if (!p->source) goto beach;
   if (samplerate == 0 ) p->samplerate = aubio_source_get_samplerate(p->source);
 
-  p->in = new_fvec(hopsize);
+  p->in = new_fvec(p->source_hopsize);
 
   if (stretchratio <= MAX_STRETCH_RATIO && stretchratio >= MIN_STRETCH_RATIO) {
@@ -86 +88 @@
 
   p->rb = rubberband_new(p->samplerate, 1, p->rboptions, p->stretchratio, p->pitchscale);
-  rubberband_set_max_process_size(p->rb, p->hopsize);
+  rubberband_set_max_process_size(p->rb, p->source_hopsize);
   //rubberband_set_debug_level(p->rb, 10);
 
@@ -102 +104 @@
 {
   // warm up rubber band
-  uint_t source_read = 0;
   unsigned int latency = MAX(p->hopsize, rubberband_get_latency(p->rb));
-  int available = rubberband_available(p->rb);
-  while (available <= (int)latency) {
-    aubio_source_do(p->source, p->in, &source_read);
-    // for very short samples
-    if (source_read < p->hopsize) p->eof = 1;
-    rubberband_process(p->rb, (const float* const*)&(p->in->data), p->hopsize, p->eof);
-    available = rubberband_available(p->rb);
-  }
+  aubio_timestretch_fetch(p, latency);
 }
 
@@ -192 +186 @@
 
 sint_t
-aubio_timestretch_fetch(aubio_timestretch_t *p)
-{
-  uint_t source_read = p->hopsize;
+aubio_timestretch_fetch(aubio_timestretch_t *p, uint_t length)
+{
+  uint_t source_read = p->source_hopsize;
   // read more samples from source until we have enough available or eof is reached
   int available = rubberband_available(p->rb);
-  while ((available < (int)p->hopsize) && (p->eof == 0)) {
+  while ((available < (int)length) && (p->eof == 0)) {
     aubio_source_do(p->source, p->in, &source_read);
-    if (source_read < p->hopsize) {
+    if (source_read < p->source_hopsize) {
       p->eof = 1;
     }
@@ -205 +199 @@
     available = rubberband_available(p->rb);
   }
-  return source_read;
+  return available;
 }
 
@@ -211 +205 @@
 aubio_timestretch_do (aubio_timestretch_t * p, fvec_t * out, uint_t * read)
 {
-  int available = aubio_timestretch_fetch(p);
+  int available = aubio_timestretch_fetch(p, p->hopsize);
   // now retrieve the samples and write them into out->data
   if (available >= (int)p->hopsize) {