Changeset 71d3bf0

Timestamp:

Sep 6, 2007, 2:33:11 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:

97886fa

Parents:

fe28ff3

Message:

small adds

Files:

• examples/aubiomfcc.c (modified) (3 diffs)
• src/Makefile.am (modified) (2 diffs)
• src/filterbank.c (moved) (moved from src/aubiofilterbank.c) (1 diff)
• src/filterbank.h (moved) (moved from src/aubiofilterbank.h)
• src/mfcc.c (modified) (1 diff)
• src/mfcc.h (modified) (1 diff)

examples/aubiomfcc.c

@@ -41 +41 @@
       //compute mag spectrum
       aubio_pvoc_do (pv,ibuf, fftgrain);
+     
+      uint_t coef_cnt;
+      uint_t n_filters=20;
+      smpl_t outbuf[20];
+
+      for (coef_cnt=0; coef_cnt<n_filters ; coef_cnt++)
+        outbuf[coef_cnt]=0.f;
+       
+      //compute mfccs
+      aubio_mffc_do(fftgrain->norm, nframes, filterbank, outbuf);
       
-       
-      //compute mfcics
-      aubio_mffc_do(fftgrain->norm, nframes, filterbank, outbuf);
+      for (coef_cnt=0; coef_cnt<n_filters ; coef_cnt++)
+        outmsg("%f ",outbuf[coef_cnt]);
+      outmsg("\n");
       
       
@@ -77 +87 @@
   uint_t n_filters=20;
   uint_t nyquist= samplerate / 2.; 
+  smpl_t lowfreq=80.f;
+  smpl_t highfreq=18000.f;
 
   uint_t banksize = (uint) ( sizeof(aubio_mel_filter));
@@ -87 +99 @@
   
   //populating the filter
-  new_aubio_mfcc(buffer_size, nyquist, XTRACT_EQUAL_GAIN, 80.0f, 18000.0f, mf->n_filters, mf->filters);
+  aubio_mfcc_init(buffer_size, nyquist, XTRACT_EQUAL_GAIN, lowfreq, highfreq, mf->n_filters, mf->filters);
 
   //process

src/Makefile.am

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

src/filterbank.c

@@ -21 +21 @@
 */
 
-#include "aubiofilterbank.h"
+#include "filterbank.h"
 
 // Initialization

src/mfcc.c

@@ -23 +23 @@
 
 #include "mffc.h"
-#include "aubiofilterbank.h"
 
 // Computation

src/mfcc.h

@@ -24 +24 @@
 #define MFCC_H 
 
-#include "aubiofilterbank.h"
-
-#define NYQUIST 22050.f
+#include "filterbank.h"
 
 //libXtract enums