Changeset ad65346

Timestamp:

Sep 23, 2016, 6:57:20 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn, feature/crepe, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch

Children:

7d01fdf

Parents:

3ffedf22 (diff), bd8a92d (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 branch 'master' into pitchshift

Files:

• python/demos/demo_mfcc.py (modified) (3 diffs)
• python/ext/aubiomodule.c (modified) (2 diffs)
• python/ext/py-fft.c (modified) (1 diff)
• python/ext/py-phasevoc.c (modified) (1 diff)
• python/ext/py-source.c (modified) (1 diff)
• python/lib/moresetuptools.py (modified) (1 diff)
• python/tests/test_fvec.py (modified) (1 diff)
• python/tests/test_source.py (modified) (2 diffs)
• python/tests/test_specdesc.py (modified) (1 diff)
• src/aubio.h (modified) (2 diffs)
• src/aubio_priv.h (modified) (2 diffs)
• src/io/source_sndfile.c (modified) (6 diffs)
• src/notes/notes.c (modified) (1 diff)
• src/spectral/fft.h (modified) (1 diff)
• src/spectral/specdesc.c (modified) (2 diffs)
• src/utils/log.c (added)
• src/utils/log.h (added)
• tests/src/spectral/test-fft.c (modified) (1 diff)
• tests/src/utils/test-log.c (added)
• wscript (modified) (1 diff)

python/demos/demo_mfcc.py

@@ -3 +3 @@
 import sys
 from aubio import source, pvoc, mfcc
-from numpy import vstack, zeros
+from numpy import vstack, zeros, diff
 
-win_s = 512                 # fft size
-hop_s = win_s // 4          # hop size
 n_filters = 40              # must be 40 for mfcc
 n_coeffs = 13
-samplerate = 44100
 
 if len(sys.argv) < 2:
-    print("Usage: %s <source_filename>" % sys.argv[0])
+    print("Usage: %s <source_filename> [samplerate] [win_s] [hop_s] [mode]" % sys.argv[0])
+    print("  where [mode] can be 'delta' or 'ddelta' for first and second derivatives")
     sys.exit(1)
 
 source_filename = sys.argv[1]
+
+if len(sys.argv) > 2: samplerate = int(sys.argv[2])
+else: samplerate = 0
+if len(sys.argv) > 3: win_s = int(sys.argv[3])
+else: win_s = 512
+if len(sys.argv) > 4: hop_s = int(sys.argv[4])
+else: hop_s = win_s // 4
+if len(sys.argv) > 5: mode = sys.argv[5]
+else: mode = "default"
 
 samplerate = 0
@@ -49 +56 @@
 wave.yaxis.set_visible(False)
 
+# compute first and second derivatives
+if mode in ["delta", "ddelta"]:
+    mfccs = diff(mfccs, axis = 0)
+if mode == "ddelta":
+    mfccs = diff(mfccs, axis = 0)
+
 all_times = arange(mfccs.shape[0]) * hop_s
 n_coeffs = mfccs.shape[1]
@@ -54 +67 @@
     ax = plt.axes ( [0.1, 0.75 - ((i+1) * 0.65 / n_coeffs),  0.8, 0.65 / n_coeffs], sharex = wave )
     ax.xaxis.set_visible(False)
-    ax.yaxis.set_visible(False)
+    ax.set_yticks([])
+    ax.set_ylabel('%d' % i)
     ax.plot(all_times, mfccs.T[i])
 
 # add time to the last axis
-set_xlabels_sample2time( ax, frames_read, samplerate) 
+set_xlabels_sample2time( ax, frames_read, samplerate)
 
 #plt.ylabel('spectral descriptor value')
 ax.xaxis.set_visible(True)
-wave.set_title('MFCC for %s' % source_filename)
+title = 'MFCC for %s' % source_filename
+if mode == "delta": title = mode + " " + title
+elif mode == "ddelta": title = "double-delta" + " " + title
+wave.set_title(title)
 plt.show()

python/ext/aubiomodule.c

@@ -257 +257 @@
 #endif
 
+void
+aubio_log_function(int level, const char *message, void *data)
+{
+  // remove trailing \n
+  char *pos;
+  if ((pos=strchr(message, '\n')) != NULL) {
+        *pos = '\0';
+  }
+  // warning or error
+  if (level == AUBIO_LOG_ERR) {
+    PyErr_Format(PyExc_RuntimeError, "%s", message);
+  } else {
+    PyErr_WarnEx(PyExc_UserWarning, message, 1);
+  }
+}
+
 static PyObject *
 initaubio (void)
@@ -316 +332 @@
   add_ufuncs(m);
 
+  aubio_log_set_level_function(AUBIO_LOG_ERR, aubio_log_function, NULL);
+  aubio_log_set_level_function(AUBIO_LOG_WRN, aubio_log_function, NULL);
   return m;
 }

python/ext/py-fft.c

@@ -52 +52 @@
   self->o = new_aubio_fft (self->win_s);
   if (self->o == NULL) {
-    PyErr_Format(PyExc_RuntimeError,
-        "error creating fft with win_s=%d "
-        "(should be a power of 2 greater than 1; "
-        "try recompiling aubio with --enable-fftw3)",
-        self->win_s);
+    // PyErr_Format(PyExc_RuntimeError, ...) was set above by new_ which called
+    // AUBIO_ERR when failing
     return -1;
   }

python/ext/py-phasevoc.c

@@ -67 +67 @@
   self->o = new_aubio_pvoc ( self->win_s, self->hop_s);
   if (self->o == NULL) {
-    PyErr_Format(PyExc_RuntimeError,
-        "failed creating pvoc with win_s=%d, hop_s=%d",
-        self->win_s, self->hop_s);
+    // PyErr_Format(PyExc_RuntimeError, ...) was set above by new_ which called
+    // AUBIO_ERR when failing
     return -1;
   }

python/ext/py-source.c

@@ -141 +141 @@
   self->o = new_aubio_source ( self->uri, self->samplerate, self->hop_size );
   if (self->o == NULL) {
-    PyErr_Format (PyExc_RuntimeError, "error creating source with \"%s\"",
-        self->uri);
+    // PyErr_Format(PyExc_RuntimeError, ...) was set above by new_ which called
+    // AUBIO_ERR when failing
     return -1;
   }

python/lib/moresetuptools.py

@@ -66 +66 @@
                          'HAVE_MATH_H', 'HAVE_STRING_H',
                          'HAVE_C99_VARARGS_MACROS',
-                         'HAVE_LIMITS_H', 'HAVE_MEMCPY_HACKS']:
+                         'HAVE_LIMITS_H', 'HAVE_STDARG_H',
+                         'HAVE_MEMCPY_HACKS']:
         ext.define_macros += [(define_macro, 1)]
 

python/tests/test_fvec.py

@@ -99 +99 @@
         alpha = np.random.rand() * 5.
         x_alpha_norm = (np.sum(np.abs(x)**alpha)/len(x))**(1/alpha)
-        assert_almost_equal(alpha_norm(x, alpha), x_alpha_norm, decimal = 5)
+        assert_almost_equal(alpha_norm(x, alpha), x_alpha_norm, decimal = 4)
 
 class aubio_zero_crossing_rate_test(TestCase):

python/tests/test_source.py

@@ -6 +6 @@
 from aubio import source
 from utils import list_all_sounds
+
+import warnings
+warnings.filterwarnings('ignore', category=UserWarning, append=True)
 
 list_of_sounds = list_all_sounds('sounds')
@@ -23 +26 @@
 
     def setUp(self):
-        if not len(list_of_sounds): self.skipTest('add some sound files in \'python/tests/sounds\'')
+        if not len(list_of_sounds):
+            self.skipTest('add some sound files in \'python/tests/sounds\'')
         self.default_test_sound = list_of_sounds[0]
 

python/tests/test_specdesc.py

@@ -226 +226 @@
 
     def test_unknown(self):
-        # FIXME should fail?
-        with self.assertRaises(ValueError):
+        with self.assertRaises(RuntimeError):
             specdesc("unknown", 512)
-            self.skipTest('todo: new_specdesc should fail on wrong method')
 
 if __name__ == '__main__':

src/aubio.h

@@ -110 +110 @@
 
   Several examples of C programs are available in the \p examples/ and \p tests/src
-  directories of the source tree.
+  directories of the source tree. See more examples:
+  @ref spectral/test-fft.c
+  @ref spectral/test-phasevoc.c
+  @ref onset/test-onset.c
+  @ref pitch/test-pitch.c
+  @ref tempo/test-tempo.c
+  @ref test-fvec.c
+  @ref test-cvec.c
 
   \subsection unstable_api Unstable API
@@ -189 +196 @@
 #include "synth/wavetable.h"
 #include "utils/parameter.h"
+#include "utils/log.h"
 
 #if AUBIO_UNSTABLE

src/aubio_priv.h

@@ -63 +63 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h> // for CHAR_BIT, in C99 standard
+#endif
+
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
 #endif
 
@@ -169 +173 @@
 } aubio_status;
 
+/* Logging */
+
+#include "utils/log.h"
+
+/** internal logging function, defined in utils/log.c */
+uint_t aubio_log(sint_t level, const char_t *fmt, ...);
+
 #ifdef HAVE_C99_VARARGS_MACROS
-#define AUBIO_ERR(...)               fprintf(stderr, "AUBIO ERROR: " __VA_ARGS__)
-#define AUBIO_MSG(...)               fprintf(stdout, __VA_ARGS__)
-#define AUBIO_DBG(...)               fprintf(stderr, __VA_ARGS__)
-#define AUBIO_WRN(...)               fprintf(stderr, "AUBIO WARNING: " __VA_ARGS__)
-#else
-#define AUBIO_ERR(format, args...)   fprintf(stderr, "AUBIO ERROR: " format , ##args)
-#define AUBIO_MSG(format, args...)   fprintf(stdout, format , ##args)
-#define AUBIO_DBG(format, args...)   fprintf(stderr, format , ##args)
-#define AUBIO_WRN(format, args...)   fprintf(stderr, "AUBIO WARNING: " format, ##args)
+#define AUBIO_ERR(...)               aubio_log(AUBIO_LOG_ERR, "AUBIO ERROR: " __VA_ARGS__)
+#define AUBIO_MSG(...)               aubio_log(AUBIO_LOG_MSG, __VA_ARGS__)
+#define AUBIO_DBG(...)               aubio_log(AUBIO_LOG_DBG, __VA_ARGS__)
+#define AUBIO_WRN(...)               aubio_log(AUBIO_LOG_WRN, "AUBIO WARNING: " __VA_ARGS__)
+#else
+#define AUBIO_ERR(format, args...)   aubio_log(stderr, "AUBIO ERROR: " format , ##args)
+#define AUBIO_MSG(format, args...)   aubio_log(stdout, format , ##args)
+#define AUBIO_DBG(format, args...)   aubio_log(stderr, format , ##args)
+#define AUBIO_WRN(format, args...)   aubio_log(stderr, "AUBIO WARNING: " format, ##args)
 #endif
 

src/io/source_sndfile.c

@@ -60 +60 @@
   uint_t input_hop_size;
 #ifdef HAVE_SAMPLERATE
-  aubio_resampler_t *resampler;
+  aubio_resampler_t **resamplers;
   fvec_t *input_data;
+  fmat_t *input_mat;
 #endif /* HAVE_SAMPLERATE */
 
@@ -127 +128 @@
 
 #ifdef HAVE_SAMPLERATE
-  s->resampler = NULL;
   s->input_data = NULL;
+  s->input_mat = NULL;
+  s->resamplers = NULL;
   if (s->ratio != 1) {
+    uint_t i;
+    s->resamplers = AUBIO_ARRAY(aubio_resampler_t*, s->input_channels);
     s->input_data = new_fvec(s->input_hop_size);
-    s->resampler = new_aubio_resampler(s->ratio, 4);
+    s->input_mat = new_fmat(s->input_channels, s->input_hop_size);
+    for (i = 0; i < (uint_t)s->input_channels; i++) {
+      s->resamplers[i] = new_aubio_resampler(s->ratio, 4);
+    }
     if (s->ratio > 1) {
       // we would need to add a ring buffer for these
@@ -190 +197 @@
 
 #ifdef HAVE_SAMPLERATE
-  if (s->resampler) {
-    aubio_resampler_do(s->resampler, s->input_data, read_data);
+  if (s->resamplers) {
+    aubio_resampler_do(s->resamplers[0], s->input_data, read_data);
   }
 #endif /* HAVE_SAMPLERATE */
@@ -214 +221 @@
 #ifdef HAVE_SAMPLERATE
   if (s->ratio != 1) {
-    AUBIO_ERR("source_sndfile: no multi channel resampling yet\n");
-    return;
-    //ptr_data = s->input_data->data;
+    ptr_data = s->input_mat->data;
   } else
 #endif /* HAVE_SAMPLERATE */
@@ -252 +257 @@
 
 #ifdef HAVE_SAMPLERATE
-  if (s->resampler) {
-    //aubio_resampler_do(s->resampler, s->input_data, read_data);
+  if (s->resamplers) {
+    for (i = 0; i < input_channels; i++) {
+      fvec_t input_chan, read_chan;
+      input_chan.data = s->input_mat->data[i];
+      input_chan.length = s->input_mat->length;
+      read_chan.data = read_data->data[i];
+      read_chan.length = read_data->length;
+      aubio_resampler_do(s->resamplers[i], &input_chan, &read_chan);
+    }
   }
 #endif /* HAVE_SAMPLERATE */
@@ -314 +326 @@
   aubio_source_sndfile_close(s);
 #ifdef HAVE_SAMPLERATE
-  if (s->resampler != NULL) {
-    del_aubio_resampler(s->resampler);
+  if (s->resamplers != NULL) {
+    uint_t i = 0, input_channels = s->input_channels;
+    for (i = 0; i < input_channels; i ++) {
+      if (s->resamplers[i] != NULL) {
+        del_aubio_resampler(s->resamplers[i]);
+      }
+    }
+    AUBIO_FREE(s->resamplers);
   }
   if (s->input_data) {
     del_fvec(s->input_data);
+  }
+  if (s->input_mat) {
+    del_fmat(s->input_mat);
   }
 #endif /* HAVE_SAMPLERATE */

src/notes/notes.c

@@ -82 +82 @@
 
   if (strcmp(method, "default") != 0) {
-    AUBIO_ERR("unknown notes detection method %s, using default.\n",
-       method);
+    AUBIO_ERR("notes: unknown notes detection method \"%s\"\n", method);
     goto fail;
   }

src/spectral/fft.h

@@ -28 +28 @@
     - [vDSP](https://developer.apple.com/library/mac/#documentation/Accelerate/Reference/vDSPRef/Reference/reference.html)
 
-  \example src/spectral/test-fft.c
+  \example spectral/test-fft.c
 
 */

src/spectral/specdesc.c

@@ -274 +274 @@
       onset_type = aubio_onset_default;
   else {
-      AUBIO_ERR("unknown spectral descriptor type %s, using default.\n", onset_mode);
-      onset_type = aubio_onset_default;
+      AUBIO_ERR("unknown spectral descriptor type %s\n", onset_mode);
+      AUBIO_FREE(o);
+      return NULL;
   }
   switch(onset_type) {
     /* for both energy and hfc, only fftgrain->norm is required */
-    case aubio_onset_energy: 
+    case aubio_onset_energy:
       break;
     case aubio_onset_hfc:
@@ -367 +368 @@
 void del_aubio_specdesc (aubio_specdesc_t *o){
   switch(o->onset_type) {
-    case aubio_onset_energy: 
+    case aubio_onset_energy:
       break;
     case aubio_onset_hfc:

tests/src/spectral/test-fft.c

@@ -5 +5 @@
   int return_code = 0;
   uint_t i, n_iters = 100; // number of iterations
-  uint_t win_s = 500; // window size
+  uint_t win_s = 512; // window size
   fvec_t * in = new_fvec (win_s); // input buffer
   cvec_t * fftgrain = new_cvec (win_s); // fft norm and phase

wscript

@@ -114 +114 @@
     ctx.check(header_name='string.h')
     ctx.check(header_name='limits.h')
+    ctx.check(header_name='stdarg.h')
     ctx.check(header_name='getopt.h', mandatory = False)
     ctx.check(header_name='unistd.h', mandatory = False)