-#include "aubiowraphell.h"
+#include "aubio-types.h"
static char Py_fft_doc[] = "fft object";
-AUBIO_DECLARE(fft, uint_t win_s)
+typedef struct
+{
+ PyObject_HEAD
+ aubio_fft_t * o;
+ uint_t win_s;
+ // do / rdo input vectors
+ fvec_t vecin;
+ cvec_t cvecin;
+ // do / rdo output results
+ PyObject *doout;
+ PyObject *rdoout;
+} Py_fft;
-//AUBIO_NEW(fft)
static PyObject *
Py_fft_new (PyTypeObject * type, PyObject * args, PyObject * kwds)
{
self->win_s = Py_default_vector_length;
- if (self == NULL) {
- return NULL;
- }
-
if (win_s > 0) {
self->win_s = win_s;
} else if (win_s < 0) {
return (PyObject *) self;
}
+static int
+Py_fft_init (Py_fft * self, PyObject * args, PyObject * kwds)
+{
+ self->o = new_aubio_fft (self->win_s);
+ if (self->o == NULL) {
+ PyErr_Format(PyExc_RuntimeError,
+ "error creating fft with win_s=%d "
+ "(should be a power of 2 greater than 1; "
+ "try recompiling aubio with --enable-fftw3)",
+ self->win_s);
+ return -1;
+ }
+
+ self->doout = new_py_cvec(self->win_s);
+ self->rdoout = new_py_fvec(self->win_s);
-AUBIO_INIT(fft, self->win_s)
+ return 0;
+}
-AUBIO_DEL(fft)
+static void
+Py_fft_del (Py_fft *self, PyObject *unused)
+{
+ Py_XDECREF(self->doout);
+ Py_XDECREF(self->rdoout);
+ if (self->o) {
+ del_aubio_fft(self->o);
+ }
+ Py_TYPE(self)->tp_free((PyObject *) self);
+}
-static PyObject *
-Py_fft_do(PyObject * self, PyObject * args)
+static PyObject *
+Py_fft_do(Py_fft * self, PyObject * args)
{
PyObject *input;
- fvec_t *vec;
- cvec_t *output;
if (!PyArg_ParseTuple (args, "O", &input)) {
return NULL;
}
- vec = PyAubio_ArrayToCFvec (input);
-
- if (vec == NULL) {
+ if (!PyAubio_ArrayToCFvec(input, &(self->vecin))) {
return NULL;
}
- output = new_cvec(((Py_fft *) self)->win_s);
+ if (self->vecin.length != self->win_s) {
+ PyErr_Format(PyExc_ValueError,
+ "input array has length %d, but fft expects length %d",
+ self->vecin.length, self->win_s);
+ 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, vec, output);
- return (PyObject *)PyAubio_CCvecToPyCvec(output);
+ aubio_fft_do (self->o, &(self->vecin), &c_out);
+ return self->doout;
}
-AUBIO_MEMBERS_START(fft)
+static PyMemberDef Py_fft_members[] = {
{"win_s", T_INT, offsetof (Py_fft, win_s), READONLY,
"size of the window"},
-AUBIO_MEMBERS_STOP(fft)
+ {NULL}
+};
-static PyObject *
+static PyObject *
Py_fft_rdo(Py_fft * self, PyObject * args)
{
PyObject *input;
- cvec_t *vec;
- fvec_t *output;
if (!PyArg_ParseTuple (args, "O", &input)) {
return NULL;
}
- vec = PyAubio_ArrayToCCvec (input);
-
- if (vec == NULL) {
+ if (!PyAubio_PyCvecToCCvec (input, &(self->cvecin)) ) {
return NULL;
}
- output = new_fvec(self->win_s);
+ if (self->cvecin.length != self->win_s / 2 + 1) {
+ PyErr_Format(PyExc_ValueError,
+ "input cvec has length %d, but fft expects length %d",
+ self->cvecin.length, self->win_s / 2 + 1);
+ return NULL;
+ }
+ fvec_t out;
+ Py_INCREF(self->rdoout);
+ if (!PyAubio_ArrayToCFvec(self->rdoout, &out) ) {
+ return NULL;
+ }
// compute the function
- aubio_fft_rdo (((Py_fft *)self)->o, vec, output);
- return (PyObject *)PyAubio_CFvecToArray(output);
+ aubio_fft_rdo (self->o, &(self->cvecin), &out);
+ return self->rdoout;
}
static PyMethodDef Py_fft_methods[] = {
{NULL}
};
-AUBIO_TYPEOBJECT(fft, "aubio.fft")
+PyTypeObject Py_fftType = {
+ PyVarObject_HEAD_INIT (NULL, 0)
+ "aubio.fft",
+ sizeof (Py_fft),
+ 0,
+ (destructor) Py_fft_del,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ (ternaryfunc)Py_fft_do,
+ 0,
+ 0,
+ 0,
+ 0,
+ Py_TPFLAGS_DEFAULT,
+ Py_fft_doc,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ Py_fft_methods,
+ Py_fft_members,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ (initproc) Py_fft_init,
+ 0,
+ Py_fft_new,
+};