Changeset a006c5f

Timestamp:

Oct 10, 2016, 11:42:14 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

2ca4b59

Parents:

f253b03

Message:

src/synth/sampler.c: remove debug variable, make sure source_blocksize >= blocksize, print a warning if sample duration is shorter than blocksize

File:

• src/synth/sampler.c (modified) (9 diffs)

src/synth/sampler.c

@@ -45 +45 @@
 } aubio_sampler_reading_method;
 
-
-int check_wrote = 0;
 
 typedef enum {
@@ -149 +147 @@
   s->threaded_read = 1;
 #endif
+
+  if (s->source_blocksize < s->blocksize) {
+    s->source_blocksize = s->blocksize;
+  }
   // FIXME: perfectloop fails if source_blocksize > 2048 with source_avcodec
   //s->source_blocksize = 8192;
@@ -230 +232 @@
   newsource = new_aubio_source(uri, o->samplerate, o->source_blocksize);
   if (newsource) {
+    uint_t duration = aubio_source_get_duration(newsource);
+    if (duration < o->blocksize) {
+      AUBIO_WRN("sampler: %s is %d frames long, but blocksize is %d\n",
+          uri, duration, o->blocksize);
+    }
     o->source = newsource;
     if (oldsource) del_aubio_source(oldsource);
@@ -392 +399 @@
   s->source_output = output;
   *read = aubio_sampler_pull_from_source(s);
-  check_wrote += s->source_blocksize;
   if (*read < s->source_blocksize) {
     //AUBIO_WRN("sampler: calling go_eof in _read_from_source()\n");
@@ -443 +449 @@
     //AUBIO_MSG("sampler: pulling %d / %d from ringbuffer\n", s->blocksize, ring_avail);
     aubio_ringbuffer_pull(s->ring, output, s->blocksize);
-    check_wrote += s->blocksize;
     *read = s->blocksize;
     if (s->eof_remaining > 0) {
@@ -454 +459 @@
     }
   } else {
-    AUBIO_MSG("sampler: last frame, pulling remaining %d left\n", ring_avail);
+    //AUBIO_MSG("sampler: last frame, pulling remaining %d left\n", ring_avail);
     *read = 0;
     if (ring_avail > 0) {
       // pull remaining frames in ring buffer
       aubio_ringbuffer_pull(s->ring, output, ring_avail);
-      check_wrote += ring_avail;
       *read += ring_avail;
     }
@@ -491 +495 @@
     available = 0;
   } else if (!s->finished) {
-    //AUBIO_ERR("sampler: _read_from_source: waiting for read avail %d\n", s->started);
     pthread_cond_signal(&s->read_request);
     pthread_cond_wait(&s->read_avail, &s->read_mutex);
@@ -518 +521 @@
     aubio_sampler_reading_from_source_ring_pull(s, output, read);
   }
-  //*read = s->available;
 }
 #endif
@@ -719 +721 @@
 void del_aubio_sampler( aubio_sampler_t * o )
 {
-  AUBIO_MSG("sampler: check_wrote: %d\n", check_wrote);
 #ifdef HAVE_THREADS
   // close opening thread