Changes in / [dddf1f5:66a1b955]


Ignore:
Files:
39 added
48 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • doc/Makefile.am

    rdddf1f5 r66a1b955  
    2828        (echo PROJECT_NUMBER = $(PROJECT_NUMBER) ; cat $(srcdir)/examples.cfg)  | doxygen -
    2929
    30 .sgml.1:
     30%.sgml:
     31
     32%.1:    %.sgml
    3133        docbook-to-man $< > $*.1
    3234
    33 .sgml.html:
     35%.html: %.sgml
    3436        docbook2html $< && mv index.html $*.html
    3537

  • examples/Makefile.am

    rdddf1f5 r66a1b955  
    77        aubioonset \
    88        aubiotrack \
    9         aubionotes \
    10         aubiomfcc
     9        aubionotes
    1110
    1211noinst_PROGRAMS = \
    … …  
    2019aubiotrack_SOURCES = aubiotrack.c utils.c
    2120aubioquiet_SOURCES = aubioquiet.c utils.c
    22 aubiomfcc_SOURCES = aubiomfcc.c utils.c
    2321
    2422aubioonset_LDADD = @JACK_LIBS@
    … …  
    2624aubiotrack_LDADD = @JACK_LIBS@
    2725aubioquiet_LDADD = @JACK_LIBS@
    28 aubiomfcc_LDADD = @JACK_LIBS@

  • examples/utils.c

    rdddf1f5 r66a1b955  
    174174                                else if (strcmp(optarg,"kl") == 0)
    175175                                        type_onset = aubio_onset_kl;
    176                                 else if (strcmp(optarg,"specflux") == 0)
    177                                         type_onset = aubio_onset_specflux;
    178176                                else {
    179177                                        errmsg("unknown onset type.\n");

  • ext/sndfileio.c

    rdddf1f5 r66a1b955  
    2323
    2424#include "aubio_priv.h"
    25 #include "fvec.h"
     25#include "sample.h"
    2626#include "sndfileio.h"
    2727#include "mathutils.h"

  • python/aubio/aubioclass.py

    rdddf1f5 r66a1b955  
    7474        aubio_onsetdetection(self.od,tc(),tf())
    7575    def __del__(self):
    76         del_aubio_onsetdetection(self.od)
     76        aubio_onsetdetection_free(self.od)
    7777
    7878class peakpick:

  • python/aubio/task/utils.py

    rdddf1f5 r66a1b955  
    1717        elif nvalue == 'mkl'           :
    1818                 return aubio_onset_mkl
    19         elif nvalue == 'specflux'      :
    20                  return aubio_onset_specflux
    2119        elif nvalue == 'dual'          :
    2220                 return 'dual'
    2321        else:
    2422                 import sys
    25                  print "unknown onset detection function selected: %s" % nvalue
     23                 print "unknown onset detection function selected"
    2624                 sys.exit(1)
    2725

  • src/Makefile.am

    rdddf1f5 r66a1b955  
    22pkginclude_HEADERS = aubio.h \
    33        types.h \
     4        phasevoc.h \
     5        mathutils.h \
     6        fft.h \
     7        sample.h \
    48        fvec.h \
    59        cvec.h \
    6         mathutils.h \
    7         utils/hist.h \
    8         utils/scale.h \
    9         temporal/resample.h \
    10         temporal/biquad.h \
    11         temporal/filter.h \
    12         spectral/filterbank.h \
    13         spectral/mfcc.c \
    14         spectral/phasevoc.h \
    15         spectral/fft.h \
    16         spectral/tss.h \
    17         spectral/spectral_centroid.h \
    18         pitch/pitchdetection.h \
    19         pitch/pitchmcomb.h \
    20         pitch/pitchyin.h \
    21         pitch/pitchschmitt.h \
    22         pitch/pitchfcomb.h \
    23         pitch/pitchyinfft.h \
    24         onset/onset.h \
    25         onset/onsetdetection.h \
    26         onset/peakpick.h \
    27         tempo/tempo.h \
    28         tempo/beattracking.h
    29 
     10        hist.h \
     11        scale.h \
     12        resample.h \
     13        onsetdetection.h \
     14        tss.h \
     15        peakpick.h \
     16        biquad.h \
     17        pitchdetection.h \
     18        pitchmcomb.h \
     19        pitchyin.h \
     20        pitchschmitt.h \
     21        pitchfcomb.h \
     22        pitchyinfft.h \
     23        beattracking.h \
     24        onset.h \
     25        tempo.h \
     26        filter.h
    3027nodist_pkginclude_HEADERS = config.h
    3128
    … …  
    3330libaubio_la_SOURCES = aubio.h \
    3431        types.h \
     32        phasevoc.c \
     33        phasevoc.h \
     34        mathutils.c \
     35        mathutils.h \
     36        fft.c \
     37        fft.h \
    3538        fvec.c \
    3639        fvec.h \
    3740        cvec.c \
    3841        cvec.h \
    39         mathutils.c \
    40         mathutils.h \
    41         utils/hist.c \
    42         utils/hist.h \
    43         utils/scale.c \
    44         utils/scale.h \
    45         temporal/resample.c \
    46         temporal/resample.h \
    47         temporal/biquad.c \
    48         temporal/biquad.h \
    49         temporal/filter.c \
    50         temporal/filter.h \
    51         spectral/filterbank.c \
    52         spectral/filterbank.h \
    53         spectral/mfcc.h \
    54         spectral/mfcc.c \
    55         spectral/phasevoc.c \
    56         spectral/phasevoc.h \
    57         spectral/fft.c \
    58         spectral/fft.h \
    59         spectral/tss.c \
    60         spectral/tss.h \
    61         spectral/spectral_centroid.c \
    62         spectral/spectral_centroid.h \
    63         pitch/pitchdetection.c \
    64         pitch/pitchdetection.h \
    65         pitch/pitchmcomb.c \
    66         pitch/pitchmcomb.h \
    67         pitch/pitchyin.c \
    68         pitch/pitchyin.h \
    69         pitch/pitchschmitt.c \
    70         pitch/pitchschmitt.h \
    71         pitch/pitchfcomb.c \
    72         pitch/pitchfcomb.h \
    73         pitch/pitchyinfft.c \
    74         pitch/pitchyinfft.h \
    75         onset/onset.c \
    76         onset/onset.h \
    77         onset/onsetdetection.c \
    78         onset/onsetdetection.h \
    79         onset/peakpick.c \
    80         onset/peakpick.h \
    81         tempo/tempo.c \
    82         tempo/tempo.h \
    83         tempo/beattracking.c \
    84         tempo/beattracking.h
     42        hist.c \
     43        hist.h \
     44        scale.c \
     45        scale.h \
     46        resample.c \
     47        resample.h \
     48        onsetdetection.c \
     49        onsetdetection.h \
     50        tss.c \
     51        tss.h \
     52        peakpick.c \
     53        peakpick.h \
     54        biquad.c \
     55        biquad.h \
     56        pitchdetection.c \
     57        pitchdetection.h \
     58        pitchmcomb.c \
     59        pitchmcomb.h \
     60        pitchyin.c \
     61        pitchyin.h \
     62        pitchschmitt.c \
     63        pitchschmitt.h \
     64        pitchfcomb.c \
     65        pitchfcomb.h \
     66        pitchyinfft.c \
     67        pitchyinfft.h \
     68        beattracking.c \
     69        beattracking.h \
     70        onset.c \
     71        onset.h \
     72        tempo.c \
     73        tempo.h \
     74        filter.c \
     75        filter.h
    8576
    8677AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@

  • src/aubio.h

    rdddf1f5 r66a1b955  
    5959/* in this order */
    6060#include "types.h"
    61 #include "fvec.h"
    62 #include "cvec.h"
     61#include "sample.h"
     62#include "fft.h"
     63#include "phasevoc.h"
    6364#include "mathutils.h"
    64 #include "utils/scale.h"
    65 #include "utils/hist.h"
    66 #include "spectral/tss.h"
    67 #include "temporal/resample.h"
    68 #include "temporal/biquad.h"
    69 #include "temporal/filter.h"
    70 #include "spectral/filterbank.h"
    71 #include "spectral/mfcc.h"
    72 #include "spectral/fft.h"
    73 #include "spectral/phasevoc.h"
    74 #include "spectral/spectral_centroid.h"
    75 #include "pitch/pitchdetection.h"
    76 #include "pitch/pitchmcomb.h"
    77 #include "pitch/pitchyin.h"
    78 #include "pitch/pitchyinfft.h"
    79 #include "pitch/pitchschmitt.h"
    80 #include "pitch/pitchfcomb.h"
    81 #include "onset/onsetdetection.h"
    82 #include "onset/onset.h"
    83 #include "onset/peakpick.h"
    84 #include "tempo/beattracking.h"
    85 #include "tempo/tempo.h"
     65#include "scale.h"
     66#include "hist.h"
     67#include "onsetdetection.h"
     68#include "tss.h"
     69#include "resample.h"
     70#include "peakpick.h"
     71#include "biquad.h"
     72#include "filter.h"
     73#include "pitchdetection.h"
     74#include "pitchmcomb.h"
     75#include "pitchyin.h"
     76#include "pitchyinfft.h"
     77#include "pitchschmitt.h"
     78#include "pitchfcomb.h"
     79#include "beattracking.h"
     80#include "onset.h"
     81#include "tempo.h"
    8682
    8783#ifdef __cplusplus

  • src/fvec.c

    rdddf1f5 r66a1b955  
    1919
    2020#include "aubio_priv.h"
    21 #include "fvec.h"
     21#include "sample.h"
    2222
    2323fvec_t * new_fvec( uint_t length, uint_t channels) {

  • src/mathutils.c

    rdddf1f5 r66a1b955  
    2121
    2222#include "aubio_priv.h"
    23 #include "fvec.h"
     23#include "sample.h"
    2424#include "mathutils.h"
    2525#include "config.h"
    … …  
    227227  /* pre part of the buffer does not exist */
    228228  } else {
    229     for (k=0;k<length-pos+post;k++)
     229    for (k=0;k<length-pos+post+1;k++)
    230230      medar[k] = vec->data[0][k+pos-post];
    231     for (k=length-pos+post;k<win_length;k++)
     231    for (k=length-pos+post+1;k<win_length;k++)
    232232      medar[k] = 0.; /* 0-padding at the end */
    233233  }
    … …  
    433433}
    434434
     435smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate) {
     436  uint_t i=0, j;
     437  smpl_t sum = 0., sc = 0.;
     438  for ( j = 0; j < spectrum->length; j++ ) {
     439    sum += spectrum->norm[i][j];
     440  }
     441  if (sum == 0.) return 0.;
     442  for ( j = 0; j < spectrum->length; j++ ) {
     443    sc += (smpl_t)j * spectrum->norm[i][j];
     444  }
     445  return sc / sum * samplerate / (smpl_t)(spectrum->length);
     446}
     447
    435448void aubio_autocorr(fvec_t * input, fvec_t * output) {
    436449  uint_t i = 0, j = 0, length = input->length;

  • src/mathutils.h

    rdddf1f5 r66a1b955  
    209209smpl_t aubio_zero_crossing_rate(fvec_t * input);
    210210/**
     211 * spectrum centroid computed on a cvec
     212 */
     213smpl_t aubio_spectral_centroid(cvec_t * input, smpl_t samplerate);
     214/**
    211215 * clean up cached memory at the end of program
    212216 *

  • swig/aubio.i

    rdddf1f5 r66a1b955  
    155155smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate);
    156156
    157 /* filterbank */
    158 aubio_filterbank_t * new_aubio_filterbank(uint_t win_s, uint_t channels);
    159 aubio_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);
    160 void del_aubio_filterbank(aubio_filterbank_t * fb);
    161 void aubio_filterbank_do(aubio_filterbank_t * fb, cvec_t * in, fvec_t *out);
    162 fvec_t * aubio_filterbank_getchannel(aubio_filterbank_t * fb, uint_t channel);
    163 
    164 /* mfcc */
    165 aubio_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);
    166 void del_aubio_mfcc(aubio_mfcc_t *mf);
    167 void aubio_mfcc_do(aubio_mfcc_t *mf, cvec_t *in, fvec_t *out);
    168 
    169157/* scale */
    170158extern aubio_scale_t * new_aubio_scale(smpl_t flow, smpl_t fhig, smpl_t ilow, smpl_t ihig       );
    … …  
    186174        aubio_onset_phase,
    187175        aubio_onset_kl,
    188         aubio_onset_mkl,
    189         aubio_onset_specflux,
     176        aubio_onset_mkl
    190177} aubio_onsetdetection_type;
    191178aubio_onsetdetection_t * new_aubio_onsetdetection(aubio_onsetdetection_type type, uint_t size, uint_t channels);
    192179void aubio_onsetdetection(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    193 void del_aubio_onsetdetection(aubio_onsetdetection_t *o);
    194180
    195181/* should these still be exposed ? */

  • tests/python/examples/aubiopitch.py

    rdddf1f5 r66a1b955  
    5353    self.getOutput()
    5454    expected_output = open(os.path.join('examples','aubiopitch','yinfft'+'.'+os.path.basename(self.filename)+'.txt')).read()
    55     lines = 0
    5655    for line_out, line_exp in zip(self.output.split('\n'), expected_output.split('\n')):
    57       try:
    58         assert line_exp == line_out, line_exp + " vs. " + line_out + " at line " + str(lines)
    59       except:
    60         open(os.path.join('examples','aubiopitch','yinfft'+'.'+os.path.basename(self.filename)+'.txt.out'),'w').write(self.output)
    61         raise
    62       lines += 1
     56      assert line_out == line_exp, line_exp + " vs. " + line_out
    6357
    6458if __name__ == '__main__': unittest.main()

  • tests/src/test-tempo.c

    rdddf1f5 r66a1b955  
    1919            return 1;
    2020          }
    21           curtempoconf = aubio_tempo_get_confidence(o);
     21          curtempoconf = aubio_beattracking_get_confidence(o);
    2222          if (curtempoconf != 0.) {
    2323            fprintf(stdout,"%f\n",curtempo);
Note: See TracChangeset for help on using the changeset viewer.