Changes in / [66a1b955:dddf1f5]

Files:

• doc/Makefile.am (modified) (1 diff)
• examples/Makefile.am (modified) (3 diffs)
• examples/aubiomfcc.c (added)
• examples/utils.c (modified) (1 diff)
• ext/sndfileio.c (modified) (1 diff)
• python/aubio/aubioclass.py (modified) (1 diff)
• python/aubio/task/utils.py (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/aubio.h (modified) (1 diff)
• src/beattracking.c (deleted)
• src/beattracking.h (deleted)
• src/biquad.c (deleted)
• src/biquad.h (deleted)
• src/fft.c (deleted)
• src/fft.h (deleted)
• src/filter.c (deleted)
• src/filter.h (deleted)
• src/fvec.c (modified) (1 diff)
• src/hist.c (deleted)
• src/hist.h (deleted)
• src/mathutils.c (modified) (3 diffs)
• src/mathutils.h (modified) (1 diff)
• src/onset.c (deleted)
• src/onset.h (deleted)
• src/onset/onset.c (added)
• src/onset/onset.h (added)
• src/onset/onsetdetection.c (added)
• src/onset/onsetdetection.h (added)
• src/onset/peakpick.c (added)
• src/onset/peakpick.h (added)
• src/onsetdetection.c (deleted)
• src/onsetdetection.h (deleted)
• src/peakpick.c (deleted)
• src/peakpick.h (deleted)
• src/phasevoc.c (deleted)
• src/phasevoc.h (deleted)
• src/pitch/pitchdetection.c (added)
• src/pitch/pitchdetection.h (added)
• src/pitch/pitchfcomb.c (added)
• src/pitch/pitchfcomb.h (added)
• src/pitch/pitchmcomb.c (added)
• src/pitch/pitchmcomb.h (added)
• src/pitch/pitchschmitt.c (added)
• src/pitch/pitchschmitt.h (added)
• src/pitch/pitchyin.c (added)
• src/pitch/pitchyin.h (added)
• src/pitch/pitchyinfft.c (added)
• src/pitch/pitchyinfft.h (added)
• src/pitchdetection.c (deleted)
• src/pitchdetection.h (deleted)
• src/pitchfcomb.c (deleted)
• src/pitchfcomb.h (deleted)
• src/pitchmcomb.c (deleted)
• src/pitchmcomb.h (deleted)
• src/pitchschmitt.c (deleted)
• src/pitchschmitt.h (deleted)
• src/pitchyin.c (deleted)
• src/pitchyin.h (deleted)
• src/pitchyinfft.c (deleted)
• src/pitchyinfft.h (deleted)
• src/resample.c (deleted)
• src/resample.h (deleted)
• src/sample.h (deleted)
• src/scale.c (deleted)
• src/scale.h (deleted)
• src/spectral/fft.c (added)
• src/spectral/fft.h (added)
• src/spectral/filterbank.c (added)
• src/spectral/filterbank.h (added)
• src/spectral/mfcc.c (added)
• src/spectral/mfcc.h (added)
• src/spectral/phasevoc.c (added)
• src/spectral/phasevoc.h (added)
• src/spectral/spectral_centroid.c (added)
• src/spectral/spectral_centroid.h (added)
• src/spectral/tss.c (added)
• src/spectral/tss.h (added)
• src/tempo.c (deleted)
• src/tempo.h (deleted)
• src/tempo/beattracking.c (added)
• src/tempo/beattracking.h (added)
• src/tempo/tempo.c (added)
• src/tempo/tempo.h (added)
• src/temporal/biquad.c (added)
• src/temporal/biquad.h (added)
• src/temporal/filter.c (added)
• src/temporal/filter.h (added)
• src/temporal/resample.c (added)
• src/temporal/resample.h (added)
• src/tss.c (deleted)
• src/tss.h (deleted)
• src/utils/hist.c (added)
• src/utils/hist.h (added)
• src/utils/scale.c (added)
• src/utils/scale.h (added)
• swig/aubio.i (modified) (2 diffs)
• tests/python/demo/plot_mfcc_filterbank.py (added)
• tests/python/examples/aubiopitch.py (modified) (1 diff)
• tests/python/filterbank.py (added)
• tests/python/filterbank_mfcc.txt (added)
• tests/src/test-tempo.c (modified) (1 diff)

doc/Makefile.am

@@ -28 +28 @@
         (echo PROJECT_NUMBER = $(PROJECT_NUMBER) ; cat $(srcdir)/examples.cfg)  | doxygen -
 
-%.sgml: 
-
-%.1:    %.sgml
+.sgml.1:
         docbook-to-man $< > $*.1
 
-%.html: %.sgml
+.sgml.html:
         docbook2html $< && mv index.html $*.html
 

examples/Makefile.am

@@ -7 +7 @@
         aubioonset \
         aubiotrack \
-        aubionotes
+        aubionotes \
+        aubiomfcc
 
 noinst_PROGRAMS = \
@@ -19 +20 @@
 aubiotrack_SOURCES = aubiotrack.c utils.c
 aubioquiet_SOURCES = aubioquiet.c utils.c
+aubiomfcc_SOURCES = aubiomfcc.c utils.c
 
 aubioonset_LDADD = @JACK_LIBS@
@@ -24 +26 @@
 aubiotrack_LDADD = @JACK_LIBS@
 aubioquiet_LDADD = @JACK_LIBS@
+aubiomfcc_LDADD = @JACK_LIBS@

examples/utils.c

@@ -174 +174 @@
                                 else if (strcmp(optarg,"kl") == 0) 
                                         type_onset = aubio_onset_kl;
+                                else if (strcmp(optarg,"specflux") == 0) 
+                                        type_onset = aubio_onset_specflux;
                                 else {
                                         errmsg("unknown onset type.\n");

ext/sndfileio.c

@@ -23 +23 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "sndfileio.h"
 #include "mathutils.h"

python/aubio/aubioclass.py

@@ -74 +74 @@
         aubio_onsetdetection(self.od,tc(),tf())
     def __del__(self):
-        aubio_onsetdetection_free(self.od)
+        del_aubio_onsetdetection(self.od)
 
 class peakpick:

python/aubio/task/utils.py

@@ -17 +17 @@
         elif nvalue == 'mkl'           :
                  return aubio_onset_mkl
+        elif nvalue == 'specflux'      :
+                 return aubio_onset_specflux
         elif nvalue == 'dual'          :
                  return 'dual'
         else:
                  import sys
-                 print "unknown onset detection function selected"
+                 print "unknown onset detection function selected: %s" % nvalue
                  sys.exit(1)
 

src/Makefile.am

@@ -2 +2 @@
 pkginclude_HEADERS = aubio.h \
         types.h \
-        phasevoc.h \
-        mathutils.h \
-        fft.h \
-        sample.h \
         fvec.h \
         cvec.h \
-        hist.h \
-        scale.h \
-        resample.h \
-        onsetdetection.h \
-        tss.h \
-        peakpick.h \
-        biquad.h \
-        pitchdetection.h \
-        pitchmcomb.h \
-        pitchyin.h \
-        pitchschmitt.h \
-        pitchfcomb.h \
-        pitchyinfft.h \
-        beattracking.h \
-        onset.h \
-        tempo.h \
-        filter.h
+        mathutils.h \
+        utils/hist.h \
+        utils/scale.h \
+        temporal/resample.h \
+        temporal/biquad.h \
+        temporal/filter.h \
+        spectral/filterbank.h \
+        spectral/mfcc.c \
+        spectral/phasevoc.h \
+        spectral/fft.h \
+        spectral/tss.h \
+        spectral/spectral_centroid.h \
+        pitch/pitchdetection.h \
+        pitch/pitchmcomb.h \
+        pitch/pitchyin.h \
+        pitch/pitchschmitt.h \
+        pitch/pitchfcomb.h \
+        pitch/pitchyinfft.h \
+        onset/onset.h \
+        onset/onsetdetection.h \
+        onset/peakpick.h \
+        tempo/tempo.h \
+        tempo/beattracking.h
+
 nodist_pkginclude_HEADERS = config.h
 
@@ -30 +33 @@
 libaubio_la_SOURCES = aubio.h \
         types.h \
-        phasevoc.c \
-        phasevoc.h \
-        mathutils.c \
-        mathutils.h \
-        fft.c \
-        fft.h \
         fvec.c \
         fvec.h \
         cvec.c \
         cvec.h \
-        hist.c \
-        hist.h \
-        scale.c \
-        scale.h \
-        resample.c \
-        resample.h \
-        onsetdetection.c \
-        onsetdetection.h \
-        tss.c \
-        tss.h \
-        peakpick.c \
-        peakpick.h \
-        biquad.c \
-        biquad.h \
-        pitchdetection.c \
-        pitchdetection.h \
-        pitchmcomb.c \
-        pitchmcomb.h \
-        pitchyin.c \
-        pitchyin.h \
-        pitchschmitt.c \
-        pitchschmitt.h \
-        pitchfcomb.c \
-        pitchfcomb.h \
-        pitchyinfft.c \
-        pitchyinfft.h \
-        beattracking.c \
-        beattracking.h \
-        onset.c \
-        onset.h \
-        tempo.c \
-        tempo.h \
-        filter.c \
-        filter.h
+        mathutils.c \
+        mathutils.h \
+        utils/hist.c \
+        utils/hist.h \
+        utils/scale.c \
+        utils/scale.h \
+        temporal/resample.c \
+        temporal/resample.h \
+        temporal/biquad.c \
+        temporal/biquad.h \
+        temporal/filter.c \
+        temporal/filter.h \
+        spectral/filterbank.c \
+        spectral/filterbank.h \
+        spectral/mfcc.h \
+        spectral/mfcc.c \
+        spectral/phasevoc.c \
+        spectral/phasevoc.h \
+        spectral/fft.c \
+        spectral/fft.h \
+        spectral/tss.c \
+        spectral/tss.h \
+        spectral/spectral_centroid.c \
+        spectral/spectral_centroid.h \
+        pitch/pitchdetection.c \
+        pitch/pitchdetection.h \
+        pitch/pitchmcomb.c \
+        pitch/pitchmcomb.h \
+        pitch/pitchyin.c \
+        pitch/pitchyin.h \
+        pitch/pitchschmitt.c \
+        pitch/pitchschmitt.h \
+        pitch/pitchfcomb.c \
+        pitch/pitchfcomb.h \
+        pitch/pitchyinfft.c \
+        pitch/pitchyinfft.h \
+        onset/onset.c \
+        onset/onset.h \
+        onset/onsetdetection.c \
+        onset/onsetdetection.h \
+        onset/peakpick.c \
+        onset/peakpick.h \
+        tempo/tempo.c \
+        tempo/tempo.h \
+        tempo/beattracking.c \
+        tempo/beattracking.h
 
 AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@

src/aubio.h

@@ -59 +59 @@
 /* in this order */
 #include "types.h"
-#include "sample.h"
-#include "fft.h"
-#include "phasevoc.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
-#include "scale.h"
-#include "hist.h"
-#include "onsetdetection.h"
-#include "tss.h"
-#include "resample.h"
-#include "peakpick.h"
-#include "biquad.h"
-#include "filter.h"
-#include "pitchdetection.h"
-#include "pitchmcomb.h"
-#include "pitchyin.h"
-#include "pitchyinfft.h"
-#include "pitchschmitt.h"
-#include "pitchfcomb.h"
-#include "beattracking.h"
-#include "onset.h"
-#include "tempo.h"
+#include "utils/scale.h"
+#include "utils/hist.h"
+#include "spectral/tss.h"
+#include "temporal/resample.h"
+#include "temporal/biquad.h"
+#include "temporal/filter.h"
+#include "spectral/filterbank.h"
+#include "spectral/mfcc.h"
+#include "spectral/fft.h"
+#include "spectral/phasevoc.h"
+#include "spectral/spectral_centroid.h"
+#include "pitch/pitchdetection.h"
+#include "pitch/pitchmcomb.h"
+#include "pitch/pitchyin.h"
+#include "pitch/pitchyinfft.h"
+#include "pitch/pitchschmitt.h"
+#include "pitch/pitchfcomb.h"
+#include "onset/onsetdetection.h"
+#include "onset/onset.h"
+#include "onset/peakpick.h"
+#include "tempo/beattracking.h"
+#include "tempo/tempo.h"
 
 #ifdef __cplusplus

src/fvec.c

@@ -19 +19 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 
 fvec_t * new_fvec( uint_t length, uint_t channels) {

src/mathutils.c

@@ -21 +21 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "mathutils.h"
 #include "config.h"
@@ -227 +227 @@
   /* pre part of the buffer does not exist */
   } else {
-    for (k=0;k<length-pos+post+1;k++)
+    for (k=0;k<length-pos+post;k++)
       medar[k] = vec->data[0][k+pos-post];
-    for (k=length-pos+post+1;k<win_length;k++)
+    for (k=length-pos+post;k<win_length;k++)
       medar[k] = 0.; /* 0-padding at the end */
   }
@@ -433 +433 @@
 }
 
-smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate) {
-  uint_t i=0, j;
-  smpl_t sum = 0., sc = 0.;
-  for ( j = 0; j < spectrum->length; j++ ) {
-    sum += spectrum->norm[i][j];
-  }
-  if (sum == 0.) return 0.;
-  for ( j = 0; j < spectrum->length; j++ ) {
-    sc += (smpl_t)j * spectrum->norm[i][j];
-  }
-  return sc / sum * samplerate / (smpl_t)(spectrum->length);
-}
-
 void aubio_autocorr(fvec_t * input, fvec_t * output) {
   uint_t i = 0, j = 0, length = input->length;

src/mathutils.h

@@ -209 +209 @@
 smpl_t aubio_zero_crossing_rate(fvec_t * input);
 /**
- * spectrum centroid computed on a cvec
- */
-smpl_t aubio_spectral_centroid(cvec_t * input, smpl_t samplerate);
-/**
  * clean up cached memory at the end of program
  *

swig/aubio.i

@@ -155 +155 @@
 smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate);
 
+/* filterbank */
+aubio_filterbank_t * new_aubio_filterbank(uint_t win_s, uint_t channels);
+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);
+void del_aubio_filterbank(aubio_filterbank_t * fb);
+void aubio_filterbank_do(aubio_filterbank_t * fb, cvec_t * in, fvec_t *out);
+fvec_t * aubio_filterbank_getchannel(aubio_filterbank_t * fb, uint_t channel);
+
+/* mfcc */
+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);
+void del_aubio_mfcc(aubio_mfcc_t *mf);
+void aubio_mfcc_do(aubio_mfcc_t *mf, cvec_t *in, fvec_t *out);
+
 /* scale */
 extern aubio_scale_t * new_aubio_scale(smpl_t flow, smpl_t fhig, smpl_t ilow, smpl_t ihig       );
@@ -174 +186 @@
         aubio_onset_phase, 
         aubio_onset_kl, 
-        aubio_onset_mkl 
+        aubio_onset_mkl, 
+        aubio_onset_specflux,
 } aubio_onsetdetection_type;
 aubio_onsetdetection_t * new_aubio_onsetdetection(aubio_onsetdetection_type type, uint_t size, uint_t channels);
 void aubio_onsetdetection(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
+void del_aubio_onsetdetection(aubio_onsetdetection_t *o);
 
 /* should these still be exposed ? */

tests/python/examples/aubiopitch.py

@@ -53 +53 @@
     self.getOutput()
     expected_output = open(os.path.join('examples','aubiopitch','yinfft'+'.'+os.path.basename(self.filename)+'.txt')).read()
+    lines = 0
     for line_out, line_exp in zip(self.output.split('\n'), expected_output.split('\n')):
-      assert line_out == line_exp, line_exp + " vs. " + line_out
+      try:
+        assert line_exp == line_out, line_exp + " vs. " + line_out + " at line " + str(lines)
+      except:
+        open(os.path.join('examples','aubiopitch','yinfft'+'.'+os.path.basename(self.filename)+'.txt.out'),'w').write(self.output)
+        raise
+      lines += 1
 
 if __name__ == '__main__': unittest.main()

tests/src/test-tempo.c

@@ -19 +19 @@
             return 1;
           }
-          curtempoconf = aubio_beattracking_get_confidence(o);
+          curtempoconf = aubio_tempo_get_confidence(o);
           if (curtempoconf != 0.) {
             fprintf(stdout,"%f\n",curtempo);