Changeset cfd35db

Timestamp:

Sep 17, 2009, 1:26:49 AM (15 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:

addc9ec

Parents:

3b3b03e

Message:

src/spectral/filterbank_mel.{c,h}: indent

Location:

src/spectral

Files:

• filterbank_mel.c (modified) (3 diffs)
• filterbank_mel.h (modified) (3 diffs)

src/spectral/filterbank_mel.c

@@ -26 +26 @@
 #include "mathutils.h"
 
-void aubio_filterbank_set_mel_coeffs(aubio_filterbank_t *fb, uint_t samplerate, smpl_t freq_min, smpl_t freq_max){
+void
+aubio_filterbank_set_mel_coeffs (aubio_filterbank_t * fb, uint_t samplerate,
+    smpl_t freq_min, smpl_t freq_max)
+{
 
-  fvec_t *filters = aubio_filterbank_get_coeffs(fb);
+  fvec_t *filters = aubio_filterbank_get_coeffs (fb);
   uint_t n_filters = filters->channels, win_s = filters->length;
-  
+
   //slaney params
   smpl_t lowestFrequency = 133.3333;
@@ -39 +42 @@
   uint_t logFilters = 27;
   uint_t allFilters = linearFilters + logFilters;
-  
+
   //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 *freqs = new_fvec (allFilters + 2, 1);
 
-  fvec_t * triangle_heights=new_fvec( allFilters, 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 *triangle_heights = new_fvec (allFilters, 1);
   //lookup table of each bin frequency in hz
-  fvec_t * fft_freqs=new_fvec(win_s, 1);
+  fvec_t *fft_freqs = new_fvec (win_s, 1);
 
   uint_t filter_cnt, bin_cnt;
-  
+
   //first step: filling all the linear filter frequencies
-  for(filter_cnt=0; filter_cnt<linearFilters; filter_cnt++){
-    freqs->data[0][filter_cnt]=lowestFrequency+ filter_cnt*linearSpacing;
+  for (filter_cnt = 0; filter_cnt < linearFilters; filter_cnt++) {
+    freqs->data[0][filter_cnt] = lowestFrequency + filter_cnt * linearSpacing;
   }
-  smpl_t lastlinearCF=freqs->data[0][filter_cnt-1];
-  
+  smpl_t lastlinearCF = freqs->data[0][filter_cnt - 1];
+
   //second step: filling all the log filter frequencies
-  for(filter_cnt=0; filter_cnt<logFilters+2; filter_cnt++){
-    freqs->data[0][filter_cnt+linearFilters] = 
-      lastlinearCF*(pow(logSpacing,filter_cnt+1));
+  for (filter_cnt = 0; filter_cnt < logFilters + 2; filter_cnt++) {
+    freqs->data[0][filter_cnt + linearFilters] =
+        lastlinearCF * (pow (logSpacing, filter_cnt + 1));
   }
 
   //Option 1. copying interesting values to lower_freqs, center_freqs and upper freqs arrays
   //TODO: would be nicer to have a reference to freqs->data, anyway we do not care in this init step
-    
-  for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++){
-    lower_freqs->data[0][filter_cnt]=freqs->data[0][filter_cnt];
-    center_freqs->data[0][filter_cnt]=freqs->data[0][filter_cnt+1];
-    upper_freqs->data[0][filter_cnt]=freqs->data[0][filter_cnt+2];
+
+  for (filter_cnt = 0; filter_cnt < allFilters; filter_cnt++) {
+    lower_freqs->data[0][filter_cnt] = freqs->data[0][filter_cnt];
+    center_freqs->data[0][filter_cnt] = freqs->data[0][filter_cnt + 1];
+    upper_freqs->data[0][filter_cnt] = freqs->data[0][filter_cnt + 2];
   }
 
   //computing triangle heights so that each triangle has unit area
-  for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++){
-    triangle_heights->data[0][filter_cnt] = 2./(upper_freqs->data[0][filter_cnt] 
-      - lower_freqs->data[0][filter_cnt]);
+  for (filter_cnt = 0; filter_cnt < allFilters; filter_cnt++) {
+    triangle_heights->data[0][filter_cnt] =
+        2. / (upper_freqs->data[0][filter_cnt]
+        - lower_freqs->data[0][filter_cnt]);
   }
-  
+
   //AUBIO_DBG("filter tables frequencies\n");
   //for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++)
@@ -88 +92 @@
 
   //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++){
-    fft_freqs->data[0][bin_cnt]= aubio_bintofreq(bin_cnt, samplerate, win_s);
+  for (bin_cnt = 0; bin_cnt < win_s; bin_cnt++) {
+    fft_freqs->data[0][bin_cnt] = aubio_bintofreq (bin_cnt, samplerate, win_s);
   }
 
   //building each filter table
-  for(filter_cnt=0; filter_cnt<allFilters; filter_cnt++){
+  for (filter_cnt = 0; filter_cnt < allFilters; filter_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]);
-    
+    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
-    for(bin_cnt=0; bin_cnt<win_s-1; bin_cnt++){
-      filters->data[filter_cnt][bin_cnt]=0.0;
-      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]) {
+    for (bin_cnt = 0; bin_cnt < win_s - 1; bin_cnt++) {
+      filters->data[filter_cnt][bin_cnt] = 0.0;
+      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;
       }
     }
     bin_cnt++;
-    
+
     //positive slope
-    for(; bin_cnt<win_s-1; bin_cnt++){
-      filters->data[filter_cnt][bin_cnt]=(fft_freqs->data[0][bin_cnt]-lower_freqs->data[0][filter_cnt])*riseInc;
+    for (; bin_cnt < win_s - 1; bin_cnt++) {
+      filters->data[filter_cnt][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])
+      if (fft_freqs->data[0][bin_cnt + 1] > center_freqs->data[0][filter_cnt])
         break;
     }
     //bin_cnt++;
-    
+
     //negative slope
-    for(; bin_cnt<win_s-1; bin_cnt++){
-      
+    for (; bin_cnt < win_s - 1; bin_cnt++) {
+
       //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)
-        filters->data[filter_cnt][bin_cnt]=val;
-      else filters->data[filter_cnt][bin_cnt]=0.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)
+        filters->data[filter_cnt][bin_cnt] = val;
+      else
+        filters->data[filter_cnt][bin_cnt] = 0.0;
+
       //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])
+      if (fft_freqs->data[0][bin_cnt + 1] > upper_freqs->data[0][filter_cnt])
         break;
     }
     //bin_cnt++;
-    
+
     //zeroing tail
-    for(; bin_cnt<win_s; bin_cnt++)
-      filters->data[filter_cnt][bin_cnt]=0.f;
+    for (; bin_cnt < win_s; bin_cnt++)
+      filters->data[filter_cnt][bin_cnt] = 0.f;
 
   }
-  
-  /* destroy temporarly allocated vectors */  
-  del_fvec(freqs);
-  del_fvec(lower_freqs);
-  del_fvec(upper_freqs);
-  del_fvec(center_freqs);
 
-  del_fvec(triangle_heights);
-  del_fvec(fft_freqs);
+  /* destroy temporarly allocated vectors */
+  del_fvec (freqs);
+  del_fvec (lower_freqs);
+  del_fvec (upper_freqs);
+  del_fvec (center_freqs);
+
+  del_fvec (triangle_heights);
+  del_fvec (fft_freqs);
 
 }
-

src/spectral/filterbank_mel.h

@@ -36 +36 @@
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
@@ -50 +51 @@
 
 */
-void aubio_filterbank_set_mel_coeffs(aubio_filterbank_t *fb, uint_t samplerate, smpl_t freq_min, smpl_t freq_max);
+void aubio_filterbank_set_mel_coeffs (aubio_filterbank_t * fb,
+    uint_t samplerate, smpl_t freq_min, smpl_t freq_max);
 
 #ifdef __cplusplus
@@ -56 +58 @@
 #endif
 
-#endif // FILTERBANK_MEL_H
+#endif                          // FILTERBANK_MEL_H