Changeset 71b1b4b for src

Timestamp:

Sep 6, 2007, 3:52:19 PM (17 years ago)

Author:

Amaury Hazan <mahmoudax@gmail.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:

7c6c806d

Parents:

dcc649c (diff), 97886fa (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 laptop

Location:

src

Files:

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

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/aubio.h

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

src/filterbank.c

@@ -21 +21 @@
 */
 
-#include "aubiofilterbank.h"
+#include "filterbank.h"
 
 // Initialization
 
-int aubio_mfcc_init(int N, float nyquist, int style, float freq_min, float freq_max, int freq_bands, float **fft_tables){
+int aubio_mfcc_init(int N, smpl_t nyquist, int style, smpl_t freq_min, smpl_t freq_max, int freq_bands, smpl_t **fft_tables){
 
     int n, i, k, *fft_peak, M, next_peak; 
-    float norm, mel_freq_max, mel_freq_min, norm_fact, height, inc, val, 
+    smpl_t norm, mel_freq_max, mel_freq_min, norm_fact, height, inc, val, 
         freq_bw_mel, *mel_peak, *height_norm, *lin_peak;
 
@@ -39 +39 @@
     freq_bw_mel = (mel_freq_max - mel_freq_min) / freq_bands;
 
-    mel_peak = (float *)malloc((freq_bands + 2) * sizeof(float)); 
+    mel_peak = (smpl_t *)malloc((freq_bands + 2) * sizeof(smpl_t)); 
     /* +2 for zeros at start and end */
-    lin_peak = (float *)malloc((freq_bands + 2) * sizeof(float));
+    lin_peak = (smpl_t *)malloc((freq_bands + 2) * sizeof(smpl_t));
     fft_peak = (int *)malloc((freq_bands + 2) * sizeof(int));
-    height_norm = (float *)malloc(freq_bands * sizeof(float));
+    height_norm = (smpl_t *)malloc(freq_bands * sizeof(smpl_t));
 
     if(mel_peak == NULL || height_norm == NULL || 

src/filterbank.h

@@ -18 +18 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 */
 
 #ifndef AUBIOFILTERBANK_H
-#include AUBIOFILTERBANK_H
+#define AUBIOFILTERBANK_H
 
-#define NYQUIST 22050.f
 
 // Struct Declaration
@@ -31 +29 @@
 typedef struct aubio_mel_filter_ {
     int n_filters;
-    float **filters;
+    smpl_t **filters;
 } aubio_mel_filter;
 
@@ -40 +38 @@
  * It is up to the caller to pass in a pointer to memory allocated for freq_bands arrays of length N. This function populates these arrays with magnitude coefficients representing the mel filterbank on a linear scale 
  */
-int aubio_mfcc_init(int N, float nyquist, int style, float freq_min, float freq_max, int freq_bands, float **fft_tables);
+int aubio_mfcc_init(int N, float nyquist, int style, float freq_min, float freq_max, int freq_bands, smpl_t ** fft_tables);
 
 #endif

src/mfcc.c

@@ -23 +23 @@
 
 #include "mffc.h"
-#include "aubiofilterbank.h"
 
 // Computation
@@ -42 +41 @@
     }
 
+    //TODO: check that zero padding
     for(n = filter + 1; n < N; n++) result[n] = 0; 
     
@@ -51 +51 @@
 int aubio_dct_do(const float *data, const int N, const void *argv, float *result){
     
+    
+    //call aubio p_voc in dct setting
+
+    //TODO: fvec as input? Remove data length, N?
+
+    //compute mag spectrum
+    aubio_pvoc_do (pv,data, fftgrain);
+
+    int i;
+    //extract real part of fft grain
+    for(i=0; i<N ;i++){
+      result[i]= fftgrain->norm[i]*cos(fftgrain->phase[i]);
+    }
+    
+    /*
     fftwf_plan plan;
     
@@ -57 +72 @@
     
     fftwf_execute(plan);
-    fftwf_destroy_plan(plan);
+    fftwf_destroy_plan(plan);*/
 
     return XTRACT_SUCCESS;

src/mfcc.h

@@ -24 +24 @@
 #define MFCC_H 
 
+#include "filterbank.h"
 
 //libXtract enums