Changeset 83d5abf for src

Timestamp:

Sep 11, 2007, 9:36:36 PM (17 years ago)

Author:

Amaury Hazan <mahmoudax@gmail.com>

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:

787f1f3

Parents:

f72ceeb

Message:

cleaned a bit and added TODO doc for filterbank::new_aubio_filterbank_mfcc2

File:

• src/filterbank.c (modified) (7 diffs)

src/filterbank.c

@@ -19 +19 @@
 */
 
-/* part of this mfcc implementation were inspired from LibXtract
-   http://libxtract.sourceforge.net/
-*/
 
 #include "aubio_priv.h"
@@ -159 +156 @@
 }
 
+/*
+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){
@@ -209 +215 @@
 
   //debug
+  debug("filter tables frequencies\n");
   for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++)
-    //printf("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]);
+    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]);
   
   
@@ -233 +240 @@
     
     //zeroing begining of filter
-    //printf("\nfilter %d",filter_cnt);
-
-    //printf("\nzero begin\n");
+    debug("\nfilter %d",filter_cnt);
+
+    debug("\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;
-      //printf(".");
-      //printf("%f %f %f\n", fft_freqs->data[0][bin_cnt], fft_freqs->data[0][bin_cnt+1], lower_freqs->data[0][filter_cnt]); 
+      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]); 
       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;
@@ -248 +255 @@
     bin_cnt++;
     
-    //printf("\npos slope\n");
+    debug("\npos slope\n");
     //positive slope
     for(; bin_cnt<win_s-1; bin_cnt++){
-      //printf(".");
+      debug(".");
       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])
@@ -259 +266 @@
     //bin_cnt++;
     
-    //printf("\nneg slope\n");
+    //debug("\nneg slope\n");
+    
     //negative slope
     for(; bin_cnt<win_s-1; bin_cnt++){
-      //printf(".");
+      //debug(".");
       
       //checking whether last value is less than 0...
@@ -277 +285 @@
     //bin_cnt++;
     
-    //printf("\nzero end\n");
+    //debug("\nzero end\n");
     //zeroing tail
     for(; bin_cnt<win_s; bin_cnt++)
-      //printf(".");
+      //debug(".");
       fb->filters[filter_cnt]->data[0][bin_cnt]=0.f;