Changeset cf4bc9f


Ignore:
Timestamp:
Dec 20, 2018, 11:31:13 PM (12 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink
Children:
1c565c0, 65e1ec6
Parents:
f7f946a (diff), 171ae68 (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_vorbis' into feature/sink_flac

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • .travis.yml

    rf7f946a rcf4bc9f  
    1212      os: linux
    1313      compiler: gcc
     14    - python: "pypy"
     15      os: linux
     16      compiler: gcc
     17      env: CFLAGS="-Os" WAFOPTS="--disable-avcodec"
    1418    - python: 3.5
    1519      os: linux
    1620      compiler: gcc
    17       env: CFLAGS="-Os" WAFOPTS="--disable-samplerate --disable-sndfile"
     21      env: CFLAGS="-Os" WAFOPTS="--disable-samplerate"
    1822    - python: 3.4
    1923      os: linux
    2024      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"
    2226    - python: 2.7
    2327      os: linux
  • python/ext/py-source.c

    rf7f946a rcf4bc9f  
    574574    } else if (PyLong_AsLong(size) > 0) {
    575575      // 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);
    577579      PyArray_Dims newdims;
    578580      PyObject *reshaped;
  • src/io/source_avcodec.c

    rf7f946a rcf4bc9f  
    526526  uint_t end = 0;
    527527  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,
    529529      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",
    531531      s->path, s->input_channels, read_data->height);
    532532  while (total_wrote < length) {
  • src/io/source_sndfile.c

    rf7f946a rcf4bc9f  
    174174      s->hop_size, read_data->length);
    175175  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;
    179179
    180180  /* where to store de-interleaved data */
     
    186186#endif /* HAVE_SAMPLERATE */
    187187  {
     188    read_length = MIN(length, read_length);
    188189    ptr_data = read_data->data;
    189190  }
    190191
    191192  /* de-interleaving and down-mixing data  */
    192   for (j = 0; j < length; j++) {
     193  for (j = 0; j < read_length; j++) {
    193194    ptr_data[j] = 0;
    194195    for (i = 0; i < input_channels; i++) {
     
    204205#endif /* HAVE_SAMPLERATE */
    205206
    206   *read = (int)FLOOR(s->ratio * length + .5);
     207  *read = MIN(length, (uint_t)FLOOR(s->ratio * read_length + .5));
    207208
    208209  aubio_source_pad_output (read_data, *read);
     
    218219      s->path, s->input_channels, read_data->height);
    219220  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;
    223224
    224225  /* where to store de-interleaved data */
     
    230231#endif /* HAVE_SAMPLERATE */
    231232  {
     233    read_length = MIN(read_length, length);
    232234    ptr_data = read_data->data;
    233235  }
    234236
    235   for (j = 0; j < length; j++) {
     237  for (j = 0; j < read_length; j++) {
    236238    for (i = 0; i < channels; i++) {
    237239      ptr_data[i][j] = s->scratch_data[j * input_channels + i];
     
    252254#endif /* HAVE_SAMPLERATE */
    253255
    254   *read = (int)FLOOR(s->ratio * length + .5);
     256  *read = MIN(length, (uint_t)FLOOR(s->ratio * read_length + .5));
    255257
    256258  aubio_source_pad_multi_output(read_data, input_channels, *read);
Note: See TracChangeset for help on using the changeset viewer.