Changeset 6a03729


Ignore:
Timestamp:
Mar 18, 2013, 5:19:23 PM (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:
7125680
Parents:
ab7b1b7
Message:

src/io: use hop_size, not block_size

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • python/lib/gen_pyobject.py

    rab7b1b7 r6a03729  
    100100    'tempo':        ['1'],
    101101    'peakpicker':   ['1'],
    102     'source':       ['self->block_size', '1'],
    103102}
    104103
     
    116115    # and here too
    117116    'hop_size': 'Py_default_vector_length / 2',
    118     # add block_size, synonim of hop_size
    119     'block_size': 'Py_default_vector_length / 2',
    120117    # these should be alright
    121118    'samplerate': 'Py_aubio_default_samplerate',
  • src/io/source.h

    rab7b1b7 r6a03729  
    4343  \param uri the file path or uri to read from
    4444  \param samplerate sampling rate to view the fie at
    45   \param block_size the size of the blocks to read from
     45  \param hop_size the size of the blocks to read from
    4646
    4747  Creates a new source object. If `0` is passed as `samplerate`, the sample
     
    5252
    5353*/
    54 aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t block_size);
     54aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size);
    5555
    5656/**
    5757
    58   read monophonic vector of length block_size from source object
     58  read monophonic vector of length hop_size from source object
    5959
    6060  \param s source object, created with ::new_aubio_source
     
    6363
    6464  Upon returns, `read` contains the number of frames actually read from the
    65   source. `block_size` if enough frames could be read, less otherwise.
     65  source. `hop_size` if enough frames could be read, less otherwise.
    6666
    6767*/
  • src/io/source_apple_audio.h

    rab7b1b7 r6a03729  
    4949  \param uri the file path or uri to read from
    5050  \param samplerate sampling rate to view the fie at
    51   \param block_size the size of the blocks to read from
     51  \param hop_size the size of the blocks to read from
    5252
    5353  Creates a new source object. If `0` is passed as `samplerate`, the sample
     
    5858
    5959*/
    60 aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * uri, uint_t samplerate, uint_t block_size);
     60aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * uri, uint_t samplerate, uint_t hop_size);
    6161
    6262/**
    6363
    64   read monophonic vector of length block_size from source object
     64  read monophonic vector of length hop_size from source object
    6565
    6666  \param s source object, created with ::new_aubio_source_apple_audio
     
    6969
    7070  Upon returns, `read` contains the number of frames actually read from the
    71   source. `block_size` if enough frames could be read, less otherwise.
     71  source. `hop_size` if enough frames could be read, less otherwise.
    7272
    7373*/
    7474void aubio_source_apple_audio_do(aubio_source_apple_audio_t * s, fvec_t * read_to, uint_t * read);
     75void aubio_source_apple_audio_do_multi(aubio_source_apple_audio_t * s, fmat_t * read_to, uint_t * read);
    7576
    7677/**
  • src/io/source_sndfile.h

    rab7b1b7 r6a03729  
    4848  \param uri the file path or uri to read from
    4949  \param samplerate sampling rate to view the fie at
    50   \param block_size the size of the blocks to read from
     50  \param hop_size the size of the blocks to read from
    5151
    5252  Creates a new source object. If `0` is passed as `samplerate`, the sample
     
    5757
    5858*/
    59 aubio_source_sndfile_t * new_aubio_source_sndfile(char_t * uri, uint_t samplerate, uint_t block_size);
     59aubio_source_sndfile_t * new_aubio_source_sndfile(char_t * uri, uint_t samplerate, uint_t hop_size);
    6060
    6161/**
    6262
    63   read monophonic vector of length block_size from source object
     63  read monophonic vector of length hop_size from source object
    6464
    6565  \param s source object, created with ::new_aubio_source_sndfile
     
    6868
    6969  Upon returns, `read` contains the number of frames actually read from the
    70   source. `block_size` if enough frames could be read, less otherwise.
     70  source. `hop_size` if enough frames could be read, less otherwise.
    7171
    7272*/
Note: See TracChangeset for help on using the changeset viewer.