Changeset 787f1f3 for examples

Timestamp:

Sep 12, 2007, 5:55:48 PM (17 years ago)

Author:

Amaury Hazan <mahmoudax@gmail.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:

95a64c7

Parents:

7a46bf6 (diff), 83d5abf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged from laptop, change debug to AUBIO_DBG in filterbank.c

Location:

examples

Files:

• aubiomfcc.c (modified) (5 diffs)
• plotfb.py (modified) (2 diffs)
• utils.c (modified) (1 diff)

examples/aubiomfcc.c

@@ -24 +24 @@
 aubio_mfcc_t * mfcc;
 
-uint_t n_filters = 20;
+uint_t n_filters = 40;
 uint_t n_coefs = 11;
 
@@ -53 +53 @@
       //compute mfccs
       aubio_mfcc_do(mfcc, fftgrain, mfcc_out);
-
+      
+      uint_t coef_cnt;
+      for (coef_cnt = 0; coef_cnt < n_coefs; coef_cnt++) {
+          outmsg("%f ",mfcc_out->data[0][coef_cnt]);
+      }
+      outmsg("\n");
+      
       /* end of block loop */
       pos = -1; /* so it will be zero next j loop */
@@ -78 +84 @@
         //outmsg("%f ",mfcc_out->data[0][0]);
         
-        /*for (coef_cnt = 0; coef_cnt < n_coefs; coef_cnt++) {
-          outmsg("%f ",mfcc_out->data[0][coef_cnt]);
-        }
-        outmsg("\n");/*/
+        
       }
 }
@@ -87 +90 @@
 int main(int argc, char **argv) {
   // params
-  //uint_t n_filters = 40;
-  //uint_t n_coefs = 15;
-
+  
   examples_common_init(argc,argv);
   smpl_t lowfreq = 133.333f;
@@ -95 +96 @@
   mfcc_out = new_fvec(n_coefs,channels);
   
+  
   //populating the filter
   mfcc = new_aubio_mfcc(buffer_size, samplerate, n_filters, n_coefs , lowfreq, highfreq, channels);
-
+  dump_filterbank(mfcc);
+  
+  
   //process
   examples_common_process(aubio_process,process_print);

examples/plotfb.py

@@ -5 +5 @@
 import sys
 
+
 filename=sys.argv[1]
+
+doLog=False
+if len(sys.argv)>2: 
+  if sys.argv[2]=='log':
+    doLog=True
 
 mat = pylab.load(filename)
@@ -15 +21 @@
 n_filters=numpy.shape(nmat)[0]
 for i in range(n_filters):
-  pylab.plot(nmat[i,:])
+  if doLog==True:
+    pylab.semilogx(nmat[i,:])
+  else:
+    pylab.plot(nmat[i,:]) 
 
 

examples/utils.c

@@ -40 +40 @@
 smpl_t threshold                      = 0.3;
 smpl_t silence                        = -90.;
-uint_t buffer_size                    = 512; //1024;
-uint_t overlap_size                   = 256; //512;
+// uint_t buffer_size                    = 512;
+// uint_t overlap_size                   = 256;
+uint_t buffer_size                    = 1024;
+uint_t overlap_size                   = 512;
 uint_t channels                       = 1;
 uint_t samplerate                     = 44100;