Changes in / [0969113:f8340e1]

Location:

src

Files:

• fvec.c (modified) (3 diffs)
• fvec.h (modified) (1 diff)
• mathutils.c (modified) (3 diffs)
• pitch/pitch.c (modified) (2 diffs)
• pitch/pitchyinfft.c (modified) (1 diff)

src/fvec.c

@@ -28 +28 @@
 #define aubio_vDSP_vmul       vDSP_vmul
 #define aubio_vDSP_vfill      vDSP_vfill
-#define aubio_catlas_set      catlas_sset
 #else /* HAVE_AUBIO_DOUBLE */
 #define aubio_vDSP_mmov       vDSP_mmovD
 #define aubio_vDSP_vmul       vDSP_vmulD
 #define aubio_vDSP_vfill      vDSP_vfillD
-#define aubio_catlas_set      catlas_dset
 #endif /* HAVE_AUBIO_DOUBLE */
 #endif
@@ -82 +80 @@
   }
 #else
-  //aubio_catlas_set(s->length, val, s->data, 1);
   aubio_vDSP_vfill(&val, s->data, 1, s->length);
 #endif
@@ -122 +119 @@
 }
 
-void fvec_weighted_copy(fvec_t *in, fvec_t *weight, fvec_t *out) {
-#ifndef HAVE_ACCELERATE
-  uint_t j;
-  uint_t length = MIN(s->length, weight->length);
-  for (j=0; j< length; j++) {
-    out->data[j] = in->data[j] * weight->data[j];
-  }
-#else
-  aubio_vDSP_vmul(in->data, 1, weight->data, 1, out->data, 1, out->length);
-#endif /* HAVE_ACCELERATE */
-}
-
 void fvec_copy(fvec_t *s, fvec_t *t) {
   if (s->length != t->length) {

src/fvec.h

@@ -163 +163 @@
 void fvec_copy(fvec_t *s, fvec_t *t);
 
-/** make a copy of a vector, applying weights to each element
-
-  \param in input vector
-  \param weight weights vector
-  \param out output vector
-
-*/
-void fvec_weighted_copy(fvec_t *in, fvec_t *weight, fvec_t *out);
-
 #ifdef __cplusplus
 }

src/mathutils.c

@@ -29 +29 @@
 #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
 
@@ -290 +282 @@
 fvec_shift (fvec_t * s)
 {
-#ifndef HAVE_ACCELERATE
   uint_t j;
   for (j = 0; j < s->length / 2; j++) {
     ELEM_SWAP (s->data[j], s->data[j + s->length / 2]);
   }
-#else
-  uint_t half = s->length / 2;
-  aubio_cblas_xswap(half, s->data, 1, s->data + half, 1);
-#endif
 }
 
@@ -305 +292 @@
 {
   smpl_t energy = 0.;
-#ifndef HAVE_ACCELERATE
   uint_t j;
   for (j = 0; j < f->length; j++) {
     energy += SQR (f->data[j]);
   }
-#else
-  energy = aubio_cblas_dot(f->length, f->data, 1, f->data, 1);
-#endif
   return energy / f->length;
 }

src/pitch/pitch.c

@@ -240 +240 @@
 aubio_pitch_slideblock (aubio_pitch_t * p, fvec_t * ibuf)
 {
-  uint_t overlap_size = p->buf->length - ibuf->length;
-#if !HAVE_MEMCPY_HACKS
-  uint_t j;
+  uint_t j = 0, overlap_size = 0;
+  overlap_size = p->buf->length - ibuf->length;
   for (j = 0; j < overlap_size; j++) {
     p->buf->data[j] = p->buf->data[j + ibuf->length];
@@ -249 +248 @@
     p->buf->data[j + overlap_size] = ibuf->data[j];
   }
-#else
-  smpl_t *data = p->buf->data;
-  smpl_t *newdata = ibuf->data;
-  memmove(data, data + ibuf->length, overlap_size);
-  memcpy(data + overlap_size, newdata, ibuf->length);
-#endif
 }
 

src/pitch/pitchyinfft.c

@@ -108 +108 @@
   smpl_t tmp = 0., sum = 0.;
   // window the input
-  fvec_weighted_copy(input, p->win, p->winput);
+  for (l = 0; l < input->length; l++) {
+    p->winput->data[l] = p->win->data[l] * input->data[l];
+  }
   // get the real / imag parts of its fft
   aubio_fft_do_complex (p->fft, p->winput, fftout);