return fb;
}
-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){
smpl_t nyquist = samplerate/2.;
uint_t style = 1;
}
-aubio_filterbank_t * new_aubio_filterbank_mfcc2(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_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;
fvec_t * center_freqs=new_fvec( allFilters, 1);
fvec_t * triangle_heights=new_fvec( allFilters, 1);
//lookup table of each bin frequency in hz
- fvec_t * fft_freqs=(win_s, 1);
+ 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[0][filter_cnt]=lowestFrequency+ filter_cnt*linearSpacing;
+ freqs->data[0][filter_cnt]=lowestFrequency+ filter_cnt*linearSpacing;
}
- smpl_t lastlinearCF=freqs[0][filter_cnt-1];
+ 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[filter_cnt+linearFilters]=lastlinearCF*(pow(logSpacing,filter_cnt+1));
+ freqs->data[0][filter_cnt+linearFilters]=lastlinearCF*(pow(logSpacing,filter_cnt+1));
}
- //TODO: check if the referencing above works!
+
+
+ //TODO: Check how these f_vec will be freed
lower_freqs->data=freqs->data;
- center_freqs->data=&(freqs->data[1]);
- upper_freqs->data=&(freqs->data[2]);
+ 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[filter_cnt]=2./(upper_freqs[filter_cnt]-lower_freqs[filter_cnt]);
+ triangle_heights->data[0][filter_cnt]=2./(upper_freqs->data[0][filter_cnt]-lower_freqs->data[0][filter_cnt]);
}
- //filling the lookup table, which assign the frequency in hz to each bin
+ //debug
+ 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]);
+
+
+ //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[bin_cnt]=((smpl_t) bin_cnt/(smpl_t) win_s)* (smpl_t) samplerate;
+
+ fft_freqs->data[0][bin_cnt]= (smpl_t)samplerate* (smpl_t)bin_cnt/ (smpl_t)win_s;
+
}
- //building each filter
+
+ //building each filter table
for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++){
- //finding bins corresponding to lower, center, and upper frequencies
- for(bin_cnt=0; bin_cnt<; bin_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
+ //printf("\nfilter %d",filter_cnt);
+
+ //printf("\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;
- }
-
- // xtract
- smpl_t nyquist = samplerate/2.;
- uint_t style = 1;
- aubio_filterbank_t * fb = new_aubio_filterbank(n_filters, win_s);
-
- uint_t 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 = (uint_t *)malloc((fb->n_filters + 2) * sizeof(uint_t));
- 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 NULL;
-
- 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 == USE_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]));
+ //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]);
+ 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;
+ }
}
- 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++)
- fb->filters[n]->data[0][k]=0.f;
-
- /*fill in the rise */
- for(; i <= fft_peak[n]; i++){
- fb->filters[n]->data[0][k]=val;
- val += inc;
+ bin_cnt++;
+
+ //printf("\npos slope\n");
+ //positive slope
+ for(; bin_cnt<win_s-1; bin_cnt++){
+ //printf(".");
+ 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;
}
-
- /*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--){
- fb->filters[n]->data[0][k]=val;
- val += inc;
+ //bin_cnt++;
+
+ //printf("\nneg slope\n");
+ //negative slope
+ for(; bin_cnt<win_s-1; bin_cnt++){
+ //printf(".");
+
+ //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;
}
-
- /*zero the rest of the array*/
- for(k = next_peak + 1; k < fb->win_s; k++)
- fb->filters[n]->data[0][k]=0.f;
-
+ //bin_cnt++;
+
+ //printf("\nzero end\n");
+ //zeroing tail
+ for(; bin_cnt<win_s; bin_cnt++)
+ //printf(".");
+ 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
- free(mel_peak);
- free(lin_peak);
- free(height_norm);
- free(fft_peak);
+ //del_fvec(lower_freqs);
+ //del_fvec(upper_freqs);
+ //del_fvec(center_freqs);
+ del_fvec(triangle_heights);
+ del_fvec(fft_freqs);
+
return fb;
projects / aubio.git / commitdiff