From: Paul Brossier <piem@piem.org>
Date: Sat, 8 Sep 2007 12:13:16 +0000 (+0200)
Subject: filterbank.c: remove to be deleted code
X-Git-Tag: bzr2git~442^2~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55ce41c77a99cb14529cea79d78698b87930734a;p=aubio.git

filterbank.c: remove to be deleted code
---

diff --git a/src/filterbank.c b/src/filterbank.c
index 434297cc..151953f0 100644
--- a/src/filterbank.c
+++ b/src/filterbank.c
@@ -162,103 +162,3 @@ void aubio_filterbank_mfcc_init(aubio_filterbank_t * fb, smpl_t nyquist, int sty
 
 }
 
-//to be deleted code
-
-
-// int aubio_mfcc_init(int N, smpl_t nyquist, int style, smpl_t freq_min, smpl_t freq_max, int freq_bands, smpl_t **fft_tables){
-// 
-//     int n, i, k, *fft_peak, M, next_peak; 
-//     smpl_t norm, mel_freq_max, mel_freq_min, norm_fact, height, inc, val, 
-//         freq_bw_mel, *mel_peak, *height_norm, *lin_peak;
-// 
-//     mel_peak = height_norm = lin_peak = NULL;
-//     fft_peak = NULL;
-//     norm = 1; 
-// 
-//     mel_freq_max = 1127 * log(1 + freq_max / 700);
-//     mel_freq_min = 1127 * log(1 + freq_min / 700);
-//     freq_bw_mel = (mel_freq_max - mel_freq_min) / freq_bands;
-// 
-//     mel_peak = (smpl_t *)malloc((freq_bands + 2) * sizeof(smpl_t)); 
-//     /* +2 for zeros at start and end */
-//     lin_peak = (smpl_t *)malloc((freq_bands + 2) * sizeof(smpl_t));
-//     fft_peak = (int *)malloc((freq_bands + 2) * sizeof(int));
-//     height_norm = (smpl_t *)malloc(freq_bands * sizeof(smpl_t));
-// 
-//     if(mel_peak == NULL || height_norm == NULL || 
-//                     lin_peak == NULL || fft_peak == NULL)
-//                     return XTRACT_MALLOC_FAILED;
-//     
-//     M = N >> 1;
-// 
-//     mel_peak[0] = mel_freq_min;
-//     lin_peak[0] = 700 * (exp(mel_peak[0] / 1127) - 1);
-//     fft_peak[0] = lin_peak[0] / nyquist * M;
-// 
-// 
-//     for (n = 1; n <= freq_bands; n++){  
-//     /*roll out peak locations - mel, linear and linear on fft window scale */
-//         mel_peak[n] = mel_peak[n - 1] + freq_bw_mel;
-//         lin_peak[n] = 700 * (exp(mel_peak[n] / 1127) -1);
-//         fft_peak[n] = lin_peak[n] / nyquist * M;
-//     }
-// 
-//     for (n = 0; n < freq_bands; n++){
-//         /*roll out normalised gain of each peak*/
-//         if (style == XTRACT_EQUAL_GAIN){
-//             height = 1; 
-//             norm_fact = norm;
-//         }
-//         else{
-//             height = 2 / (lin_peak[n + 2] - lin_peak[n]);
-//             norm_fact = norm / (2 / (lin_peak[2] - lin_peak[0]));
-//         }
-//         height_norm[n] = height * norm_fact;
-//     }
-// 
-//     i = 0;
-//    
-//     for(n = 0; n < freq_bands; n++){
-//   
-//   /*calculate the rise increment*/
-//         if(n > 0)
-//             inc = height_norm[n] / (fft_peak[n] - fft_peak[n - 1]);
-//         else
-//             inc = height_norm[n] / fft_peak[n];
-//         val = 0;  
-//   
-//   /*zero the start of the array*/
-//   for(k = 0; k < i; k++)
-//      fft_tables[n][k] = 0.f;
-//   
-//   /*fill in the rise */
-//         for(; i <= fft_peak[n]; i++){ 
-//             fft_tables[n][i] = val;
-//             val += inc;
-//         }
-//   
-//         /*calculate the fall increment */
-//         inc = height_norm[n] / (fft_peak[n + 1] - fft_peak[n]);
-//   
-//         val = 0;
-//   next_peak = fft_peak[n + 1];
-//   
-//   /*reverse fill the 'fall' */
-//         for(i = next_peak; i > fft_peak[n]; i--){ 
-//             fft_tables[n][i] = val;
-//             val += inc;
-//         }
-// 
-//   /*zero the rest of the array*/
-//   for(k = next_peak + 1; k < N; k++)
-//       fft_tables[n][k] = 0.f;
-//     }
-// 
-//     free(mel_peak);
-//     free(lin_peak);
-//     free(height_norm);
-//     free(fft_peak);
-// 
-//     return XTRACT_SUCCESS;
-// 
-// }