Changeset 21234ee for python

Timestamp:

Dec 18, 2013, 8:07:27 AM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

6465d7f

Parents:

1573b16 (diff), c3c6305 (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' of aubio.org:/git/aubio/aubio into develop

Location:

python

Files:

• demos/demo_bpm_extract.py (modified) (1 prop)
• demos/demo_mel-energy.py (modified) (1 diff)
• demos/demo_pitch.py (modified) (3 diffs)
• demos/demo_specdesc.py (modified) (1 diff)
• ext/aubio-types.h (modified) (1 diff)
• ext/aubiomodule.c (modified) (2 diffs)
• ext/aubioproxy.c (modified) (2 diffs)
• ext/py-fft.c (modified) (1 diff)
• ext/py-source.c (added)
• lib/gen_pyobject.py (modified) (1 diff)
• lib/generator.py (modified) (1 diff)
• setup.py (modified) (1 diff)

python/demos/demo_mel-energy.py

@@ -62 +62 @@
         ax.yaxis.set_visible(False)
         ax.axis(xmax = all_desc_times[-1], xmin = all_desc_times[0])
-        ax.annotate('band %d' % i, xy=(-10, 10),  xycoords='axes points',
+        ax.annotate('band %d' % i, xy=(-10, 0),  xycoords='axes points',
                 horizontalalignment='right', verticalalignment='bottom',
+                size = 'xx-small',
                 )
     set_xlabels_sample2time( ax, all_desc_times[-1], samplerate) 

python/demos/demo_pitch.py

@@ -57 +57 @@
 
 fig = plt.figure()
+
 ax1 = fig.add_subplot(311)
 ax1 = get_waveform_plot(filename, samplerate = samplerate, block_size = hop_s, ax = ax1)
-ax1.set_xticklabels([])
+plt.setp(ax1.get_xticklabels(), visible = False)
+ax1.set_xlabel('')
 
 def array_from_text_file(filename, dtype = 'float'):
@@ -88 +90 @@
 #ax2.axis( ymin = 0.9 * cleaned_pitches.min(), ymax = 1.1 * cleaned_pitches.max() )
 #ax2.axis( ymin = 55, ymax = 70 )
-ax2.set_xticklabels([])
+plt.setp(ax2.get_xticklabels(), visible = False)
+ax2.set_ylabel('f0 (Hz)')
 
 # plot confidence
@@ -97 +100 @@
 ax3.plot(times, [tolerance]*len(confidences))
 ax3.axis( xmin = times[0], xmax = times[-1])
+ax3.set_ylabel('condidence')
+set_xlabels_sample2time(ax3, times[-1], samplerate)
 plt.show()
-set_xlabels_sample2time(ax3, times[-1], samplerate)
-#plt.savefig(os.path.basename(filename) + '.png', dpi=200)
+#plt.savefig(os.path.basename(filename) + '.svg')

python/demos/demo_specdesc.py

@@ -72 +72 @@
         ax.yaxis.set_visible(False)
         ax.axis(xmax = all_desc_times[-1], xmin = all_desc_times[0])
-        ax.annotate(method, xy=(-10, 10),  xycoords='axes points',
+        ax.annotate(method, xy=(-10, 0),  xycoords='axes points',
                 horizontalalignment='right', verticalalignment='bottom',
                 )

python/ext/aubio-types.h

@@ -69 +69 @@
 extern PyTypeObject Py_pvocType;
 
+extern PyTypeObject Py_sourceType;
+

python/ext/aubiomodule.c

@@ -199 +199 @@
       || (PyType_Ready (&Py_fftType) < 0)
       || (PyType_Ready (&Py_pvocType) < 0)
+      || (PyType_Ready (&Py_sourceType) < 0)
       // generated objects
       || (generated_types_ready() < 0 )
@@ -227 +228 @@
   Py_INCREF (&Py_pvocType);
   PyModule_AddObject (m, "pvoc", (PyObject *) & Py_pvocType);
+  Py_INCREF (&Py_sourceType);
+  PyModule_AddObject (m, "source", (PyObject *) & Py_sourceType);
 
   // add generated objects

python/ext/aubioproxy.c

@@ -36 +36 @@
     // no need to really allocate fvec, just its struct member
     vec = (fvec_t *)malloc(sizeof(fvec_t));
-    vec->length = PyArray_SIZE ((PyArrayObject *)array);
+    long length = PyArray_SIZE ((PyArrayObject *)array);
+    if (length > 0) {
+      vec->length = (uint_t)length;
+    } else {
+      PyErr_SetString (PyExc_ValueError, "input array size should be greater than 0");
+      goto fail;
+    }
     vec->data = (smpl_t *) PyArray_GETPTR1 ((PyArrayObject *)array, 0);
 
@@ -131 +137 @@
     // no need to really allocate fvec, just its struct member
     mat = (fmat_t *)malloc(sizeof(fmat_t));
-    mat->length = PyArray_DIM ((PyArrayObject *)array, 1);
-    mat->height = PyArray_DIM ((PyArrayObject *)array, 0);
+    long length = PyArray_DIM ((PyArrayObject *)array, 1);
+    if (length > 0) {
+      mat->length = (uint_t)length;
+    } else {
+      PyErr_SetString (PyExc_ValueError, "input array dimension 1 should be greater than 0");
+      goto fail;
+    }
+    long height = PyArray_DIM ((PyArrayObject *)array, 0);
+    if (height > 0) {
+      mat->height = (uint_t)height;
+    } else {
+      PyErr_SetString (PyExc_ValueError, "input array dimension 0 should be greater than 0");
+      goto fail;
+    }
     mat->data = (smpl_t **)malloc(sizeof(smpl_t*) * mat->height);
     for (i=0; i< mat->height; i++) {

python/ext/py-fft.c

@@ -25 +25 @@
 
   self->win_s = Py_default_vector_length;
-
-  if (self == NULL) {
-    return NULL;
-  }
 
   if (win_s > 0) {

python/lib/gen_pyobject.py

@@ -240 +240 @@
 
   self->%(pname)s = %(defval)s;
-  if (%(pname)s > 0) {
+  if ((sint_t)%(pname)s > 0) {
     self->%(pname)s = %(pname)s;
-  } else if (%(pname)s < 0) {
+  } else if ((sint_t)%(pname)s < 0) {
     PyErr_SetString (PyExc_ValueError,
         "can not use negative value for %(pname)s");

python/lib/generator.py

@@ -57 +57 @@
       'sink_apple_audio',
       'sink_sndfile',
+      'source',
       'source_apple_audio',
       'source_sndfile',

python/setup.py

@@ -54 +54 @@
     "ext/py-fft.c",
     "ext/py-phasevoc.c",
+    "ext/py-source.c",
     # generated files
     ] + generated_object_files,