Changeset 7873363

Timestamp:

Nov 24, 2007, 6:46:30 PM (17 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:

5dd22a9

Parents:

d7a104c (diff), c1656cf (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 with aubio-mfcc branch, adding filterbank and mfcc first draft. thank you Amaury

Files:

• examples/Makefile.am (modified) (3 diffs)
• examples/aubiomfcc.c (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)
• swig/aubio.i (modified) (1 diff)
• tests/python/demo/plot_mfcc_filterbank.py (added)
• tests/python/filterbank.py (added)
• tests/python/filterbank_mfcc.txt (added)

examples/Makefile.am

@@ -7 +7 @@
         aubioonset \
         aubiotrack \
-        aubionotes
+        aubionotes \
+        aubiomfcc
 
 noinst_PROGRAMS = \
@@ -19 +20 @@
 aubiotrack_SOURCES = aubiotrack.c utils.c
 aubioquiet_SOURCES = aubioquiet.c utils.c
+aubiomfcc_SOURCES = aubiomfcc.c utils.c
 
 aubioonset_LDADD = @JACK_LIBS@
@@ -24 +26 @@
 aubiotrack_LDADD = @JACK_LIBS@
 aubioquiet_LDADD = @JACK_LIBS@
+aubiomfcc_LDADD = @JACK_LIBS@

src/Makefile.am

@@ -24 +24 @@
         onset.h \
         tempo.h \
-        filter.h
+        filter.h \
+        filterbank.h \
+        mfcc.h
+
 nodist_pkginclude_HEADERS = config.h
 
@@ -73 +76 @@
         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

swig/aubio.i

@@ -154 +154 @@
 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 */