fvec_t vecin;
cvec_t cvecin;
// do / rdo output results
- cvec_t *out;
- fvec_t *rout;
+ PyObject *doout;
+ PyObject *rdoout;
} Py_fft;
static PyObject *
{
self->o = new_aubio_fft (self->win_s);
if (self->o == NULL) {
- char_t errstr[30];
- sprintf(errstr, "error creating fft with win_s=%d", self->win_s);
- PyErr_SetString (PyExc_Exception, errstr);
+ 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->out = new_cvec(self->win_s);
- self->rout = new_fvec(self->win_s);
+ self->doout = new_py_cvec(self->win_s);
+ self->rdoout = new_py_fvec(self->win_s);
return 0;
}
static void
Py_fft_del (Py_fft *self, PyObject *unused)
{
- del_aubio_fft(self->o);
- del_cvec(self->out);
- del_fvec(self->rout);
+ Py_XDECREF(self->doout);
+ Py_XDECREF(self->rdoout);
+ if (self->o) {
+ del_aubio_fft(self->o);
+ }
Py_TYPE(self)->tp_free((PyObject *) self);
}
return NULL;
}
+ 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, &(self->vecin), self->out);
- // convert cvec to py_cvec
- return PyAubio_CCvecToPyCvec(self->out);
+ aubio_fft_do (self->o, &(self->vecin), &c_out);
+ return self->doout;
}
static PyMemberDef Py_fft_members[] = {
return NULL;
}
+ 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 (self->o, &(self->cvecin), self->rout);
- return PyAubio_CFvecToArray(self->rout);
+ aubio_fft_rdo (self->o, &(self->cvecin), &out);
+ return self->rdoout;
}
static PyMethodDef Py_fft_methods[] = {