Changes in src/spectral/mfcc.c [d95ff38:41bf913]

File:

• src/spectral/mfcc.c (modified) (5 diffs)

src/spectral/mfcc.c

@@ -22 +22 @@
 #include "aubio_priv.h"
 #include "fvec.h"
-#include "fmat.h"
 #include "cvec.h"
 #include "mathutils.h"
@@ -41 +40 @@
   aubio_filterbank_t *fb;   /** filter bank */
   fvec_t *in_dct;           /** input buffer for dct * [fb->n_filters] */
-  fmat_t *dct_coeffs;       /** DCT transform n_filters * n_coeffs */
+  fvec_t *dct_coeffs;       /** DCT transform n_filters * n_coeffs */
 };
 
@@ -65 +64 @@
 
   /* allocating buffers */
-  mfcc->in_dct = new_fvec (n_filters);
+  mfcc->in_dct = new_fvec (n_filters, 1);
 
-  mfcc->dct_coeffs = new_fmat (n_coefs, n_filters);
+  mfcc->dct_coeffs = new_fvec (n_coefs, n_filters);
 
   /* compute DCT transform dct_coeffs[i][j] as
@@ -101 +100 @@
 aubio_mfcc_do (aubio_mfcc_t * mf, cvec_t * in, fvec_t * out)
 {
-  uint_t j, k;
+  uint_t i, j, k;
 
   /* compute filterbank */
@@ -116 +115 @@
 
   /* compute discrete cosine transform */
-  for (j = 0; j < mf->n_filters; j++) {
-    for (k = 0; k < mf->n_coefs; k++) {
-      out->data[k] += mf->in_dct->data[j]
-          * mf->dct_coeffs->data[j][k];
+  for (i = 0; i < out->channels; i++) {
+    for (j = 0; j < mf->n_filters; j++) {
+      for (k = 0; k < mf->n_coefs; k++) {
+        out->data[i][k] += mf->in_dct->data[i][j]
+            * mf->dct_coeffs->data[j][k];
+      }
     }
   }