Changeset ef1c3b7 for examples

Timestamp:

Sep 11, 2007, 12:14:01 AM (17 years ago)

Author:

Amaury Hazan <mahmoudax@gmail.com>

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:

f72ceeb

Parents:

7212394 (diff), 7a46bf6 (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 aubio_mfcc, added slaney filterbank (70% done)

Location:

examples

Files:

• Makefile.am (modified) (3 diffs)
• aubiomfcc.c (added)
• 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/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;
-
 
 /* pitch objects */
@@ -301 +300 @@
   fftgrain  = new_cvec(buffer_size, channels);
 
+  
   if (usepitch) {
     pitchdet = new_aubio_pitchdetection(buffer_size*4, 
@@ -313 +313 @@
   /* phase vocoder */
   pv = new_aubio_pvoc(buffer_size, overlap_size, channels);
+  
   /* onsets */
   parms = new_aubio_peakpicker(threshold);
@@ -346 +347 @@
   del_fvec(onset);
   del_fvec(woodblock);
+  
   aubio_cleanup();
 }

examples/utils.h

@@ -98 +98 @@
 extern aubio_pickpeak_t * parms;
 
-
 /* pitch objects */
 extern smpl_t pitch;