Changeset 202697a

Timestamp:

Apr 18, 2016, 8:32:07 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:

de81d2b

Parents:

59cb451

Message:

ext/py-phasevoc.c: continue fixing memory leak (#49)

File:

• python/ext/py-phasevoc.c (modified) (7 diffs)

python/ext/py-phasevoc.c

@@ -3 +3 @@
 static char Py_pvoc_doc[] = "pvoc object";
 
-AUBIO_DECLARE(pvoc, uint_t win_s; uint_t hop_s)
+typedef struct
+{
+  PyObject_HEAD
+  aubio_pvoc_t * o;
+  uint_t win_s;
+  uint_t hop_s;
+  cvec_t *output;
+  fvec_t *routput;
+} Py_pvoc;
+
 
 //AUBIO_NEW(pvoc)
@@ -47 +56 @@
   }
 
+  self->output = new_cvec(self->win_s);
+  self->routput = new_fvec(self->hop_s);
+
   return (PyObject *) self;
 }
@@ -53 +65 @@
 AUBIO_INIT(pvoc, self->win_s, self->hop_s)
 
-AUBIO_DEL(pvoc)
+static void
+Py_pvoc_del (Py_pvoc *self, PyObject *unused)
+{
+  del_aubio_pvoc(self->o);
+  del_cvec(self->output);
+  del_fvec(self->routput);
+  self->ob_type->tp_free((PyObject *) self);
+}
+
 
 static PyObject * 
@@ -60 +80 @@
   PyObject *input;
   fvec_t *vec;
-  cvec_t *output;
 
   if (!PyArg_ParseTuple (args, "O", &input)) {
@@ -72 +91 @@
   }
 
-  output = new_cvec(self->win_s);
-
   // compute the function
-  aubio_pvoc_do (self->o, vec, output);
-  return (PyObject *)PyAubio_CCvecToPyCvec(output);
+  aubio_pvoc_do (self->o, vec, self->output);
+  return (PyObject *)PyAubio_CCvecToPyCvec(self->output);
 }
 
@@ -91 +108 @@
   PyObject *input;
   cvec_t *vec;
-  fvec_t *output;
-
   if (!PyArg_ParseTuple (args, "O", &input)) {
     return NULL;
@@ -103 +118 @@
   }
 
-  output = new_fvec(self->hop_s);
-
   // compute the function
-  aubio_pvoc_rdo (self->o, vec, output);
-  return (PyObject *)PyAubio_CFvecToArray(output);
+  aubio_pvoc_rdo (self->o, vec, self->routput);
+  return (PyObject *)PyAubio_CFvecToArray(self->routput);
 }