Changeset 21e8408 for python/ext/py-filter.c

Timestamp:

Apr 29, 2016, 11:48:39 PM (8 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:

e84f7b9

Parents:

b055b4e

Message:

python/lib/gen_code.py: switch to using PyObjects? instead of fvec, cvec, fmat

File:

• python/ext/py-filter.c (modified) (5 diffs)

python/ext/py-filter.c

@@ -7 +7 @@
   uint_t order;
   fvec_t vec;
-  fvec_t *out;
+  PyObject *out;
+  fvec_t c_out;
 } Py_filter;
 
@@ -50 +51 @@
     return -1;
   }
-  self->out = new_fvec(Py_default_vector_length);
+  self->out = NULL;
   return 0;
 }
@@ -57 +58 @@
 Py_filter_del (Py_filter * self)
 {
-  del_fvec(self->out);
+  Py_XDECREF(self->out);
   del_aubio_filter (self->o);
   Py_TYPE(self)->tp_free ((PyObject *) self);
 }
 
-static PyObject * 
+static PyObject *
 Py_filter_do(Py_filter * self, PyObject * args)
 {
@@ -79 +80 @@
   }
 
-  // reallocate the output if needed
-  if (self->vec.length != self->out->length) {
-    del_fvec(self->out);
-    self->out = new_fvec(self->vec.length);
+  // initialize output now
+  if (self->out == NULL) {
+    self->out = new_py_fvec(self->vec.length);
+  }
+
+  Py_INCREF(self->out);
+  if (!PyAubio_ArrayToCFvec(self->out, &(self->c_out)) ) {
+    return NULL;
   }
   // compute the function
-  aubio_filter_do_outplace (self->o, &(self->vec), self->out);
-  return PyAubio_CFvecToArray(self->out);
-}
-
-static PyObject * 
+  aubio_filter_do_outplace (self->o, &(self->vec), &(self->c_out));
+  return self->out;
+}
+
+static PyObject *
 Py_filter_set_c_weighting (Py_filter * self, PyObject *args)
 {
@@ -107 +112 @@
 }
 
-static PyObject * 
+static PyObject *
 Py_filter_set_a_weighting (Py_filter * self, PyObject *args)
 {