Changes in / [45134c5:7a46bf6]

Files:

• examples/aubiomfcc.c (modified) (3 diffs)
• examples/plotfb.py (added)
• examples/plotmat.py (added)
• examples/utils.c (modified) (4 diffs)
• src/filterbank.c (modified) (4 diffs)
• src/mfcc.c (modified) (3 diffs)
• src/mfcc.h (modified) (1 diff)

examples/aubiomfcc.c

@@ -23 +23 @@
 fvec_t * mfcc_out;
 aubio_mfcc_t * mfcc;
+
+uint_t n_filters = 20;
+uint_t n_coefs = 11;
 
 unsigned int pos = 0; /*frames%dspblocksize*/
@@ -65 +68 @@
       */
       
-      uint_t filter_cnt;
+      uint_t coef_cnt;
       if (output_filename == NULL) {
-        if(frames >= 4) {
-          outmsg("%f\t",(frames-4)*overlap_size/(float)samplerate);
-        } else if (frames < 4) {
-          outmsg("%f\t",0.);
+//         if(frames >= 4) {
+//           outmsg("%f\t",(frames-4)*overlap_size/(float)samplerate);
+//         } 
+//         else if (frames < 4) {
+//           outmsg("%f\t",0.);
+//         }
+        //outmsg("%f ",mfcc_out->data[0][0]);
+        
+        /*for (coef_cnt = 0; coef_cnt < n_coefs; coef_cnt++) {
+          outmsg("%f ",mfcc_out->data[0][coef_cnt]);
         }
-        outmsg("%f",mfcc_out->data[0][0]);
-        for (filter_cnt = 1; filter_cnt < mfcc_out->length; filter_cnt++) {
-          outmsg(",%f",mfcc_out->data[0][filter_cnt]);
-        }
-        outmsg("\n");
+        outmsg("\n");/*/
       }
 }
@@ -82 +87 @@
 int main(int argc, char **argv) {
   // params
-  uint_t n_filters = 11;
+  //uint_t n_filters = 40;
+  //uint_t n_coefs = 15;
+
   examples_common_init(argc,argv);
-  smpl_t lowfreq = 0.;
-  smpl_t highfreq = samplerate;
-  mfcc_out = new_fvec(n_filters,channels);
+  smpl_t lowfreq = 133.333f;
+  smpl_t highfreq = 44100.f;
+  mfcc_out = new_fvec(n_coefs,channels);
   
   //populating the filter
-  mfcc = new_aubio_mfcc(buffer_size, samplerate, n_filters, lowfreq, highfreq,
-      channels);
+  mfcc = new_aubio_mfcc(buffer_size, samplerate, n_filters, n_coefs , lowfreq, highfreq, channels);
 
   //process

examples/utils.c

@@ -60 +60 @@
 int isonset = 0;
 aubio_pickpeak_t * parms;
-
-/* mfcc objects */
-//parameters
-uint_t n_filters=20;
-smpl_t lowfreq=80.f;
-smpl_t highfreq=18000.f;
-// filterbank object
-aubio_filterbank_t * mf;
-
-// DCT mfft and result storage
-aubio_mfft_t * fft_dct;
-cvec_t * fftgrain_dct;
-smpl_t * mfcc_outbuf[11];
-
 
 /* pitch objects */
@@ -314 +300 @@
   fftgrain  = new_cvec(buffer_size, channels);
 
-  //init for mfcc process
-  fftgrain_dct= new_cvec(n_filters, channels);
-
+  
   if (usepitch) {
     pitchdet = new_aubio_pitchdetection(buffer_size*4, 
@@ -330 +314 @@
   pv = new_aubio_pvoc(buffer_size, overlap_size, channels);
   
-  // dct phase vocoder
-  //TODO: check size
-  fft_dct = new_aubio_mfft(n_filters, channels);
-
   /* onsets */
   parms = new_aubio_peakpicker(threshold);
@@ -367 +347 @@
   del_fvec(onset);
   del_fvec(woodblock);
-  
-  //mffc related
-  del_aubio_mfft(fft_dct);
-  del_cvec(fftgrain_dct);
   
   aubio_cleanup();

src/filterbank.c

@@ -26 +26 @@
 #include "sample.h"
 #include "filterbank.h"
+
+#include "stdio.h"
 
 #define USE_EQUAL_GAIN 1
@@ -54 +56 @@
 
 aubio_filterbank_t * new_aubio_filterbank_mfcc(uint_t n_filters, uint_t win_s, smpl_t samplerate, smpl_t freq_min, smpl_t freq_max){
+  
+  uint_t writelog=1;
+
+  FILE * mlog;
+  if(writelog==1) mlog=fopen("filterbank.txt","w");
+  
+
   smpl_t nyquist = samplerate/2.;
   uint_t style = 1;
@@ -142 +151 @@
     for(k = next_peak + 1; k < fb->win_s; k++)
       fb->filters[n]->data[0][k]=0.f;
+
+    if(writelog){
+      //dumping filter values
+      smpl_t area_tmp=0.f;
+      for(k = 0; k < fb->win_s; k++){
+        fprintf(mlog,"%f ",fb->filters[n]->data[0][k]);
+      }
+      fprintf(mlog,"\n");
+    }
+
   }
 
@@ -148 +167 @@
   free(height_norm);
   free(fft_peak);
+
+  if(mlog) fclose(mlog);
 
   return fb;

src/mfcc.c

@@ -34 +34 @@
   uint_t samplerate;        /** sample rate (needed?) */
   uint_t channels;          /** number of channels */
-  uint_t n_coefs;           /** number of coefficients (= fb->n_filters/2 +1) */
+  uint_t n_filters;         /** number of  *filters */
+  uint_t n_coefs;           /** number of coefficients (<= n_filters/2 +1) */
   smpl_t lowfreq;           /** lowest frequency for filters */ 
   smpl_t highfreq;          /** highest frequency for filters */
@@ -44 +45 @@
 
 
-aubio_mfcc_t * new_aubio_mfcc (uint_t win_s, uint_t samplerate ,uint_t n_coefs, smpl_t lowfreq, smpl_t highfreq, uint_t channels){
+aubio_mfcc_t * new_aubio_mfcc (uint_t win_s, uint_t samplerate, uint_t n_filters, uint_t n_coefs, smpl_t lowfreq, smpl_t highfreq, uint_t channels){
   /** allocating space for mfcc object */
   aubio_mfcc_t * mfcc = AUBIO_NEW(aubio_mfcc_t);
 
   //we need (n_coefs-1)*2 filters to obtain n_coefs coefficients after dct
-  uint_t n_filters = (n_coefs-1)*2;
+  //uint_t n_filters = (n_coefs-1)*2;
   
   mfcc->win_s=win_s;
   mfcc->samplerate=samplerate;
   mfcc->channels=channels;
+  mfcc->n_filters=n_filters;
   mfcc->n_coefs=n_coefs;
   mfcc->lowfreq=lowfreq;
@@ -102 +104 @@
     aubio_mfft_do (mf->fft_dct, in, mf->fftgrain_dct);
     //extract real part of fft grain
-    //for(i=0; i<mf->n_coefs ;i++){
-    for(i=0; i<out->length;i++){
+    for(i=0; i<mf->n_coefs ;i++){
+    //for(i=0; i<out->length;i++){
       out->data[0][i]= mf->fftgrain_dct->norm[0][i]
         *COS(mf->fftgrain_dct->phas[0][i]);

src/mfcc.h

@@ -45 +45 @@
 
 */
-aubio_mfcc_t * new_aubio_mfcc (uint_t win_s, uint_t samplerate ,uint_t n_coefs, smpl_t lowfreq, smpl_t highfreq, uint_t channels);
+aubio_mfcc_t * new_aubio_mfcc (uint_t win_s, uint_t samplerate, uint_t n_filters, uint_t n_coefs, smpl_t lowfreq, smpl_t highfreq, uint_t channels);
 /** delete mfcc object