Changeset c059581


Ignore:
Timestamp:
Mar 23, 2013, 1:55:50 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:
ef47246
Parents:
c19f9e5 (diff), b8389de (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 /Users/piem/projects/aubio/aubio into device

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/io/source_apple_audio.c

    rc19f9e5 rc059581  
    205205    }
    206206  }
     207  // if read_data has more channels than the file
     208  if (read_to->height > s->channels) {
     209    // copy last channel to all additional channels
     210    for (v = 0; v < loadedPackets; v++) {
     211      for (c = s->channels; c < read_to->height; c++) {
     212        buf[c][v] = SHORT_TO_FLOAT(data[ v * s->channels + (s->channels - 1)]);
     213      }
     214    }
     215  }
    207216  // short read, fill with zeros
    208217  if (loadedPackets < s->block_size) {
    209218    for (v = loadedPackets; v < s->block_size; v++) {
    210       for (c = 0; c < s->channels; c++) {
     219      for (c = 0; c < read_to->height; c++) {
    211220        buf[c][v] = 0.;
    212221      }
  • tests/src/synth/test-sampler.c

    rc19f9e5 rc059581  
    1414
    1515  uint_t samplerate = 0; // default is the samplerate of input_path
    16   uint_t hop_size = 512;
     16  uint_t hop_size = 256;
    1717  uint_t n_frames = 0, read = 0;
    1818
     
    3636      aubio_sampler_play ( sampler );
    3737    }
    38     if (n_frames / hop_size == 20) {
     38    if (n_frames / hop_size == 40) {
     39      aubio_sampler_play ( sampler );
     40    }
     41    if (n_frames / hop_size == 70) {
    3942      aubio_sampler_play ( sampler );
    4043    }
Note: See TracChangeset for help on using the changeset viewer.