Changes in / [b8fa393:171ae68]
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
.travis.yml
rb8fa393 r171ae68 12 12 os: linux 13 13 compiler: gcc 14 - python: "pypy" 15 os: linux 16 compiler: gcc 17 env: CFLAGS="-Os" WAFOPTS="--disable-avcodec" 14 18 - python: 3.5 15 19 os: linux 16 20 compiler: gcc 17 env: CFLAGS="-Os" WAFOPTS="--disable-samplerate --disable-sndfile"21 env: CFLAGS="-Os" WAFOPTS="--disable-samplerate" 18 22 - python: 3.4 19 23 os: linux 20 24 compiler: gcc 21 env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3 --disable-avcodec"25 env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3" 22 26 - python: 2.7 23 27 os: linux -
python/ext/py-source.c
rb8fa393 r171ae68 574 574 } else if (PyLong_AsLong(size) > 0) { 575 575 // short read, return a shorter array 576 PyArrayObject *shortread = (PyArrayObject*)PyTuple_GetItem(done, 0); 576 PyArrayObject *shortread = (PyArrayObject*) 577 PyArray_FROM_OTF(PyTuple_GetItem(done, 0), NPY_NOTYPE, 578 NPY_ARRAY_ENSURECOPY); 577 579 PyArray_Dims newdims; 578 580 PyObject *reshaped; -
src/io/source_avcodec.c
rb8fa393 r171ae68 526 526 uint_t end = 0; 527 527 uint_t total_wrote = 0; 528 uint_t length = aubio_source_validate_input_length("source_ wavread", s->path,528 uint_t length = aubio_source_validate_input_length("source_avcodec", s->path, 529 529 s->hop_size, read_data->length); 530 uint_t channels = aubio_source_validate_input_channels("source_ wavread",530 uint_t channels = aubio_source_validate_input_channels("source_avcodec", 531 531 s->path, s->input_channels, read_data->height); 532 532 while (total_wrote < length) { -
src/io/source_sndfile.c
rb8fa393 r171ae68 174 174 s->hop_size, read_data->length); 175 175 sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data, 176 s-> input_channels * length);177 178 length = MIN(read_samples / s->input_channels, length);176 s->scratch_size); 177 178 uint_t read_length = read_samples / s->input_channels; 179 179 180 180 /* where to store de-interleaved data */ … … 186 186 #endif /* HAVE_SAMPLERATE */ 187 187 { 188 read_length = MIN(length, read_length); 188 189 ptr_data = read_data->data; 189 190 } 190 191 191 192 /* de-interleaving and down-mixing data */ 192 for (j = 0; j < length; j++) {193 for (j = 0; j < read_length; j++) { 193 194 ptr_data[j] = 0; 194 195 for (i = 0; i < input_channels; i++) { … … 204 205 #endif /* HAVE_SAMPLERATE */ 205 206 206 *read = (int)FLOOR(s->ratio * length + .5);207 *read = MIN(length, (uint_t)FLOOR(s->ratio * read_length + .5)); 207 208 208 209 aubio_source_pad_output (read_data, *read); … … 218 219 s->path, s->input_channels, read_data->height); 219 220 sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data, 220 length * s->input_channels);221 222 length = MIN(read_samples / s->input_channels, length);221 s->scratch_size); 222 223 uint_t read_length = read_samples / s->input_channels; 223 224 224 225 /* where to store de-interleaved data */ … … 230 231 #endif /* HAVE_SAMPLERATE */ 231 232 { 233 read_length = MIN(read_length, length); 232 234 ptr_data = read_data->data; 233 235 } 234 236 235 for (j = 0; j < length; j++) {237 for (j = 0; j < read_length; j++) { 236 238 for (i = 0; i < channels; i++) { 237 239 ptr_data[i][j] = s->scratch_data[j * input_channels + i]; … … 252 254 #endif /* HAVE_SAMPLERATE */ 253 255 254 *read = (int)FLOOR(s->ratio * length + .5);256 *read = MIN(length, (uint_t)FLOOR(s->ratio * read_length + .5)); 255 257 256 258 aubio_source_pad_multi_output(read_data, input_channels, *read);
Note: See TracChangeset
for help on using the changeset viewer.