Changeset 7873363


Ignore:
Timestamp:
Nov 24, 2007, 6:46:30 PM (13 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
5dd22a9
Parents:
d7a104c (diff), c1656cf (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 with aubio-mfcc branch, adding filterbank and mfcc first draft. thank you Amaury

Files:
8 added
4 edited

Legend:

Unmodified
Added
Removed
  • examples/Makefile.am

    rd7a104c r7873363  
    77        aubioonset \
    88        aubiotrack \
    9         aubionotes
     9        aubionotes \
     10        aubiomfcc
    1011
    1112noinst_PROGRAMS = \
     
    1920aubiotrack_SOURCES = aubiotrack.c utils.c
    2021aubioquiet_SOURCES = aubioquiet.c utils.c
     22aubiomfcc_SOURCES = aubiomfcc.c utils.c
    2123
    2224aubioonset_LDADD = @JACK_LIBS@
     
    2426aubiotrack_LDADD = @JACK_LIBS@
    2527aubioquiet_LDADD = @JACK_LIBS@
     28aubiomfcc_LDADD = @JACK_LIBS@
  • src/Makefile.am

    rd7a104c r7873363  
    2424        onset.h \
    2525        tempo.h \
    26         filter.h
     26        filter.h \
     27        filterbank.h \
     28        mfcc.h
     29
    2730nodist_pkginclude_HEADERS = config.h
    2831
     
    7376        tempo.h \
    7477        filter.c \
    75         filter.h
     78        filter.h \
     79        filterbank.c \
     80        filterbank.h \
     81        mfcc.h \
     82        mfcc.c
    7683
    7784AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
  • src/aubio.h

    rd7a104c r7873363  
    8080#include "onset.h"
    8181#include "tempo.h"
     82#include "filterbank.h"
     83#include "mfcc.h"
    8284
    8385#ifdef __cplusplus
  • swig/aubio.i

    rd7a104c r7873363  
    154154smpl_t aubio_zero_crossing_rate(fvec_t * input);
    155155smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate);
     156
     157/* filterbank */
     158aubio_filterbank_t * new_aubio_filterbank(uint_t win_s, uint_t channels);
     159aubio_filterbank_t * new_aubio_filterbank_mfcc(uint_t n_filters, uint_t win_s, uint_t samplerate, smpl_t freq_min, smpl_t freq_max);
     160void del_aubio_filterbank(aubio_filterbank_t * fb);
     161void aubio_filterbank_do(aubio_filterbank_t * fb, cvec_t * in, fvec_t *out);
     162fvec_t * aubio_filterbank_getchannel(aubio_filterbank_t * fb, uint_t channel);
     163
     164/* mfcc */
     165aubio_mfcc_t * new_aubio_mfcc (uint_t win_s, uint_t samplerate, uint_t n_filters, uint_t n_coefs, smpl_t lowfreq, smpl_t highfreq, uint_t channels);
     166void del_aubio_mfcc(aubio_mfcc_t *mf);
     167void aubio_mfcc_do(aubio_mfcc_t *mf, cvec_t *in, fvec_t *out);
    156168
    157169/* scale */
Note: See TracChangeset for help on using the changeset viewer.