Changeset b257b60 for python/ext/py-source.c

Timestamp:

Aug 12, 2015, 7:21:38 PM (9 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:

60fc05b

Parents:

3a1a5d6 (diff), 7b2d740 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into notes

File:

• python/ext/py-source.c (modified) (6 diffs)

python/ext/py-source.c

@@ -11 +11 @@
 } Py_source;
 
-static char Py_source_doc[] = "source object";
+static char Py_source_doc[] = ""
+"   __new__(path, samplerate = 0, hop_size = 512, channels = 1)\n"
+"\n"
+"       Create a new source, opening the given path for reading.\n"
+"\n"
+"       Examples\n"
+"       --------\n"
+"\n"
+"       Create a new source, using the original samplerate, with hop_size = 512:\n"
+"\n"
+"       >>> source('/tmp/t.wav')\n"
+"\n"
+"       Create a new source, resampling the original to 8000Hz:\n"
+"\n"
+"       >>> source('/tmp/t.wav', samplerate = 8000)\n"
+"\n"
+"       Create a new source, resampling it at 32000Hz, hop_size = 32:\n"
+"\n"
+"       >>> source('/tmp/t.wav', samplerate = 32000, hop_size = 32)\n"
+"\n"
+"       Create a new source, using its original samplerate:\n"
+"\n"
+"       >>> source('/tmp/t.wav', samplerate = 0)\n"
+"\n"
+"   __call__()\n"
+"       vec, read = x() <==> vec, read = x.do()\n"
+"\n"
+"       Read vector from source.\n"
+"\n"
+"       See also\n"
+"       --------\n"
+"       aubio.source.do\n"
+"\n";
+
+static char Py_source_get_samplerate_doc[] = ""
+"x.get_samplerate() -> source samplerate\n"
+"\n"
+"Get samplerate of source.";
+
+static char Py_source_get_channels_doc[] = ""
+"x.get_channels() -> number of channels\n"
+"\n"
+"Get number of channels in source.";
+
+static char Py_source_do_doc[] = ""
+"vec, read = x.do() <==> vec, read = x()\n"
+"\n"
+"Read monophonic vector from source.";
+
+static char Py_source_do_multi_doc[] = ""
+"mat, read = x.do_multi()\n"
+"\n"
+"Read polyphonic vector from source.";
+
+static char Py_source_close_doc[] = ""
+"x.close()\n"
+"\n"
+"Close this source now.";
+
+static char Py_source_seek_doc[] = ""
+"x.seek(position)\n"
+"\n"
+"Seek to resampled frame position.";
 
 static PyObject *
@@ -20 +82 @@
   uint_t samplerate = 0;
   uint_t hop_size = 0;
-  static char *kwlist[] = { "uri", "samplerate", "hop_size", NULL };
-
-  if (!PyArg_ParseTupleAndKeywords (args, kwds, "|sII", kwlist,
-          &uri, &samplerate, &hop_size)) {
+  uint_t channels = 0;
+  static char *kwlist[] = { "uri", "samplerate", "hop_size", "channels", NULL };
+
+  if (!PyArg_ParseTupleAndKeywords (args, kwds, "|sIII", kwlist,
+          &uri, &samplerate, &hop_size, &channels)) {
     return NULL;
   }
@@ -56 +119 @@
   }
 
+  self->channels = 1;
+  if ((sint_t)channels >= 0) {
+    self->channels = channels;
+  } else if ((sint_t)channels < 0) {
+    PyErr_SetString (PyExc_ValueError,
+        "can not use negative value for channels");
+    return NULL;
+  }
+
   return (PyObject *) self;
 }
@@ -64 +136 @@
   self->o = new_aubio_source ( self->uri, self->samplerate, self->hop_size );
   if (self->o == NULL) {
-    PyErr_SetString (PyExc_StandardError, "error creating object");
+    char_t errstr[30 + strlen(self->uri)];
+    sprintf(errstr, "error creating source with %s", self->uri);
+    PyErr_SetString (PyExc_StandardError, errstr);
     return -1;
   }
   self->samplerate = aubio_source_get_samplerate ( self->o );
-  self->channels = aubio_source_get_channels ( self->o );
+  if (self->channels == 0) {
+    self->channels = aubio_source_get_channels ( self->o );
+  }
 
   return 0;
@@ -136 +212 @@
 
 AUBIO_MEMBERS_START(source)
-  {"uri", T_STRING, offsetof (Py_source, uri), READONLY, ""},
-  {"samplerate", T_INT, offsetof (Py_source, samplerate), READONLY, ""},
-  {"channels", T_INT, offsetof (Py_source, channels), READONLY, ""},
-  {"hop_size", T_INT, offsetof (Py_source, hop_size), READONLY, ""},
+  {"uri", T_STRING, offsetof (Py_source, uri), READONLY,
+    "path at which the source was created"},
+  {"samplerate", T_INT, offsetof (Py_source, samplerate), READONLY,
+    "samplerate at which the source is viewed"},
+  {"channels", T_INT, offsetof (Py_source, channels), READONLY,
+    "number of channels found in the source"},
+  {"hop_size", T_INT, offsetof (Py_source, hop_size), READONLY,
+    "number of consecutive frames that will be read at each do or do_multi call"},
 AUBIO_MEMBERS_STOP(source)
 
@@ -164 +244 @@
 }
 
+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;
+}
+
 static PyMethodDef Py_source_methods[] = {
   {"get_samplerate", (PyCFunction) Pyaubio_source_get_samplerate,
-    METH_NOARGS, ""},
+    METH_NOARGS, Py_source_get_samplerate_doc},
   {"get_channels", (PyCFunction) Pyaubio_source_get_channels,
-    METH_NOARGS, ""},
+    METH_NOARGS, Py_source_get_channels_doc},
+  {"do", (PyCFunction) Py_source_do,
+    METH_NOARGS, Py_source_do_doc},
   {"do_multi", (PyCFunction) Py_source_do_multi,
-    METH_NOARGS, ""},
+    METH_NOARGS, Py_source_do_multi_doc},
   {"close", (PyCFunction) Pyaubio_source_close,
-    METH_NOARGS, ""},
+    METH_NOARGS, Py_source_close_doc},
+  {"seek", (PyCFunction) Pyaubio_source_seek,
+    METH_VARARGS, Py_source_seek_doc},
   {NULL} /* sentinel */
 };