Changeset 21bd43c

Timestamp:

Sep 8, 2007, 1:52:48 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:

73eaa2e

Parents:

cb0415d (diff), 8708556 (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 changes

Files:

• examples/aubiomfcc.c (added)
• examples/utils.c (modified) (4 diffs)
• examples/utils.h (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/aubio.h (modified) (1 diff)
• src/bark.c (added)
• src/bark.h (added)
• src/filterbank.c (added)
• src/filterbank.h (added)
• src/mfcc.c (added)
• src/mfcc.h (added)

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];
 
 
@@ -301 +315 @@
   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, 
@@ -313 +330 @@
   /* phase vocoder */
   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);
@@ -346 +368 @@
   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 */

src/Makefile.am

@@ -22 +22 @@
         onset.h \
         tempo.h \
-        filter.h
+        filter.h \
+        mfcc.h
+
 nodist_pkginclude_HEADERS = config.h
 
@@ -69 +71 @@
         tempo.h \
         filter.c \
-        filter.h
+        filter.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 "mfcc.h"
 
 #ifdef __cplusplus