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/ext (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	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	59	// defined in aubio-proxy.c
56	60	extern PyObject PyAubio_CFvecToArray (fvec_t self);
57	61	extern int PyAubio_ArrayToCFvec (PyObject * self, fvec_t *out);

python/ext/aubioproxy.c+12−0

@@ -1,5 +1,17 @@
1	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	15	PyObject *
4	16	PyAubio_CFvecToArray (fvec_t * self)
5	17	{

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

@@ -21,6 +21,17 @@ typedef struct · 20 unmodified lines
21	21
22	22	static char Py_cvec_doc[] = "cvec object";
23	23
	24	+
	25	+PyObject *
	26	+new_py_cvec(uint_t length) {
	27	+ Py_cvec* vec = (Py_cvec*) PyObject_New (Py_cvec, &Py_cvecType);
	28	+ npy_intp dims[] = { length / 2 + 1, 1 };
	29	+ vec->norm = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
	30	+ vec->phas = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
	31	+ vec->length = length / 2 + 1;
	32	+ return (PyObject*)vec;
	33	+}
	34	+
24	35	PyObject *
25	36	PyAubio_CCvecToPyCvec (cvec_t * input) {
26	37	if (input == NULL) {
@@ -39,14 +50,6 @@ int · 12 unmodified lines
39	50	PyAubio_PyCvecToCCvec (PyObject input, cvec_t i) {
40	51	if (PyObject_TypeCheck (input, &Py_cvecType)) {
41	52	Py_cvec * in = (Py_cvec *)input;
42		− if (in->norm == NULL) {
43		− npy_intp dims[] = { in->length, 1 };
44		− in->norm = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
45		− }
46		− if (in->phas == NULL) {
47		− npy_intp dims[] = { in->length, 1 };
48		− in->phas = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
49		− }
50	53	i->norm = (smpl_t ) PyArray_GETPTR1 ((PyArrayObject )(in->norm), 0);
51	54	i->phas = (smpl_t ) PyArray_GETPTR1 ((PyArrayObject )(in->phas), 0);
52	55	i->length = ((Py_cvec*)input)->length;
@@ -91,16 +94,17 @@ Py_cvec_new (PyTypeObject * type, PyObject * args, PyObject * kwds) · 38 unmodified lines
91	94	static int
92	95	Py_cvec_init (Py_cvec * self, PyObject * args, PyObject * kwds)
93	96	{
94		− self->norm = NULL;
95		− self->phas = NULL;
	97	+ npy_intp dims[] = { self->length, 1 };
	98	+ self->phas = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
	99	+ self->norm = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
96	100	return 0;
97	101	}
98	102
99	103	static void
100	104	Py_cvec_del (Py_cvec * self)
101	105	{
102		− Py_XDECREF(self->norm);
103		− Py_XDECREF(self->phas);
	106	+ Py_DECREF(self->norm);
	107	+ Py_DECREF(self->phas);
104	108	Py_TYPE(self)->tp_free ((PyObject *) self);
105	109	}
106	110
@@ -134,11 +138,7 @@ fail: · 27 unmodified lines
134	138	PyObject *
135	139	Py_cvec_get_norm (Py_cvec * self, void *closure)
136	140	{
137		− // if it norm hasn't been created, create it now
138		− if (self->norm == NULL) {
139		− npy_intp dims[] = { self->length, 1 };
140		− self->norm = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
141		− }
	141	+ // we want self->norm to still exist after our caller return it
142	142	Py_INCREF(self->norm);
143	143	return (PyObject*)(self->norm);
144	144	}
@@ -146,11 +146,7 @@ Py_cvec_get_norm (Py_cvec * self, void *closure) · 1 unmodified line
146	146	PyObject *
147	147	Py_cvec_get_phas (Py_cvec * self, void *closure)
148	148	{
149		− // if it phas hasn't been created, create it now
150		− if (self->phas == NULL) {
151		− npy_intp dims[] = { self->length, 1 };
152		− self->phas = PyArray_ZEROS(1, dims, AUBIO_NPY_SMPL, 0);
153		− }
	149	+ // we want self->phas to still exist after our caller return it
154	150	Py_INCREF(self->phas);
155	151	return (PyObject *)(self->phas);
156	152	}

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

@@ -11,8 +11,8 @@ typedef struct · 10 unmodified lines
11	11	fvec_t vecin;
12	12	cvec_t cvecin;
13	13	// do / rdo output results
14		− cvec_t *out;
15		− fvec_t *rout;
	14	+ PyObject *doout;
	15	+ PyObject *rdoout;
16	16	} Py_fft;
17	17
18	18	static PyObject *
@@ -57,8 +57,8 @@ Py_fft_init (Py_fft * self, PyObject * args, PyObject * kwds) · 38 unmodified lines
57	57	return -1;
58	58	}
59	59
60		− self->out = new_cvec(self->win_s);
61		− self->rout = new_fvec(self->win_s);
	60	+ self->doout = new_py_cvec(self->win_s);
	61	+ self->rdoout = new_py_fvec(self->win_s);
62	62
63	63	return 0;
64	64	}
@@ -66,9 +66,9 @@ Py_fft_init (Py_fft * self, PyObject * args, PyObject * kwds) · 1 unmodified line
66	66	static void
67	67	Py_fft_del (Py_fft self, PyObject unused)
68	68	{
	69	+ Py_XDECREF(self->doout);
	70	+ Py_XDECREF(self->rdoout);
69	71	del_aubio_fft(self->o);
70		− del_cvec(self->out);
71		− del_fvec(self->rout);
72	72	Py_TYPE(self)->tp_free((PyObject *) self);
73	73	}
74	74
@@ -85,10 +85,14 @@ Py_fft_do(Py_fft * self, PyObject * args) · 10 unmodified lines
85	85	return NULL;
86	86	}
87	87
	88	+ cvec_t c_out;
	89	+ Py_INCREF(self->doout);
	90	+ if (!PyAubio_PyCvecToCCvec(self->doout, &c_out)) {
	91	+ return NULL;
	92	+ }
88	93	// compute the function
89		− aubio_fft_do (((Py_fft *)self)->o, &(self->vecin), self->out);
90		− // convert cvec to py_cvec
91		− return PyAubio_CCvecToPyCvec(self->out);
	94	+ aubio_fft_do (self->o, &(self->vecin), &c_out);
	95	+ return self->doout;
92	96	}
93	97
94	98	static PyMemberDef Py_fft_members[] = {
@@ -110,9 +114,14 @@ Py_fft_rdo(Py_fft * self, PyObject * args) · 15 unmodified lines
110	114	return NULL;
111	115	}
112	116
	117	+ fvec_t out;
	118	+ Py_INCREF(self->rdoout);
	119	+ if (!PyAubio_ArrayToCFvec(self->rdoout, &out) ) {
	120	+ return NULL;
	121	+ }
113	122	// compute the function
114		− aubio_fft_rdo (self->o, &(self->cvecin), self->rout);
115		− return PyAubio_CFvecToArray(self->rout);
	123	+ aubio_fft_rdo (self->o, &(self->cvecin), &out);
	124	+ return self->rdoout;
116	125	}
117	126
118	127	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