Changeset 128589e

Timestamp:

Oct 9, 2016, 8:03:29 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

f253b03

Parents:

fefbbd8

Message:

src/utils/ringbuffer.c: remove asserts, make sure request < available

File:

• src/utils/ringbuffer.c (modified) (7 diffs)

src/utils/ringbuffer.c

@@ -47 +47 @@
     fvec_t tmp; tmp.data = o->buffer->data + o->write_pos; tmp.length = write;
     fvec_t tmpin; tmpin.data = input->data; tmpin.length = write;
-    assert(tmpin.length == tmp.length);
+    //assert(tmpin.length == tmp.length);
     fvec_copy(&tmpin, &tmp);
 
@@ -70 +70 @@
       tmpin.data = input->data;
       tmpin.length = remaining;
-      assert(tmpin.length == tmp.length);
+      //assert(tmpin.length == tmp.length);
       fvec_copy(&tmpin, &tmp);
     }
@@ -78 +78 @@
     tmpin.data = input->data + remaining;
     tmpin.length = write - remaining;
-    assert(tmpin.length == tmp.length);
+    //assert(tmpin.length == tmp.length);
     fvec_copy(&tmpin, &tmp);
     //AUBIO_WRN("ringbuffer: push2: changing write_pos from %d\n", o->write_pos);
@@ -94 +94 @@
 
 uint_t aubio_ringbuffer_pull(aubio_ringbuffer_t *o, fvec_t *output, uint_t request) {
-  if (o->available <= 0) {
+  if (o->available < (sint_t)request) {
     AUBIO_ERR("ringbuffer: pull: requested %d but %d available\n",
         request, o->available);
@@ -113 +113 @@
     fvec_t tmp; tmp.data = o->buffer->data + o->read_pos; tmp.length = request;
     fvec_t tmpout; tmpout.data = output->data; tmpout.length = request;
-    assert(tmpout.length == tmp.length);
+    //assert(tmpout.length == tmp.length);
     fvec_copy(&tmp, &tmpout);
     //AUBIO_WRN("ringbuffer: pull1: changing read_pos from %d\n", o->read_pos);
@@ -131 +131 @@
     tmpout.data = output->data;
     tmpout.length = remaining;
-    assert(tmpout.length == tmp.length);
+    //assert(tmpout.length == tmp.length);
     fvec_copy(&tmpout, &tmp);
     // write start
@@ -138 +138 @@
     tmpout.data = output->data + remaining;
     tmpout.length = request - remaining;
-    assert(tmpout.length == tmp.length);
+    //assert(tmpout.length == tmp.length);
     fvec_copy(&tmp, &tmpout);
     //AUBIO_WRN("ringbuffer: pull2: changing read_pos from %d\n", o->read_pos);