Changeset cfe4038 for src/filterbank.c

Timestamp:

Sep 8, 2007, 2:37:02 PM (17 years ago)

Author:

Paul Brossier <piem@piem.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:

d3c5282

Parents:

4f33dd3

Message:

filterbank.c, mfcc.c: move aubio_mfcc_init to mfcc

File:

• src/filterbank.c (modified) (1 diff)

src/filterbank.c

@@ -59 +59 @@
 }
 
-// Initialization
-
-void aubio_filterbank_mfcc_init(aubio_filterbank_t * fb, smpl_t nyquist, int style, smpl_t freq_min, smpl_t freq_max){
-
-    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) / fb->n_filters;
-
-    mel_peak = (smpl_t *)malloc((fb->n_filters + 2) * sizeof(smpl_t)); 
-    /* +2 for zeros at start and end */
-    lin_peak = (smpl_t *)malloc((fb->n_filters + 2) * sizeof(smpl_t));
-    fft_peak = (int *)malloc((fb->n_filters + 2) * sizeof(int));
-    height_norm = (smpl_t *)malloc(fb->n_filters * sizeof(smpl_t));
-
-    if(mel_peak == NULL || height_norm == NULL || 
-                    lin_peak == NULL || fft_peak == NULL)
-                    return XTRACT_MALLOC_FAILED;
-    
-    M = fb->win_s >> 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 <= fb->n_filters; 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 < fb->n_filters; 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 < fb->n_filters; 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;
-     fb->filters[n]->data[0][k]=0.f;
-  
-  /*fill in the rise */
-        for(; i <= fft_peak[n]; i++){ 
-         // fft_tables[n][i] = val;
-            fb->filters[n]->data[0][k]=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;
-            fb->filters[n]->data[0][k]=val;
-            val += inc;
-        }
-
-  /*zero the rest of the array*/
-  for(k = next_peak + 1; k < fb->win_s; k++)
-      //fft_tables[n][k] = 0.f;
-      fb->filters[n]->data[0][k]=0.f;
-    }
-
-    free(mel_peak);
-    free(lin_peak);
-    free(height_norm);
-    free(fft_peak);
-
-    //return XTRACT_SUCCESS;
-
-}
-