Changes in / [83d5abf:787f1f3]

Files:

• examples/aubiomfcc.c (modified) (1 diff)
• src/filterbank.c (modified) (7 diffs)

examples/aubiomfcc.c

@@ -25 +25 @@
 
 uint_t n_filters = 40;
-uint_t n_coefs = 20;
+uint_t n_coefs = 11;
 
 unsigned int pos = 0; /*frames%dspblocksize*/

src/filterbank.c

@@ -182 +182 @@
   //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
@@ -203 +209 @@
   
   
-  //TODO: Check how these f_vec will be freed
+  //make fvec->data point directly to freqs arrays
   lower_freqs->data=freqs->data;
   center_freqs->data[0]=&(freqs->data[0][1]);
@@ -214 +220 @@
   }
 
-  //debug
-  debug("filter tables frequencies\n");
+  //AUBIO_DBG
+  AUBIO_DBG("filter tables frequencies\n");
   for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++)
-    debug("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]);
+    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]);
   
   
@@ -240 +246 @@
     
     //zeroing begining of filter
-    debug("\nfilter %d",filter_cnt);
-
-    debug("\nzero begin\n");
+    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;
-      debug(".");
-      //debug("%f %f %f\n", fft_freqs->data[0][bin_cnt], fft_freqs->data[0][bin_cnt+1], lower_freqs->data[0][filter_cnt]); 
+      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;
@@ -255 +261 @@
     bin_cnt++;
     
-    debug("\npos slope\n");
+    AUBIO_DBG("\npos slope\n");
     //positive slope
     for(; bin_cnt<win_s-1; bin_cnt++){
-      debug(".");
+      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])
@@ -266 +272 @@
     //bin_cnt++;
     
-    //debug("\nneg slope\n");
     
     //negative slope
+    AUBIO_DBG("\nneg slope\n");   
     for(; bin_cnt<win_s-1; bin_cnt++){
-      //debug(".");
+      //AUBIO_DBG(".");
       
       //checking whether last value is less than 0...
@@ -285 +291 @@
     //bin_cnt++;
     
-    //debug("\nzero end\n");
+    AUBIO_DBG("\nzero end\n");
     //zeroing tail
     for(; bin_cnt<win_s; bin_cnt++)
-      //debug(".");
+      //AUBIO_DBG(".");
       fb->filters[filter_cnt]->data[0][bin_cnt]=0.f;