Changes in src/fvec.c [1dd95c7:7166ef8]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/fvec.c
r1dd95c7 r7166ef8 28 28 #define aubio_vDSP_vmul vDSP_vmul 29 29 #define aubio_vDSP_vfill vDSP_vfill 30 #define aubio_catlas_set catlas_sset 30 31 #else /* HAVE_AUBIO_DOUBLE */ 31 32 #define aubio_vDSP_mmov vDSP_mmovD 32 33 #define aubio_vDSP_vmul vDSP_vmulD 33 34 #define aubio_vDSP_vfill vDSP_vfillD 35 #define aubio_catlas_set catlas_dset 34 36 #endif /* HAVE_AUBIO_DOUBLE */ 35 37 #endif … … 80 82 } 81 83 #else 84 //aubio_catlas_set(s->length, val, s->data, 1); 82 85 aubio_vDSP_vfill(&val, s->data, 1, s->length); 83 86 #endif … … 119 122 } 120 123 124 void fvec_weighted_copy(fvec_t *in, fvec_t *weight, fvec_t *out) { 125 #ifndef HAVE_ACCELERATE 126 uint_t j; 127 uint_t length = MIN(s->length, weight->length); 128 for (j=0; j< length; j++) { 129 out->data[j] = in->data[j] * weight->data[j]; 130 } 131 #else 132 aubio_vDSP_vmul(in->data, 1, weight->data, 1, out->data, 1, out->length); 133 #endif /* HAVE_ACCELERATE */ 134 } 135 121 136 void fvec_copy(fvec_t *s, fvec_t *t) { 122 137 if (s->length != t->length) {
Note: See TracChangeset
for help on using the changeset viewer.