Changeset 7a46bf6 for examples

Timestamp:

Sep 10, 2007, 7:29:32 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:

787f1f3, ef1c3b7

Parents:

7c6c806d (diff), 45134c5 (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 piem, corrected mffcs coefs/filter number
added some scripts to visualize filterbank and mfccs

Location:

examples

Files:

• Makefile.am (modified) (3 diffs)
• aubiomfcc.c (modified) (4 diffs)
• plotfb.py (added)
• plotmat.py (added)
• tests/test-beattracking.c (modified) (1 diff)
• tests/test-tempo.c (modified) (1 diff)
• utils.c (modified) (4 diffs)
• utils.h (modified) (1 diff)

examples/Makefile.am

@@ -11 +11 @@
         aubioonset \
         aubiotrack \
-        aubionotes
+        aubionotes \
+        aubiomfcc
 
 noinst_PROGRAMS = \
@@ -23 +24 @@
 aubiotrack_SOURCES = aubiotrack.c utils.c
 aubioquiet_SOURCES = aubioquiet.c utils.c
+aubiomfcc_SOURCES = aubiomfcc.c utils.c
 
 aubioonset_LDADD = @JACK_LIBS@
@@ -28 +30 @@
 aubiotrack_LDADD = @JACK_LIBS@
 aubioquiet_LDADD = @JACK_LIBS@
+aubiomfcc_LDADD = @JACK_LIBS@

examples/aubiomfcc.c

@@ -1 +1 @@
 /*
-   Copyright (C) 2007 Amaury Hazan
+   Copyright (C) 2007 Amaury Hazan <ahazan@iua.upf.edu>
+                  and Paul Brossier <piem@piem.org>
 
    This program is free software; you can redistribute it and/or modify
@@ -18 +19 @@
 
 #include "utils.h"
+
+/* mfcc objects */
+fvec_t * mfcc_out;
+aubio_mfcc_t * mfcc;
+
+uint_t n_filters = 20;
+uint_t n_coefs = 11;
 
 unsigned int pos = 0; /*frames%dspblocksize*/
@@ -43 +51 @@
       aubio_pvoc_do (pv,ibuf, fftgrain);
      
-      uint_t n_coefs= n_filters/2 +1;
-      uint_t coef_cnt;
-       
-
-      for (coef_cnt=0; coef_cnt<n_coefs ; coef_cnt++)
-        mfcc_outbuf[coef_cnt]=0.f;
-       
       //compute mfccs
-      aubio_mffc_do(fftgrain->norm, nframes, mf, mfcc_outbuf, fft_dct, fftgrain_dct);
-      
-      for (coef_cnt=0; coef_cnt<n_coefs ; coef_cnt++)
-        outmsg("%f ",mfcc_outbuf[coef_cnt]);
-      outmsg("\n");
-      
-      
+      aubio_mfcc_do(mfcc, fftgrain, mfcc_out);
 
       /* end of block loop */
@@ -73 +68 @@
       */
       
+      uint_t coef_cnt;
       if (output_filename == NULL) {
-        if(frames >= 4) {
-          outmsg("%f\n",(frames-4)*overlap_size/(float)samplerate);
-        } else if (frames < 4) {
-          outmsg("%f\n",0.);
+//         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 (coef_cnt = 0; coef_cnt < n_coefs; coef_cnt++) {
+          outmsg("%f ",mfcc_out->data[0][coef_cnt]);
         }
+        outmsg("\n");/*/
       }
 }
 
 int main(int argc, char **argv) {
+  // params
+  //uint_t n_filters = 40;
+  //uint_t n_coefs = 15;
+
   examples_common_init(argc,argv);
-  
-  //allocate and initialize mel filter bank
-  
-
-  //allocating global mf (in utils.c)
-  uint_t banksize = (uint) ( sizeof(aubio_mel_filter));
-  mf = (aubio_mel_filter *)getbytes(banksize);
-
-  mf->n_filters = 20;
-  mf->filters = (smpl_t **)getbytes(mf->n_filters * sizeof(smpl_t *));
-  for(n = 0; n < mf->n_filters; n++)
-    mf->filters[n] = (smpl_t *)getbytes((buffer_size/2+1) * sizeof(smpl_t));
+  smpl_t lowfreq = 133.333f;
+  smpl_t highfreq = 44100.f;
+  mfcc_out = new_fvec(n_coefs,channels);
   
   //populating the filter
-  aubio_mfcc_init(buffer_size, nyquist, XTRACT_EQUAL_GAIN, lowfreq, highfreq, mf->n_filters, mf->filters);
+  mfcc = new_aubio_mfcc(buffer_size, samplerate, n_filters, n_coefs , lowfreq, highfreq, channels);
 
   //process
   examples_common_process(aubio_process,process_print);
+  
+  //destroying mfcc 
+  del_aubio_mfcc(mfcc);
+  del_fvec(mfcc_out);
+
   examples_common_del();
   debug("End of program.\n");
   fflush(stderr);
   
-  //destroying filterbank
-  free(mf);
-  
   return 0;
 }

examples/tests/test-beattracking.c

@@ -13 +13 @@
         uint_t i = 0;
 
+        smpl_t curtempo;
+
         while (i < 10) {
           aubio_beattracking_do(tempo,in,out);
+          curtempo = aubio_beattracking_get_bpm(tempo);
+          if (curtempo != 0.) {
+            fprintf(stdout,"%f\n",curtempo);
+            return 1;
+          }
           i++;
         };

examples/tests/test-tempo.c

@@ -10 +10 @@
         uint_t i = 0;
 
+        smpl_t curtempo;
+
         while (i < 1000) {
           aubio_tempo(o,in,out);
+          curtempo = aubio_tempo_get_bpm(o);
+          if (curtempo != 0.) {
+            fprintf(stdout,"%f\n",curtempo);
+          }
           i++;
         };

examples/utils.c

@@ -60 +60 @@
 int isonset = 0;
 aubio_pickpeak_t * parms;
-
-/* mfcc objects */
-//parameters
-uint_t n_filters=20;
-uint_t nyquist= samplerate / 2.; 
-smpl_t lowfreq=80.f;
-smpl_t highfreq=18000.f;
-// filterbank object
-aubio_mel_filter * mf;
-
-// DCT mfft and result storage
-aubio_mfft * fft_dct;
-cvec_t * fftgrain_dct;
-smpl_t mfcc_outbuf[11];
-
 
 /* pitch objects */
@@ -315 +300 @@
   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, 
@@ -331 +314 @@
   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);
@@ -368 +347 @@
   del_fvec(onset);
   del_fvec(woodblock);
-  
-  //mffc related
-  del_aubio_mfft(fft_dct);
-  del_cvec(fftgrain_dct);
   
   aubio_cleanup();

examples/utils.h

@@ -98 +98 @@
 extern aubio_pickpeak_t * parms;
 
-/* mfcc objects */
-// params
-extern uint_t n_filters;
-extern uint_t nyquist; 
-extern smpl_t lowfreq;
-extern smpl_t highfreq;
-// filterbank object
-extern aubio_mel_filter * mf;
-// DCT pvoc and result storage
-extern aubio_mfft_t * fft_dct;
-extern cvec_t * fftgrain_dct;
-extern smpl_t mfcc_outbuf[20];
-
 /* pitch objects */
 extern smpl_t pitch;