shithub: aubio

Info  •  Files  •  Log  •  Branches

remove dump_filterbank kludge, move aubio_dct_do to mfcc.c

--- a/src/mfcc.c

+++ b/src/mfcc.c

@@ -87,6 +87,16 @@

   AUBIO_FREE(mf);

 }

+

+/** intermediate dct involved in aubio_mfcc_do

+

+  \param mf mfcc object as returned by new_aubio_mfcc

+  \param in input spectrum (n_filters long)

+  \param out output mel coefficients buffer (n_filters/2 +1 long)

+

+*/

+void aubio_dct_do(aubio_mfcc_t * mf, fvec_t *in, fvec_t *out);

+

 void aubio_mfcc_do(aubio_mfcc_t * mf, cvec_t *in, fvec_t *out){

     // compute filterbank

     aubio_filterbank_do(mf->fb, in, mf->in_dct);

@@ -110,11 +120,5 @@

         *COS(mf->fftgrain_dct->phas[0][i]);

     }

     return;

-}

-

-//a bit a kludge

-void dump_filterbank(aubio_mfcc_t * mf){

-  aubio_dump_filterbank(mf->fb);

-

 }

--- a/src/mfcc.h

+++ b/src/mfcc.h

@@ -60,22 +60,6 @@

 */

 void aubio_mfcc_do(aubio_mfcc_t * mf, cvec_t *in, fvec_t *out);

-/** intermediate dct involved in aubio_mfcc_do

-

-  \param mf mfcc object as returned by new_aubio_mfcc

-  \param in input spectrum (n_filters long)

-  \param out output mel coefficients buffer (n_filters/2 +1 long)

-

-*/

-void aubio_dct_do(aubio_mfcc_t * mf, fvec_t *in, fvec_t *out);

-

-/** dump filterbank to log file

-

-  \param mf mfcc object as returned by new_aubio_mfcc

-  

-*/

-void dump_filterbank(aubio_mfcc_t * mf);

-

 #ifdef __cplusplus

 }

 #endif

-- 

⑨