Changeset 65e1ec6

Timestamp:

Dec 20, 2018, 11:31:23 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

5fc6e81

Parents:

f56f795 (diff), cf4bc9f (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 'feature/sink_flac' into feature/autosink

Files:

• .travis.yml (modified) (1 diff)
• python/ext/py-source.c (modified) (1 diff)
• src/io/sink_flac.c (modified) (1 diff)
• src/io/sink_vorbis.c (modified) (1 diff)
• src/io/source_avcodec.c (modified) (1 diff)
• src/io/source_sndfile.c (modified) (6 diffs)

.travis.yml

@@ -12 +12 @@
       os: linux
       compiler: gcc
+    - python: "pypy"
+      os: linux
+      compiler: gcc
+      env: CFLAGS="-Os" WAFOPTS="--disable-avcodec"
     - python: 3.5
       os: linux
       compiler: gcc
-      env: CFLAGS="-Os" WAFOPTS="--disable-samplerate --disable-sndfile"
+      env: CFLAGS="-Os" WAFOPTS="--disable-samplerate"
     - python: 3.4
       os: linux
       compiler: gcc
-      env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3 --disable-avcodec"
+      env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"
     - python: 2.7
       os: linux

python/ext/py-source.c

@@ -574 +574 @@
     } else if (PyLong_AsLong(size) > 0) {
       // short read, return a shorter array
-      PyArrayObject *shortread = (PyArrayObject*)PyTuple_GetItem(done, 0);
+      PyArrayObject *shortread = (PyArrayObject*)
+        PyArray_FROM_OTF(PyTuple_GetItem(done, 0), NPY_NOTYPE,
+            NPY_ARRAY_ENSURECOPY);
       PyArray_Dims newdims;
       PyObject *reshaped;

src/io/sink_flac.c

@@ -29 +29 @@
 #ifdef HAVE_FLAC
 
+#include "fmat.h"
 #include "io/ioutils.h"
-#include "fmat.h"
 
 #include <FLAC/metadata.h>

src/io/sink_vorbis.c

@@ -29 +29 @@
 #ifdef HAVE_VORBISENC
 
+#include "fmat.h"
 #include "io/ioutils.h"
-#include "fmat.h"
 
 #include <vorbis/vorbisenc.h>

src/io/source_avcodec.c

@@ -526 +526 @@
   uint_t end = 0;
   uint_t total_wrote = 0;
-  uint_t length = aubio_source_validate_input_length("source_wavread", s->path,
+  uint_t length = aubio_source_validate_input_length("source_avcodec", s->path,
       s->hop_size, read_data->length);
-  uint_t channels = aubio_source_validate_input_channels("source_wavread",
+  uint_t channels = aubio_source_validate_input_channels("source_avcodec",
       s->path, s->input_channels, read_data->height);
   while (total_wrote < length) {

src/io/source_sndfile.c

@@ -174 +174 @@
       s->hop_size, read_data->length);
   sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
-      s->input_channels * length);
-
-  length = MIN(read_samples / s->input_channels, length);
+      s->scratch_size);
+
+  uint_t read_length = read_samples / s->input_channels;
 
   /* where to store de-interleaved data */
@@ -186 +186 @@
 #endif /* HAVE_SAMPLERATE */
   {
+    read_length = MIN(length, read_length);
     ptr_data = read_data->data;
   }
 
   /* de-interleaving and down-mixing data  */
-  for (j = 0; j < length; j++) {
+  for (j = 0; j < read_length; j++) {
     ptr_data[j] = 0;
     for (i = 0; i < input_channels; i++) {
@@ -204 +205 @@
 #endif /* HAVE_SAMPLERATE */
 
-  *read = (int)FLOOR(s->ratio * length + .5);
+  *read = MIN(length, (uint_t)FLOOR(s->ratio * read_length + .5));
 
   aubio_source_pad_output (read_data, *read);
@@ -218 +219 @@
       s->path, s->input_channels, read_data->height);
   sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
-      length * s->input_channels);
-
-  length = MIN(read_samples / s->input_channels, length);
+      s->scratch_size);
+
+  uint_t read_length = read_samples / s->input_channels;
 
   /* where to store de-interleaved data */
@@ -230 +231 @@
 #endif /* HAVE_SAMPLERATE */
   {
+    read_length = MIN(read_length, length);
     ptr_data = read_data->data;
   }
 
-  for (j = 0; j < length; j++) {
+  for (j = 0; j < read_length; j++) {
     for (i = 0; i < channels; i++) {
       ptr_data[i][j] = s->scratch_data[j * input_channels + i];
@@ -252 +254 @@
 #endif /* HAVE_SAMPLERATE */
 
-  *read = (int)FLOOR(s->ratio * length + .5);
+  *read = MIN(length, (uint_t)FLOOR(s->ratio * read_length + .5));
 
   aubio_source_pad_multi_output(read_data, input_channels, *read);