Changeset fc2d7fb for src

Timestamp:

Feb 16, 2016, 9:48:32 PM (9 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

c02a1cc

Parents:

a7348ca5

Message:

src/spectral/filterbank.c: use fmat_vecmul

File:

• src/spectral/filterbank.c (modified) (1 diff)

src/spectral/filterbank.c

@@ -59 +59 @@
 aubio_filterbank_do (aubio_filterbank_t * f, cvec_t * in, fvec_t * out)
 {
-  uint_t j, fn;
+  /* apply filter to all input channel, provided out has enough channels */
+  //uint_t max_filters = MIN (f->n_filters, out->length);
+  //uint_t max_length = MIN (in->length, f->filters->length);
 
-  /* apply filter to all input channel, provided out has enough channels */
-  uint_t max_filters = MIN (f->n_filters, out->length);
-  uint_t max_length = MIN (in->length, f->filters->length);
+  // view cvec->norm as fvec->data
+  fvec_t tmp;
+  tmp.length = in->length;
+  tmp.data = in->norm;
 
-  /* reset all values in output vector */
-  fvec_zeros (out);
-
-  /* for each filter */
-  for (fn = 0; fn < max_filters; fn++) {
-    /* for each sample */
-    for (j = 0; j < max_length; j++) {
-      out->data[fn] += in->norm[j] * f->filters->data[fn][j];
-    }
-  }
+  fmat_vecmul(f->filters, &tmp, out);
 
   return;