python/ext/aubio-types.h: add new_py_ functions to create PyObjects instead of fvec_t, apply to py-fft.c

Paul Brossier committed 10 years ago

Commit ede5d381 parent ee092a84 files · +54 −33Browse files

Showing the changes to python (4 of 4 files). Show all

Unified · Split

4 files

python/ext/aubio-types.h +4 −0
python/ext/aubioproxy.c +12 −0
python/ext/py-cvec.c +18 −22
python/ext/py-fft.c +20 −11

@@ -52,6 +52,10 @@ · 51 unmodified lines
52		52
53	extern PyTypeObject Py_cvecType;	53	extern PyTypeObject Py_cvecType;
54		54
		55	PyObject * new_py_fvec(uint_t length);
		56	PyObject * new_py_cvec(uint_t length);
		57	PyObject * new_py_fmat(uint_t height, uint_t length);
		58
55	// defined in aubio-proxy.c	59	// defined in aubio-proxy.c
56	extern PyObject PyAubio_CFvecToArray (fvec_t self);	60	extern PyObject PyAubio_CFvecToArray (fvec_t self);
57	extern int PyAubio_ArrayToCFvec (PyObject * self, fvec_t *out);	61	extern int PyAubio_ArrayToCFvec (PyObject * self, fvec_t *out);

python/ext/aubioproxy.c+12−0

@@ -1,5 +1,17 @@
1	#include "aubio-types.h"	1	#include "aubio-types.h"
2		2
		3	PyObject *
		4	new_py_fvec(uint_t length) {
		5	npy_intp dims[] = { length, 1 };
		6	return PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
		7	}
		8
		9	PyObject *
		10	new_py_fmat(uint_t height, uint_t length) {
		11	npy_intp dims[] = { height, length, 1 };
		12	return PyArray_ZEROS(2, dims, AUBIO_NPY_SMPL, 0);
		13	}
		14
3	PyObject *	15	PyObject *
4	PyAubio_CFvecToArray (fvec_t * self)	16	PyAubio_CFvecToArray (fvec_t * self)
5	{	17	{

python/ext/py-cvec.c+18−22

 static char Py_cvec_doc[] = "cvec object";
+PyObject *
+new_py_cvec(uint_t length) {
+  Py_cvec* vec = (Py_cvec*) PyObject_New (Py_cvec, &Py_cvecType);
+  npy_intp dims[] = { length / 2 + 1, 1 };
+  vec->norm = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
+  vec->phas = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
+  vec->length = length / 2 + 1;
+  return (PyObject*)vec;
+}
 PyObject *
 PyAubio_CCvecToPyCvec (cvec_t * input) {
   if (input == NULL) {
 PyAubio_PyCvecToCCvec (PyObject *input, cvec_t *i) {
   if (PyObject_TypeCheck (input, &Py_cvecType)) {
       Py_cvec * in = (Py_cvec *)input;
-      if (in->norm == NULL) {
-        npy_intp dims[] = { in->length, 1 };
-        in->norm = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
-      }
-      if (in->phas == NULL) {
-        npy_intp dims[] = { in->length, 1 };
-        in->phas = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
-      }
       i->norm = (smpl_t *) PyArray_GETPTR1 ((PyArrayObject *)(in->norm), 0);
       i->phas = (smpl_t *) PyArray_GETPTR1 ((PyArrayObject *)(in->phas), 0);
       i->length = ((Py_cvec*)input)->length;
 static int
 Py_cvec_init (Py_cvec * self, PyObject * args, PyObject * kwds)
 {
-  self->norm = NULL;
+  npy_intp dims[] = { self->length, 1 };
-  self->phas = NULL;
+  self->phas = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
+  self->norm = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
   return 0;
 }
 static void
 Py_cvec_del (Py_cvec * self)
 {
-  Py_XDECREF(self->norm);
+  Py_DECREF(self->norm);
-  Py_XDECREF(self->phas);
+  Py_DECREF(self->phas);
   Py_TYPE(self)->tp_free ((PyObject *) self);
 }
 PyObject *
 Py_cvec_get_norm (Py_cvec * self, void *closure)
 {
-  // if it norm hasn't been created, create it now
+  // we want self->norm to still exist after our caller return it
-  if (self->norm == NULL) {
-    npy_intp dims[] = { self->length, 1 };
-    self->norm = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
-  }
   Py_INCREF(self->norm);
   return (PyObject*)(self->norm);
 }
 PyObject *
 Py_cvec_get_phas (Py_cvec * self, void *closure)
 {
-  // if it phas hasn't been created, create it now
+  // we want self->phas to still exist after our caller return it
-  if (self->phas == NULL) {
-    npy_intp dims[] = { self->length, 1 };
-    self->phas = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
-  }
   Py_INCREF(self->phas);
   return (PyObject *)(self->phas);
 }

python/ext/py-fft.c+20−11

   fvec_t vecin;
   cvec_t cvecin;
   // do / rdo output results
-  cvec_t *out;
+  PyObject *doout;
-  fvec_t *rout;
+  PyObject *rdoout;
 } Py_fft;
 static PyObject *
     return -1;
   }
-  self->out = new_cvec(self->win_s);
+  self->doout = new_py_cvec(self->win_s);
-  self->rout = new_fvec(self->win_s);
+  self->rdoout = new_py_fvec(self->win_s);
   return 0;
 }
 static void
 Py_fft_del (Py_fft *self, PyObject *unused)
 {
+  Py_XDECREF(self->doout);
+  Py_XDECREF(self->rdoout);
   del_aubio_fft(self->o);
-  del_cvec(self->out);
-  del_fvec(self->rout);
   Py_TYPE(self)->tp_free((PyObject *) self);
 }
     return NULL;
   }
+  cvec_t c_out;
+  Py_INCREF(self->doout);
+  if (!PyAubio_PyCvecToCCvec(self->doout, &c_out)) {
+    return NULL;
+  }
   // compute the function
-  aubio_fft_do (((Py_fft *)self)->o, &(self->vecin), self->out);
+  aubio_fft_do (self->o, &(self->vecin), &c_out);
-  // convert cvec to py_cvec
+  return self->doout;
-  return PyAubio_CCvecToPyCvec(self->out);
 }
 static PyMemberDef Py_fft_members[] = {
     return NULL;
   }
+  fvec_t out;
+  Py_INCREF(self->rdoout);
+  if (!PyAubio_ArrayToCFvec(self->rdoout, &out) ) {
+    return NULL;
+  }
   // compute the function
-  aubio_fft_rdo (self->o, &(self->cvecin), self->rout);
+  aubio_fft_rdo (self->o, &(self->cvecin), &out);
-  return PyAubio_CFvecToArray(self->rout);
+  return self->rdoout;
 }
 static PyMethodDef Py_fft_methods[] = {

python/ext/aubio-types.h: add new_py_ functions to create PyObjects instead of fvec_t, apply to py-fft.c

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code