{
uint_t win_s; /** grain length */
uint_t samplerate; /** sample rate (needed?) */
- uint_t n_filters; /** number of *filters */
+ uint_t n_filters; /** number of filters */
uint_t n_coefs; /** number of coefficients (<= n_filters/2 +1) */
aubio_filterbank_t *fb; /** filter bank */
fvec_t *in_dct; /** input buffer for dct * [fb->n_filters] */
/* allocate space for mfcc object */
aubio_mfcc_t *mfcc = AUBIO_NEW (aubio_mfcc_t);
+ smpl_t scaling;
uint_t i, j;
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 ) */
- smpl_t scaling = 1. / SQRT (n_filters / 2.);
+ 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.;
}
return mfcc;
-};
+}
void
del_aubio_mfcc (aubio_mfcc_t * mf)
/* delete buffers */
del_fvec (mf->in_dct);
+ del_fmat (mf->dct_coeffs);
/* delete mfcc object */
AUBIO_FREE (mf);
void
-aubio_mfcc_do (aubio_mfcc_t * mf, cvec_t * in, fvec_t * out)
+aubio_mfcc_do (aubio_mfcc_t * mf, const cvec_t * in, fvec_t * out)
{
- uint_t j, k;
-
/* compute filterbank */
aubio_filterbank_do (mf->fb, in, mf->in_dct);
/* raise power */
//fvec_pow (mf->in_dct, 3.);
- /* zeros output */
- fvec_zeros(out);
-
- /* 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];
- }
- }
+ /* compute mfccs */
+ fmat_vecmul(mf->dct_coeffs, mf->in_dct, out);
return;
}