Changeset 97886fa

Timestamp:

Sep 6, 2007, 3:45:23 PM (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:

71b1b4b, fdf39ba

Parents:

71d3bf0

Message:

minor changes

Files:

• examples/aubiomfcc.c (modified) (2 diffs)
• src/mfcc.c (modified) (3 diffs)

examples/aubiomfcc.c

@@ -50 +50 @@
        
       //compute mfccs
-      aubio_mffc_do(fftgrain->norm, nframes, filterbank, outbuf);
+      aubio_mffc_do(fftgrain->norm, nframes, mf, outbuf);
       
       for (coef_cnt=0; coef_cnt<n_filters ; coef_cnt++)
@@ -93 +93 @@
   aubio_mel_filter * mf = (aubio_mel_filter *)getbytes(banksize);
 
-  mfilterbank->n_filters = 20;
-  mfilterbank->filters = (smpl_t **)getbytes(mf->n_filters * sizeof(smpl_t *));
+  mf->n_filters = 20;
+  mf->filters = (smpl_t **)getbytes(mf->n_filters * sizeof(smpl_t *));
   for(n = 0; n < mf->n_filters; n++)
     mf->filters[n] = (smpl_t *)getbytes((buffer_size/2+1) * sizeof(smpl_t));

src/mfcc.c

@@ -41 +41 @@
     }
 
+    //TODO: check that zero padding
     for(n = filter + 1; n < N; n++) result[n] = 0; 
     
@@ -50 +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;
     
@@ -56 +72 @@
     
     fftwf_execute(plan);
-    fftwf_destroy_plan(plan);
+    fftwf_destroy_plan(plan);*/
 
     return XTRACT_SUCCESS;