Changes in src/mathutils.c [33cd81f:729a3c0]

File:

• src/mathutils.c (modified) (3 diffs)

src/mathutils.c ¶

@@ -44 +44 @@
 
 fvec_t *
-new_aubio_window (char_t * window_type, uint_t length)
-{
-  fvec_t * win = new_fvec (length);
-  fvec_set_window (win, window_type);
-  return win;
-}
-
-uint_t fvec_set_window (fvec_t *win, char_t *window_type) {
+new_aubio_window (char_t * window_type, uint_t size)
+{
+  fvec_t * win = new_fvec (size);
   smpl_t * w = win->data;
-  uint_t i, size = win->length;
+  uint_t i;
   aubio_window_type wintype;
-  if (window_type == NULL) {
-      AUBIO_ERR ("window type can not be null.\n");
-      return 1;
-  } else if (strcmp (window_type, "rectangle") == 0)
+  if (strcmp (window_type, "rectangle") == 0)
       wintype = aubio_win_rectangle;
   else if (strcmp (window_type, "hamming") == 0)
@@ -79 +71 @@
       wintype = aubio_win_default;
   else {
-      AUBIO_ERR ("unknown window type `%s`.\n", window_type);
-      return 1;
+      AUBIO_ERR ("unknown window type %s, using default.\n", window_type);
+      wintype = aubio_win_default;
   }
   switch(wintype) {
@@ -113 +105 @@
       break;
     case aubio_win_gaussian:
-      {
-        lsmp_t a, b, c = 0.5;
-        uint_t n;
-        for (n = 0; n < size; n++)
-        {
-          a = (n-c*(size-1))/(SQR(c)*(size-1));
-          b = -c*SQR(a);
-          w[n] = EXP(b);
-        }
-      }
+      for (i=0;i<size;i++)
+        w[i] = EXP(- 1.0 / SQR(size) * SQR(2.0*i-size));
       break;
     case aubio_win_welch:
       for (i=0;i<size;i++)
-        w[i] = 1.0 - SQR((2.*i-size)/(size+1.0));
+        w[i] = 1.0 - SQR((2*i-size)/(size+1.0));
       break;
     case aubio_win_parzen:
       for (i=0;i<size;i++)
-        w[i] = 1.0 - ABS((2.*i-size)/(size+1.0));
+        w[i] = 1.0 - ABS((2*i-size)/(size+1.0));
       break;
     default:
       break;
   }
-  return 0;
+  return win;
 }