Changeset 787f1f3

Timestamp:

Sep 12, 2007, 5:55:48 PM (17 years ago)

Author:

Amaury Hazan <mahmoudax@gmail.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:

95a64c7

Parents:

7a46bf6 (diff), 83d5abf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged from laptop, change debug to AUBIO_DBG in filterbank.c

Files:

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

examples/aubiomfcc.c

@@ -24 +24 @@
 aubio_mfcc_t * mfcc;
 
-uint_t n_filters = 20;
+uint_t n_filters = 40;
 uint_t n_coefs = 11;
 
@@ -53 +53 @@
       //compute mfccs
       aubio_mfcc_do(mfcc, fftgrain, mfcc_out);
-
+      
+      uint_t coef_cnt;
+      for (coef_cnt = 0; coef_cnt < n_coefs; coef_cnt++) {
+          outmsg("%f ",mfcc_out->data[0][coef_cnt]);
+      }
+      outmsg("\n");
+      
       /* end of block loop */
       pos = -1; /* so it will be zero next j loop */
@@ -78 +84 @@
         //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("\n");/*/
+        
       }
 }
@@ -87 +90 @@
 int main(int argc, char **argv) {
   // params
-  //uint_t n_filters = 40;
-  //uint_t n_coefs = 15;
-
+  
   examples_common_init(argc,argv);
   smpl_t lowfreq = 133.333f;
@@ -95 +96 @@
   mfcc_out = new_fvec(n_coefs,channels);
   
+  
   //populating the filter
   mfcc = new_aubio_mfcc(buffer_size, samplerate, n_filters, n_coefs , lowfreq, highfreq, channels);
-
+  dump_filterbank(mfcc);
+  
+  
   //process
   examples_common_process(aubio_process,process_print);

examples/plotfb.py

@@ -5 +5 @@
 import sys
 
+
 filename=sys.argv[1]
+
+doLog=False
+if len(sys.argv)>2: 
+  if sys.argv[2]=='log':
+    doLog=True
 
 mat = pylab.load(filename)
@@ -15 +21 @@
 n_filters=numpy.shape(nmat)[0]
 for i in range(n_filters):
-  pylab.plot(nmat[i,:])
+  if doLog==True:
+    pylab.semilogx(nmat[i,:])
+  else:
+    pylab.plot(nmat[i,:]) 
 
 

examples/utils.c

@@ -40 +40 @@
 smpl_t threshold                      = 0.3;
 smpl_t silence                        = -90.;
-uint_t buffer_size                    = 512; //1024;
-uint_t overlap_size                   = 256; //512;
+// uint_t buffer_size                    = 512;
+// uint_t overlap_size                   = 256;
+uint_t buffer_size                    = 1024;
+uint_t overlap_size                   = 512;
 uint_t channels                       = 1;
 uint_t samplerate                     = 44100;

src/filterbank.c

@@ -19 +19 @@
 */
 
-/* part of this mfcc implementation were inspired from LibXtract
-   http://libxtract.sourceforge.net/
-*/
 
 #include "aubio_priv.h"
@@ -55 +52 @@
 }
 
-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");
-  
-
+aubio_filterbank_t * new_aubio_filterbank_mfcc(uint_t n_filters, uint_t win_s, uint_t samplerate, smpl_t freq_min, smpl_t freq_max){
+  
   smpl_t nyquist = samplerate/2.;
   uint_t style = 1;
@@ -152 +143 @@
       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");
-    }
 
   }
@@ -168 +151 @@
   free(fft_peak);
 
+
+  return fb;
+
+}
+
+/*
+FB initialization based on Slaney's auditory toolbox
+TODO:
+  *solve memory leak problems while
+  *solve quantization issues when constructing signal:
+    *bug for win_s=512
+    *corrections for win_s=1024 -> why even filters with smaller amplitude
+
+*/
+
+aubio_filterbank_t * new_aubio_filterbank_mfcc2(uint_t n_filters, uint_t win_s, uint_t samplerate, smpl_t freq_min, smpl_t freq_max){
+  
+  aubio_filterbank_t * fb = new_aubio_filterbank(n_filters, win_s);
+  
+  
+  //slaney params
+  smpl_t lowestFrequency = 133.3333;
+  smpl_t linearSpacing = 66.66666666;
+  smpl_t logSpacing = 1.0711703;
+
+  uint_t linearFilters = 13;
+  uint_t logFilters = 27;
+  uint_t allFilters = linearFilters + logFilters;
+  
+  //buffers for computing filter frequencies
+  fvec_t * freqs=new_fvec( allFilters +2 , 1);
+  
+  fvec_t * lower_freqs=new_fvec( allFilters, 1);
+  fvec_t * upper_freqs=new_fvec( allFilters, 1);
+  fvec_t * center_freqs=new_fvec( allFilters, 1);
+     
+  /*fvec_t * lower_freqs=freqs;
+  fvec_t * upper_freqs=freqs;
+  fvec_t * center_freqs=freqs*/;
+  
+  fvec_t * triangle_heights=new_fvec( allFilters, 1);
+  //lookup table of each bin frequency in hz
+  fvec_t * fft_freqs=new_fvec(win_s, 1);
+
+  uint_t filter_cnt, bin_cnt;
+  
+  //first: filling all the linear filter frequencies
+  for(filter_cnt=0; filter_cnt<linearFilters; filter_cnt++){
+    freqs->data[0][filter_cnt]=lowestFrequency+ filter_cnt*linearSpacing;
+  }
+  smpl_t lastlinearCF=freqs->data[0][filter_cnt-1];
+  
+  //second: filling all the log filter frequencies
+  for(filter_cnt=0; filter_cnt<logFilters+2; filter_cnt++){
+    freqs->data[0][filter_cnt+linearFilters]=lastlinearCF*(pow(logSpacing,filter_cnt+1));
+  }
+  
+  
+  //make fvec->data point directly to freqs arrays
+  lower_freqs->data=freqs->data;
+  center_freqs->data[0]=&(freqs->data[0][1]);
+  upper_freqs->data[0]=&(freqs->data[0][2]);
+
+  
+  //computing triangle heights so that each triangle has unit area
+  for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++){
+    triangle_heights->data[0][filter_cnt]=2./(upper_freqs->data[0][filter_cnt]-lower_freqs->data[0][filter_cnt]);
+  }
+
+  //AUBIO_DBG
+  AUBIO_DBG("filter tables frequencies\n");
+  for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++)
+    AUBIO_DBG("filter n. %d %f %f %f %f\n",filter_cnt, lower_freqs->data[0][filter_cnt], center_freqs->data[0][filter_cnt], upper_freqs->data[0][filter_cnt], triangle_heights->data[0][filter_cnt]);
+  
+  
+  //filling the fft_freqs lookup table, which assigns the frequency in hz to each bin
+  
+  for(bin_cnt=0; bin_cnt<win_s; bin_cnt++){
+    
+    //TODO: check the formula!
+    
+    fft_freqs->data[0][bin_cnt]= (smpl_t)samplerate* (smpl_t)bin_cnt/ (smpl_t)win_s;
+
+  }
+  
+  
+  //building each filter table
+  for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++){
+
+    //TODO:check special case : lower freq =0
+    
+    //calculating rise increment in mag/Hz
+    smpl_t riseInc= triangle_heights->data[0][filter_cnt]/(center_freqs->data[0][filter_cnt]-lower_freqs->data[0][filter_cnt]);
+    
+    //zeroing begining of filter
+    AUBIO_DBG("\nfilter %d",filter_cnt);
+
+    AUBIO_DBG("\nzero begin\n");
+    
+    for(bin_cnt=0; bin_cnt<win_s-1; bin_cnt++){
+      //zeroing beigining of array
+      fb->filters[filter_cnt]->data[0][bin_cnt]=0.f;
+      AUBIO_DBG(".");
+      //AUBIO_DBG("%f %f %f\n", fft_freqs->data[0][bin_cnt], fft_freqs->data[0][bin_cnt+1], lower_freqs->data[0][filter_cnt]); 
+      if(fft_freqs->data[0][bin_cnt]<= lower_freqs->data[0][filter_cnt] && fft_freqs->data[0][bin_cnt+1]> lower_freqs->data[0][filter_cnt]){
+        break;
+      }
+    }
+    bin_cnt++;
+    
+    AUBIO_DBG("\npos slope\n");
+    //positive slope
+    for(; bin_cnt<win_s-1; bin_cnt++){
+      AUBIO_DBG(".");
+      fb->filters[filter_cnt]->data[0][bin_cnt]=(fft_freqs->data[0][bin_cnt]-lower_freqs->data[0][filter_cnt])*riseInc;
+      //if(fft_freqs->data[0][bin_cnt]<= center_freqs->data[0][filter_cnt] && fft_freqs->data[0][bin_cnt+1]> center_freqs->data[0][filter_cnt])
+      if(fft_freqs->data[0][bin_cnt+1]> center_freqs->data[0][filter_cnt])
+        break;
+    }
+    //bin_cnt++;
+    
+    
+    //negative slope
+    AUBIO_DBG("\nneg slope\n");   
+    for(; bin_cnt<win_s-1; bin_cnt++){
+      //AUBIO_DBG(".");
+      
+      //checking whether last value is less than 0...
+      smpl_t val=triangle_heights->data[0][filter_cnt]-(fft_freqs->data[0][bin_cnt]-center_freqs->data[0][filter_cnt])*riseInc;
+      if(val>=0)
+        fb->filters[filter_cnt]->data[0][bin_cnt]=val;
+      else fb->filters[filter_cnt]->data[0][bin_cnt]=0.f;
+      
+      //if(fft_freqs->data[0][bin_cnt]<= upper_freqs->data[0][bin_cnt] && fft_freqs->data[0][bin_cnt+1]> upper_freqs->data[0][filter_cnt])
+      //TODO: CHECK whether bugfix correct
+      if(fft_freqs->data[0][bin_cnt+1]> upper_freqs->data[0][filter_cnt])
+        break;
+    }
+    //bin_cnt++;
+    
+    AUBIO_DBG("\nzero end\n");
+    //zeroing tail
+    for(; bin_cnt<win_s; bin_cnt++)
+      //AUBIO_DBG(".");
+      fb->filters[filter_cnt]->data[0][bin_cnt]=0.f;
+
+  }
+  
+  
+  del_fvec(freqs);
+  //TODO: Check how to do a proper free for the following f_vec
+
+  //del_fvec(lower_freqs);
+  //del_fvec(upper_freqs);
+  //del_fvec(center_freqs);
+  del_fvec(triangle_heights);
+  del_fvec(fft_freqs);
+
+  
+
+  return fb;
+
+}
+
+void aubio_dump_filterbank(aubio_filterbank_t * fb){
+
+  FILE * mlog;
+  mlog=fopen("filterbank.txt","w");
+  
+  int k,n;
+  //dumping filter values
+  //smpl_t area_tmp=0.f;
+  for(n = 0; n < fb->n_filters; n++){
+    for(k = 0; k < fb->win_s; k++){
+      fprintf(mlog,"%f ",fb->filters[n]->data[0][k]);
+    }
+    fprintf(mlog,"\n");
+  }
+  
   if(mlog) fclose(mlog);
-
-  return fb;
-
-}
-
+}
 
 void del_aubio_filterbank(aubio_filterbank_t * fb){

src/filterbank.h

@@ -46 +46 @@
 /** filterbank initialization for mel filters
 
-  \param nyquist nyquist frequency, i.e. half of the sampling rate
-  \param style libxtract style
-  \param freqmin lowest filter frequency
-  \param freqmax highest filter frequency
+  
+  \param n_filters number of filters
+  \param win_s window size
+  \param samplerate
+  \param freq_min lowest filter frequency
+  \param freq_max highest filter frequency
 
 */
-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);
+aubio_filterbank_t * new_aubio_filterbank_mfcc(uint_t n_filters, uint_t win_s, uint_t samplerate, smpl_t freq_min, smpl_t freq_max);
+
+/** filterbank initialization for mel filters
+
+  \param n_filters number of filters
+  \param win_s window size
+  \param samplerate
+  \param freq_min lowest filter frequency
+  \param freq_max highest filter frequency
+
+*/
+aubio_filterbank_t * new_aubio_filterbank_mfcc_2(uint_t n_filters, uint_t win_s, uint_t samplerate, smpl_t freq_min, smpl_t freq_max);
 
 
@@ -67 +80 @@
 void aubio_filterbank_do(aubio_filterbank_t * fb, cvec_t * in, fvec_t *out);
 
+/** dump filterbank filter tables in a txt file
+
+*/
+void aubio_dump_filterbank(aubio_filterbank_t * fb);
+
 #ifdef __cplusplus
 }

src/mfcc.c

@@ -60 +60 @@
   mfcc->highfreq=highfreq;
 
+  
   /** filterbank allocation */
-  mfcc->fb = new_aubio_filterbank_mfcc(n_filters, mfcc->win_s, samplerate, lowfreq, highfreq);
+  mfcc->fb = new_aubio_filterbank_mfcc2(n_filters, mfcc->win_s, samplerate, lowfreq, highfreq);
 
   /** allocating space for fft object (used for dct) */
@@ -112 +113 @@
 }
 
+//a bit a kludge
+void dump_filterbank(aubio_mfcc_t * mf){
+  aubio_dump_filterbank(mf->fb);
+
+}
+

src/mfcc.h

@@ -70 +70 @@
 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
 }