Changes in / [21bd43c:cb0415d]


Ignore:
Files:
7 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • examples/utils.c

    r21bd43c rcb0415d  
    6060int isonset = 0;
    6161aubio_pickpeak_t * parms;
    62 
    63 /* mfcc objects */
    64 //parameters
    65 uint_t n_filters=20;
    66 uint_t nyquist= samplerate / 2.;
    67 smpl_t lowfreq=80.f;
    68 smpl_t highfreq=18000.f;
    69 // filterbank object
    70 aubio_mel_filter * mf;
    71 
    72 // DCT mfft and result storage
    73 aubio_mfft * fft_dct;
    74 cvec_t * fftgrain_dct;
    75 smpl_t mfcc_outbuf[11];
    7662
    7763
    … …  
    315301  fftgrain  = new_cvec(buffer_size, channels);
    316302
    317   //init for mfcc process
    318   fftgrain_dct= new_cvec(n_filters, channels);
    319 
    320303  if (usepitch) {
    321304    pitchdet = new_aubio_pitchdetection(buffer_size*4,
    … …  
    330313  /* phase vocoder */
    331314  pv = new_aubio_pvoc(buffer_size, overlap_size, channels);
    332  
    333   // dct phase vocoder
    334   //TODO: check size
    335   fft_dct = new_aubio_mfft(n_filters, channels);
    336 
    337315  /* onsets */
    338316  parms = new_aubio_peakpicker(threshold);
    … …  
    368346  del_fvec(onset);
    369347  del_fvec(woodblock);
    370  
    371   //mffc related
    372   del_aubio_mfft(fft_dct);
    373   del_cvec(fftgrain_dct);
    374  
    375348  aubio_cleanup();
    376349}

  • examples/utils.h

    r21bd43c rcb0415d  
    9898extern aubio_pickpeak_t * parms;
    9999
    100 /* mfcc objects */
    101 // params
    102 extern uint_t n_filters;
    103 extern uint_t nyquist;
    104 extern smpl_t lowfreq;
    105 extern smpl_t highfreq;
    106 // filterbank object
    107 extern aubio_mel_filter * mf;
    108 // DCT pvoc and result storage
    109 extern aubio_mfft_t * fft_dct;
    110 extern cvec_t * fftgrain_dct;
    111 extern smpl_t mfcc_outbuf[20];
    112100
    113101/* pitch objects */

  • src/Makefile.am

    r21bd43c rcb0415d  
    2222        onset.h \
    2323        tempo.h \
    24         filter.h \
    25         mfcc.h
    26 
     24        filter.h
    2725nodist_pkginclude_HEADERS = config.h
    2826
    … …  
    7169        tempo.h \
    7270        filter.c \
    73         filter.h \
    74         mfcc.h \
    75         mfcc.c
     71        filter.h
    7672
    7773AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@

  • src/aubio.h

    r21bd43c rcb0415d  
    8080#include "onset.h"
    8181#include "tempo.h"
    82 #include "mfcc.h"
    8382
    8483#ifdef __cplusplus
Note: See TracChangeset for help on using the changeset viewer.