Changeset 2ca4b59

Timestamp:

Oct 11, 2016, 2:37:25 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

a125fb9a

Parents:

a006c5f

Message:

src/synth/sampler.c: add _set_table and allow switching to/from table or source

Location:

src/synth

Files:

• sampler.c (modified) (9 diffs)
• sampler.h (modified) (1 diff)

src/synth/sampler.c

@@ -60 +60 @@
   // current interpolation mode (can be quadratic, timestretch, ...)
   uint_t interp;
-  // reading from a table
   aubio_ringbuffer_t *ring;
   uint_t perfectloop;
   uint_t eof_remaining;
-  fvec_t *samples;
-  fmat_t *msamples;
+  // reading from a table
+  fvec_t *table;
+  uint_t table_index;
   // reading from a source
   aubio_source_t *source;
@@ -171 +171 @@
 #endif
 
+#if 0
+  s->reading_from = aubio_sampler_reading_from_table;
+  s->perfectloop = 1;
+  s->threaded_read = 0;
+  s->opened = 1;
+  s->finished = 1;
+  s->table_index = 0;
+#endif
+
   return s;
 beach:
@@ -196 +205 @@
   // clean up opening thread
   void *threadret;
+  if (!o->open_thread) return;
   pthread_mutex_destroy(&o->open_mutex);
   if (o->open_thread_running) {
@@ -206 +216 @@
   }
   pthread_mutex_destroy(&o->open_mutex);
+  o->open_thread = 0;
 }
 
@@ -223 +234 @@
   pthread_cond_destroy(&o->read_avail);
   pthread_cond_destroy(&o->read_request);
+  o->read_thread = 0;
 }
 #endif
@@ -293 +305 @@
 #ifdef HAVE_THREADS
   uint_t ret = AUBIO_OK;
+
+  if (o->reading_from == aubio_sampler_reading_from_table) {
+    o->reading_from = aubio_sampler_reading_from_source;
+    o->opened = 0;
+    o->finished = 1;
+  }
   /* open uri in open_thread */
   if (o->open_thread_running) {
@@ -549 +567 @@
 
 void
-aubio_sampler_read_from_table(aubio_sampler_t *o, fvec_t *output, uint_t *read) {
+aubio_sampler_read_from_table(aubio_sampler_t *s, fvec_t *output, uint_t *read) {
   *read = 0;
-  AUBIO_WRN("sampler: _pull_from_table not implemented for %d, %d, %d",
-      o, output->length, *read);
+  if (s->table == NULL) {
+    AUBIO_WRN("sampler: _pull_from_table but table not set %d, %d\n",
+        output->length, *read);
+  } else if (s->playing) {
+    uint_t available = s->table->length - s->table_index;
+    fvec_t tmp;
+    tmp.data = s->table->data + s->table_index;
+    if (available < s->blocksize) {
+      //AUBIO_WRN("sampler: _pull_from_table: table length %d, index: %d, read %d\n",
+      //    s->table->length, s->table_index, *read);
+      tmp.length = available;
+      fvec_t tmpout; tmpout.data = output->data; tmpout.length = available;
+      fvec_copy(&tmp, &tmpout);
+      if (s->loop && s->perfectloop) {
+        uint_t remaining = s->blocksize - available;
+        tmpout.data = output->data + available; tmpout.length = remaining;
+        tmp.data = s->table->data; tmp.length = remaining;
+        fvec_copy(&tmp, &tmpout);
+        s->table_index = remaining;
+        *read = s->blocksize;
+      } else {
+        s->table_index = 0;
+        *read = available;
+      }
+      aubio_sampler_do_eof(s);
+    } else {
+      tmp.length = s->blocksize;
+      fvec_copy(&tmp, output);
+      s->table_index += output->length;
+      *read = s->blocksize;
+    }
+  }
+}
+
+uint_t
+aubio_sampler_set_table(aubio_sampler_t *s, fvec_t *samples) {
+  if (!samples || !s) return AUBIO_FAIL;
+  if (s->reading_from == aubio_sampler_reading_from_source) {
+    //aubio_sampler_close_reading_thread(s);
+  }
+  s->table = samples;
+  //AUBIO_INF("sampler: setting table (%d long)\n", s->table->length);
+  s->table_index = 0;
+  s->reading_from = aubio_sampler_reading_from_table;
+  //s->threaded_read = 0;
+  s->opened = 1;
+  s->finished = 1;
+  return AUBIO_OK;
 }
 
@@ -620 +684 @@
   if (o->source) {
     ret = aubio_source_seek(o->source, pos);
+  } else {
+    o->table_index = pos;
   }
   return ret;
@@ -633 +699 @@
     o->playing = 0;
   } else {
-    aubio_sampler_seek(o, 0);
+    if (o->reading_from == aubio_sampler_reading_from_source)
+      aubio_sampler_seek(o, 0);
     //o->finished = 0;
   }

src/synth/sampler.h

@@ -83 +83 @@
 uint_t aubio_sampler_queue(aubio_sampler_t * o, const char_t * uri );
 
+/** set array to read from
+
+  \param o sampler, created by new_aubio_sampler()
+  \param samples the vector to set the table to
+
+  \return 0 if successfully set, non-zero otherwise
+
+*/
+uint_t aubio_sampler_set_table(aubio_sampler_t *o, fvec_t *samples);
+
 /** process sampler function