Changes in / [203c551:b12c438]

Files:

• examples/Makefile.am (modified) (3 diffs)
• examples/aubiomfcc.c (added)
• examples/utils.c (modified) (4 diffs)
• examples/utils.h (modified) (1 diff)
• python/test/plot_mfcc_filterbank.py (added)
• src/Makefile.am (modified) (2 diffs)
• src/aubio.h (modified) (1 diff)
• src/filterbank.c (added)
• src/filterbank.h (added)
• src/mfcc.c (added)
• src/mfcc.h (added)
• src/sample.c (modified) (1 diff)
• swig/aubio.i (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/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;

src/Makefile.am

@@ -22 +22 @@
         onset.h \
         tempo.h \
-        filter.h
+        filter.h \
+        filterbank.h \
+        mfcc.h
+
 nodist_pkginclude_HEADERS = config.h
 
@@ -69 +72 @@
         tempo.h \
         filter.c \
-        filter.h
+        filter.h \
+        filterbank.c \
+        filterbank.h \
+        mfcc.h \
+        mfcc.c 
 
 AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@

src/aubio.h

@@ -80 +80 @@
 #include "onset.h"
 #include "tempo.h"
+#include "filterbank.h"
+#include "mfcc.h"
 
 #ifdef __cplusplus

src/sample.c

@@ -20 +20 @@
 #include "aubio_priv.h"
 #include "sample.h"
+
 
 fvec_t * new_fvec( uint_t length, uint_t channels) {

swig/aubio.i

@@ -148 +148 @@
 smpl_t aubio_zero_crossing_rate(fvec_t * input);
 smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate);
+
+/* filterbank */
+aubio_filterbank_t * new_aubio_filterbank(uint_t win_s, uint_t channels);
+aubio_filterbank_t * new_aubio_filterbank_mfcc(uint_t n_filters, uint_t win_s, uint_t samplerate, smpl_t freq_min, smpl_t freq_max);
+void del_aubio_filterbank(aubio_filterbank_t * fb);
+void aubio_filterbank_do(aubio_filterbank_t * fb, cvec_t * in, fvec_t *out);
+fvec_t * aubio_filterbank_getchannel(aubio_filterbank_t * fb, uint_t channel);
+
+/* mfcc */
+aubio_mfcc_t * new_aubio_mfcc (uint_t win_s, uint_t samplerate, uint_t n_filters, uint_t n_coefs, smpl_t lowfreq, smpl_t highfreq, uint_t channels);
+void del_aubio_mfcc(aubio_mfcc_t *mf);
+void aubio_mfcc_do(aubio_mfcc_t *mf, cvec_t *in, fvec_t *out);
+
 
 /* scale */