Changeset ede5d38 for python/ext/py-fft.c
- Timestamp:
- Apr 29, 2016, 9:19:28 PM (8 years ago)
- 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:
- 1ee5e21
- Parents:
- ee092a8
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
python/ext/py-fft.c
ree092a8 rede5d38 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 … … 58 58 } 59 59 60 self-> out = new_cvec(self->win_s);61 self->r out = 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; … … 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 } … … 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 … … 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
Note: See TracChangeset
for help on using the changeset viewer.