Changeset e5f6a0b for examples

Timestamp:

Sep 16, 2007, 6:06:07 PM (18 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:

177f09a

Parents:

45134c5 (diff), bc4ba75 (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:

merge from amaury's branch

Location:

examples

Files:

• aubiomfcc.c (modified) (4 diffs)
• plotfb.py (added)
• plotmat.py (added)
• utils.c (modified) (5 diffs)

examples/aubiomfcc.c

@@ -23 +23 @@
 fvec_t * mfcc_out;
 aubio_mfcc_t * mfcc;
+
+uint_t n_filters = 40;
+uint_t n_coefs = 11;
 
 unsigned int pos = 0; /*frames%dspblocksize*/
@@ -50 +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 */
@@ -65 +74 @@
       */
       
-      uint_t filter_cnt;
+      uint_t coef_cnt;
       if (output_filename == NULL) {
-        if(frames >= 4) {
-          outmsg("%f\t",(frames-4)*overlap_size/(float)samplerate);
-        } else if (frames < 4) {
-          outmsg("%f\t",0.);
-        }
-        outmsg("%f",mfcc_out->data[0][0]);
-        for (filter_cnt = 1; filter_cnt < mfcc_out->length; filter_cnt++) {
-          outmsg(",%f",mfcc_out->data[0][filter_cnt]);
-        }
-        outmsg("\n");
+//         if(frames >= 4) {
+//           outmsg("%f\t",(frames-4)*overlap_size/(float)samplerate);
+//         } 
+//         else if (frames < 4) {
+//           outmsg("%f\t",0.);
+//         }
+        //outmsg("%f ",mfcc_out->data[0][0]);
+        
+        
       }
 }
@@ -82 +90 @@
 int main(int argc, char **argv) {
   // params
-  uint_t n_filters = 11;
+  
   examples_common_init(argc,argv);
-  smpl_t lowfreq = 0.;
-  smpl_t highfreq = samplerate;
-  mfcc_out = new_fvec(n_filters,channels);
+  smpl_t lowfreq = 133.333f;
+  smpl_t highfreq = 44100.f;
+  mfcc_out = new_fvec(n_coefs,channels);
+  
   
   //populating the filter
-  mfcc = new_aubio_mfcc(buffer_size, samplerate, n_filters, lowfreq, highfreq,
-      channels);
-
+  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/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 buffer_size                    = 2048;
+// uint_t overlap_size                   = 1024;
 uint_t channels                       = 1;
 uint_t samplerate                     = 44100;
@@ -60 +64 @@
 int isonset = 0;
 aubio_pickpeak_t * parms;
-
-/* mfcc objects */
-//parameters
-uint_t n_filters=20;
-smpl_t lowfreq=80.f;
-smpl_t highfreq=18000.f;
-// filterbank object
-aubio_filterbank_t * mf;
-
-// DCT mfft and result storage
-aubio_mfft_t * fft_dct;
-cvec_t * fftgrain_dct;
-smpl_t * mfcc_outbuf[11];
-
 
 /* pitch objects */
@@ -314 +304 @@
   fftgrain  = new_cvec(buffer_size, channels);
 
-  //init for mfcc process
-  fftgrain_dct= new_cvec(n_filters, channels);
-
+  
   if (usepitch) {
     pitchdet = new_aubio_pitchdetection(buffer_size*4, 
@@ -330 +318 @@
   pv = new_aubio_pvoc(buffer_size, overlap_size, channels);
   
-  // dct phase vocoder
-  //TODO: check size
-  fft_dct = new_aubio_mfft(n_filters, channels);
-
   /* onsets */
   parms = new_aubio_peakpicker(threshold);
@@ -367 +351 @@
   del_fvec(onset);
   del_fvec(woodblock);
-  
-  //mffc related
-  del_aubio_mfft(fft_dct);
-  del_cvec(fftgrain_dct);
   
   aubio_cleanup();