Changes in / [50961b9:4aa18e3]

Location:

src

Files:

• aubio_priv.h (modified) (1 diff)
• mathutils.c (modified) (7 diffs)

src/aubio_priv.h ¶

@@ -81 +81 @@
 #define aubio_vDSP_vmul       vDSP_vmul
 #define aubio_vDSP_vfill      vDSP_vfill
-#define aubio_vDSP_meanv      vDSP_meanv
-#define aubio_vDSP_sve        vDSP_sve
-#define aubio_vDSP_maxv       vDSP_maxv
-#define aubio_vDSP_maxvi      vDSP_maxvi
-#define aubio_vDSP_minv       vDSP_minv
-#define aubio_vDSP_minvi      vDSP_minvi
 #else /* HAVE_AUBIO_DOUBLE */
 #define aubio_vDSP_mmov       vDSP_mmovD
 #define aubio_vDSP_vmul       vDSP_vmulD
 #define aubio_vDSP_vfill      vDSP_vfillD
-#define aubio_vDSP_meanv      vDSP_meanvD
-#define aubio_vDSP_sve        vDSP_sveD
-#define aubio_vDSP_maxv       vDSP_maxvD
-#define aubio_vDSP_maxvi      vDSP_maxviD
-#define aubio_vDSP_minv       vDSP_minvD
-#define aubio_vDSP_minvi      vDSP_minviD
 #endif /* HAVE_AUBIO_DOUBLE */
 #endif /* HAVE_ACCELERATE */

src/mathutils.c ¶

@@ -26 +26 @@
 #include "musicutils.h"
 #include "config.h"
+
+#ifdef HAVE_ACCELERATE
+#include <Accelerate/Accelerate.h>
+#endif
+
+#if !HAVE_AUBIO_DOUBLE
+#define aubio_cblas_xswap cblas_sswap
+#define aubio_cblas_dot   cblas_sdot
+#else
+#define aubio_cblas_xswap cblas_dswap
+#define aubio_cblas_dot   cblas_ddot
+#endif
 
 /** Window types */
@@ -163 +175 @@
   return tmp / (smpl_t) (s->length);
 #else
-  aubio_vDSP_meanv(s->data, 1, &tmp, s->length);
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_meanv(s->data, 1, &tmp, s->length);
+#else /* HAVE_AUBIO_DOUBLE */
+  vDSP_meanvD(s->data, 1, &tmp, s->length);
+#endif /* HAVE_AUBIO_DOUBLE */
   return tmp;
 #endif /* HAVE_ACCELERATE */
@@ -178 +194 @@
   }
 #else
-  aubio_vDSP_sve(s->data, 1, &tmp, s->length);
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_sve(s->data, 1, &tmp, s->length);
+#else /* HAVE_AUBIO_DOUBLE */
+  vDSP_sveD(s->data, 1, &tmp, s->length);
+#endif /* HAVE_AUBIO_DOUBLE */
 #endif /* HAVE_ACCELERATE */
   return tmp;
@@ -194 +214 @@
 #else
   smpl_t tmp = 0.;
-  aubio_vDSP_maxv(s->data, 1, &tmp, s->length);
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_maxv(s->data, 1, &tmp, s->length);
+#else
+  vDSP_maxvD(s->data, 1, &tmp, s->length);
+#endif
 #endif
   return tmp;
@@ -210 +234 @@
 #else
   smpl_t tmp = 0.;
-  aubio_vDSP_minv(s->data, 1, &tmp, s->length);
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_minv(s->data, 1, &tmp, s->length);
+#else
+  vDSP_minvD(s->data, 1, &tmp, s->length);
+#endif
 #endif
   return tmp;
@@ -228 +256 @@
   smpl_t tmp = 0.;
   uint_t pos = 0.;
-  aubio_vDSP_minvi(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_minvi(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#else
+  vDSP_minviD(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#endif
 #endif
   return pos;
@@ -246 +278 @@
   smpl_t tmp = 0.;
   uint_t pos = 0.;
-  aubio_vDSP_maxvi(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_maxvi(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#else
+  vDSP_maxviD(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#endif
 #endif
   return pos;