Changeset 11b49d7

Timestamp:

Sep 21, 2014, 2:42:08 AM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

74dcddb

Parents:

24931d5

Message:

python/ext/py-source.c: add seek, thanks @davebrent for the heads up

Location:

python

Files:

• ext/py-source.c (modified) (3 diffs)
• tests/test_source.py (modified) (7 diffs)

python/ext/py-source.c

@@ -69 +69 @@
 "\n"
 "Close this source now.";
+
+static char Py_source_seek_doc[] = ""
+"x.seek(position)\n"
+"\n"
+"Seek to resampled frame position.";
 
 static PyObject *
@@ -236 +241 @@
 {
   aubio_source_close (self->o);
+  Py_RETURN_NONE;
+}
+
+static PyObject *
+Pyaubio_source_seek (Py_source *self, PyObject *args)
+{
+  uint_t err = 0;
+
+  uint_t position;
+  if (!PyArg_ParseTuple (args, "I", &position)) {
+    return NULL;
+  }
+
+  err = aubio_source_seek(self->o, position);
+  if (err != 0) {
+    PyErr_SetString (PyExc_ValueError,
+        "error when seeking in source");
+    return NULL;
+  }
   Py_RETURN_NONE;
 }
@@ -250 +274 @@
   {"close", (PyCFunction) Pyaubio_source_close,
     METH_NOARGS, Py_source_close_doc},
+  {"seek", (PyCFunction) Pyaubio_source_seek,
+    METH_VARARGS, Py_source_seek_doc},
   {NULL} /* sentinel */
 };

python/tests/test_source.py

@@ -33 +33 @@
 class aubio_source_read_test_case(aubio_source_test_case_base):
 
-    def read_from_sink(self, f):
+    def read_from_source(self, f):
         total_frames = 0
         while True:
@@ -43 +43 @@
         print total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")",
         print "from", f.uri
+        return total_frames
 
     def test_samplerate_hopsize(self):
@@ -49 +50 @@
                 f = source(p, samplerate, hop_size)
                 assert f.samplerate != 0
-                self.read_from_sink(f)
+                self.read_from_source(f)
 
     def test_samplerate_none(self):
@@ -55 +56 @@
             f = source(p)
             assert f.samplerate != 0
-            self.read_from_sink(f)
+            self.read_from_source(f)
 
     def test_samplerate_0(self):
@@ -61 +62 @@
             f = source(p, 0)
             assert f.samplerate != 0
-            self.read_from_sink(f)
+            self.read_from_source(f)
 
     def test_wrong_samplerate(self):
@@ -86 +87 @@
             assert f.samplerate != 0
             assert f.hop_size != 0
-            self.read_from_sink(f)
+            self.read_from_source(f)
+
+    def test_seek_to_half(self):
+        from random import randint
+        for p in list_of_sounds:
+            f = source(p, 0, 0)
+            assert f.samplerate != 0
+            assert f.hop_size != 0
+            a = self.read_from_source(f)
+            c = randint(0, a)
+            f.seek(c)
+            b = self.read_from_source(f)
+            assert a == b + c
 
 class aubio_source_readmulti_test_case(aubio_source_read_test_case):
 
-    def read_from_sink(self, f):
+    def read_from_source(self, f):
         total_frames = 0
         while True:
@@ -101 +114 @@
         print total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")",
         print "from", f.uri
+        return total_frames
 
 if __name__ == '__main__':