Changeset c02a1cc

Timestamp:

Feb 16, 2016, 9:50:08 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:

73e8f65

Parents:

fc2d7fb

Message:

src/spectral/mfcc.c: swap dct_coeffs matrix to prepare for fmat_vecmul

File:

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

src/spectral/mfcc.c

@@ -68 +68 @@
   mfcc->in_dct = new_fvec (n_filters);
 
-  mfcc->dct_coeffs = new_fmat (n_filters, n_coefs);
+  mfcc->dct_coeffs = new_fmat (n_coefs, n_filters);
 
-  /* compute DCT transform dct_coeffs[i][j] as
+  /* compute DCT transform dct_coeffs[j][i] as
      cos ( j * (i+.5) * PI / n_filters ) */
   scaling = 1. / SQRT (n_filters / 2.);
   for (i = 0; i < n_filters; i++) {
     for (j = 0; j < n_coefs; j++) {
-      mfcc->dct_coeffs->data[i][j] =
+      mfcc->dct_coeffs->data[j][i] =
           scaling * COS (j * (i + 0.5) * PI / n_filters);
     }
-    mfcc->dct_coeffs->data[i][0] *= SQRT (2.) / 2.;
+    mfcc->dct_coeffs->data[0][i] *= SQRT (2.) / 2.;
   }
 
@@ -121 +121 @@
     for (k = 0; k < mf->n_coefs; k++) {
       out->data[k] += mf->in_dct->data[j]
-          * mf->dct_coeffs->data[j][k];
+          * mf->dct_coeffs->data[k][j];
     }
   }