Changeset ad65346 for python

Timestamp:

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

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn, feature/crepe, feature/pitchshift, feature/timestretch, fix/applefworks, 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

Location:

python

Files:

• demos/demo_mfcc.py (modified) (3 diffs)
• ext/aubiomodule.c (modified) (2 diffs)
• ext/py-fft.c (modified) (1 diff)
• ext/py-phasevoc.c (modified) (1 diff)
• ext/py-source.c (modified) (1 diff)
• lib/moresetuptools.py (modified) (1 diff)
• tests/test_fvec.py (modified) (1 diff)
• tests/test_source.py (modified) (2 diffs)
• tests/test_specdesc.py (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__':