ext/py-musicutils.c: complete window implementation

Paul Brossier committed 11 years ago

Commit efa62ce1 parent 5e394ec3 files · +22 −8Browse files

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

Unified · Split

3 files

 PyObject *
 Py_aubio_window(PyObject *self, PyObject *args)
 {
-  PyObject *output = NULL;
   char_t *wintype = NULL;
   uint_t winlen = 0;
-  fvec_t *window;
+  fvec_t *window = NULL;
-  if (!PyArg_ParseTuple (args, "|sd", &wintype, &winlen)) {
+  if (!PyArg_ParseTuple (args, "|sI", &wintype, &winlen)) {
-    PyErr_SetString (PyExc_ValueError,
+    PyErr_SetString (PyExc_ValueError, "failed parsing arguments");
-        "failed parsing arguments");
     return NULL;
   }
-  //return (PyObject *) PyAubio_CFvecToArray(vec);
+  window = new_aubio_window(wintype, winlen);
-  Py_RETURN_NONE;
+  if (window == NULL) {
+    PyErr_SetString (PyExc_ValueError, "failed computing window");
+    return NULL;
+  }
+  return (PyObject *) PyAubio_CFvecToArray(window);
 }

@@ -9,7 +9,9 @@ static char Py_aubio_window_doc[] = "" · 8 unmodified lines
9	"Example\n"	9	"Example\n"
10	"-------\n"	10	"-------\n"
11	"\n"	11	"\n"
12	">>> window('hanningz', 1024)";	12	">>> window('hanningz', 1024)\n"
		13	"array([ 0.00000000e+00, 9.41753387e-06, 3.76403332e-05, ...,\n"
		14	" 8.46982002e-05, 3.76403332e-05, 9.41753387e-06], dtype=float32)";
13		15
14	PyObject * Py_aubio_window(PyObject self, PyObject args);	16	PyObject * Py_aubio_window(PyObject self, PyObject args);
15		17

 #! /usr/bin/env python
 from numpy.testing import TestCase
+from numpy.testing.utils import assert_almost_equal
 from aubio import window
 class aubio_window(TestCase):
         else:
             self.fail('non-integer window length does not raise a ValueError')
+    def test_compute_hanning_1024(self):
+        from numpy import cos, arange
+        from math import pi
+        size = 1024
+        aubio_window = window("hanning", size)
+        numpy_window = .5 - .5 * cos(2. * pi * arange(size) / size)
+        assert_almost_equal(aubio_window, numpy_window)
 if __name__ == '__main__':
     from unittest import main
     main()

Keyboard shortcuts