Changeset 189c6ae


Ignore:
Timestamp:
Aug 7, 2018, 2:05:49 PM (2 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master
Children:
1f112cc
Parents:
4624a568 (diff), fb4ab89 (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 'master' into dct

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • .appveyor.yml

    r4624a568 r189c6ae  
    4343  - "%PYTHONDIR%\\python.exe -c \"import struct; print(struct.calcsize('P') * 8)\""
    4444
     45  - "%PYTHONDIR%\\python.exe -m pip install --disable-pip-version-check --user --upgrade pip"
     46  - "%PYTHONDIR%\\python.exe -m pip install --upgrade setuptools"
     47
    4548  # We need wheel installed to build wheels
    4649  - "%PYTHONDIR%\\python.exe -m pip install wheel"
    4750
    4851  - "SET PATH=%PATH_EXTRAS%;%PYTHONDIR%;%PYTHONDIR%\\Scripts;%PATH%"
    49 
    50   - "pip install --disable-pip-version-check --user --upgrade pip"
    51   - "pip install --upgrade setuptools"
    5252
    5353before_build:
     
    5656build_script:
    5757  # build python module without using libaubio
    58   - "pip install -r requirements.txt"
     58  - "%PYTHONDIR%\\python.exe -m pip install -r requirements.txt"
    5959  - "python setup.py build"
    60   - "pip install ."
     60  - "%PYTHONDIR%\\python.exe -m pip install ."
    6161  - "python python\\demos\\demo_create_test_sounds.py"
    6262  - "nose2 --verbose"
  • .travis.yml

    r4624a568 r189c6ae  
    1212      os: linux
    1313      compiler: gcc
    14     - language: C
    15       os: osx
    16       osx_image: xcode8
    17       compiler: clang
    1814    - python: 3.5
    1915      os: linux
     
    3026    - language: C
    3127      os: osx
    32       osx_image: xcode8
     28      compiler: clang
     29    - language: C
     30      os: osx
    3331      compiler: clang
    3432      env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate"
    3533    - language: C
    3634      os: osx
    37       osx_image: xcode8
    3835      compiler: clang
    3936      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile"
    4037    - language: C
    4138      os: osx
    42       osx_image: xcode8
    4339      compiler: clang
    4440      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
    4541    - language: C
    4642      os: osx
    47       osx_image: xcode8
    48       compiler: clang
    49       env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
    50     - language: C
    51       os: osx
    52       osx_image: xcode8.2
    53       compiler: clang
    54       env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile"
    55     - language: C
    56       os: osx
    57       osx_image: xcode8.2
    58       compiler: clang
    59       env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
    60     - language: C
    61       os: osx
    62       osx_image: xcode8.2
    6343      compiler: clang
    6444      env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
     
    9676
    9777install:
     78  - |
     79    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     80      alias pip=pip2
     81    fi;
    9882  - travis_retry pip install --upgrade pip
    9983  - travis_retry make getwaf expandwaf deps_python
  • README.md

    r4624a568 r189c6ae  
    55[![Appveyor build status](https://img.shields.io/appveyor/ci/piem/aubio/master.svg)](https://ci.appveyor.com/project/piem/aubio "Appveyor build status")
    66[![Landscape code health](https://landscape.io/github/aubio/aubio/master/landscape.svg?style=flat)](https://landscape.io/github/aubio/aubio/master "Landscape code health")
    7 [![Commits since last release](https://img.shields.io/github/commits-since/aubio/aubio/0.4.6.svg)](https://github.com/aubio/aubio "Commits since last release")
     7[![Commits since last release](https://img.shields.io/github/commits-since/aubio/aubio/latest.svg)](https://github.com/aubio/aubio "Commits since last release")
    88
    99[![Documentation](https://readthedocs.org/projects/aubio/badge/?version=latest)](http://aubio.readthedocs.io/en/latest/?badge=latest "Latest documentation")
  • doc/develop.rst

    r4624a568 r189c6ae  
    11.. _develop:
    22
    3 Developping with aubio
    4 ======================
     3Developing with aubio
     4=====================
    55
    66Here is a brief overview of the C library.
  • doc/statuslinks.rst

    r4624a568 r189c6ae  
    1818   :alt: Documentation status
    1919
    20 .. image:: https://img.shields.io/github/commits-since/aubio/aubio/0.4.6.svg?maxAge=2592000
     20.. image:: https://img.shields.io/github/commits-since/aubio/aubio/latest.svg
    2121   :target: https://github.com/aubio/aubio
    2222   :alt: Commits since last release
  • examples/parse_args.h

    r4624a568 r189c6ae  
    116116      "                 do not fail if output file already exists\n"
    117117#endif /* PROG_HAS_OUTPUT */
    118 #ifdef PROG_HAS_JACK
     118#if defined(PROG_HAS_JACK) && defined(HAVE_JACK)
    119119      "       -j      --jack             use Jack\n"
    120120#if defined(PROG_HAS_ONSET) && !defined(PROG_HAS_PITCH)
     
    122122      "       -V      --miditap-velo     MIDI velocity; default=65.\n"
    123123#endif /* defined(PROG_HAS_ONSET) && !defined(PROG_HAS_PITCH) */
    124 #endif /* PROG_HAS_JACK */
     124#endif /* defined(PROG_HAS_JACK) && defined(HAVE_JACK) */
    125125      "       -v      --verbose          be verbose\n"
    126126      "       -h      --help             display this message\n"
     
    314314#else
    315315    errmsg("Error: no arguments given (and no available audio input)\n");
    316     usage ( stderr, 1 );
     316    errmsg("       consider recompiling with jack support (--enable-jack)\n");
     317    exit ( 1 );
    317318#endif /* HAVE_JACK */
    318319#else
  • python/demos/demo_pitch_sinusoid.py

    r4624a568 r189c6ae  
    3838pointer += partition
    3939pointer += partition
    40 freqs[ pointer : pointer + partition ] = 400 + 5 * np.random.random(sin_length/8)
     40freqs[ pointer : pointer + partition ] = 400 + 5 * np.random.random(sin_length//8)
    4141
    4242a = build_sinusoid(sin_length, freqs, samplerate)
  • src/io/source_avcodec.c

    r4624a568 r189c6ae  
    5959#include "source_avcodec.h"
    6060
     61#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0)
    6162#define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
     63#else
     64#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
     65#endif
    6266
    6367struct _aubio_source_avcodec_t {
     
    271275  // default to mono output
    272276  aubio_source_avcodec_reset_resampler(s, 0);
     277
     278  if (s->avr == NULL) goto beach;
    273279
    274280  s->eof = 0;
     
    419425    goto beach;
    420426  }
     427
     428#if LIBAVUTIL_VERSION_MAJOR > 52
     429  if (avFrame->channels != (sint_t)s->input_channels) {
     430    AUBIO_WRN ("source_avcodec: trying to read from %d channel(s),"
     431        "but configured for %d; is '%s' corrupt?\n", avFrame->channels,
     432        s->input_channels, s->path);
     433    goto beach;
     434  }
     435#endif
    421436
    422437#ifdef HAVE_AVRESAMPLE
  • src/io/source_wavread.c

    r4624a568 r189c6ae  
    190190  bytes_read += fread(buf, 1, 2, s->fid);
    191191  bitspersample = read_little_endian(buf, 2);
     192
     193  if ( channels == 0 ) {
     194    AUBIO_ERR("source_wavread: Failed opening %s (number of channels can not be 0)\n", s->path);
     195    goto beach;
     196  }
     197
     198  if ( (sint_t)sr <= 0 ) {
     199    AUBIO_ERR("source_wavread: Failed opening %s (samplerate can not be <= 0)\n", s->path);
     200    goto beach;
     201  }
     202
     203  if ( byterate == 0 ) {
     204    AUBIO_ERR("source_wavread: Failed opening %s (byterate can not be 0)\n", s->path);
     205    goto beach;
     206  }
     207
     208  if ( bitspersample == 0 ) {
     209    AUBIO_ERR("source_wavread: Failed opening %s (bitspersample can not be 0)\n", s->path);
     210    goto beach;
     211  }
    192212#if 0
    193213  if ( bitspersample != 16 ) {
  • src/notes/notes.c

    r4624a568 r189c6ae  
    8484
    8585  o->pitch = new_aubio_pitch (pitch_method, o->pitch_buf_size, o->hop_size, o->samplerate);
     86  if (o->pitch == NULL) goto fail;
    8687  if (o->pitch_tolerance != 0.) aubio_pitch_set_tolerance (o->pitch, o->pitch_tolerance);
    8788  aubio_pitch_set_unit (o->pitch, "midi");
  • src/onset/onset.c

    r4624a568 r189c6ae  
    308308    o->apply_compression = 0;
    309309    aubio_onset_set_awhitening (o, 0);
     310  } else if (strcmp (onset_mode, "wphase") == 0) {
     311    // use defaults for now
    310312  } else if (strcmp (onset_mode, "mkl") == 0) {
    311313    aubio_onset_set_threshold (o, 0.05);
  • src/pitch/pitchyinfft.c

    r4624a568 r189c6ae  
    4545   160.,   200.,   250.,   315.,   400.,   500.,   630.,   800.,  1000.,  1250.,
    4646  1600.,  2000.,  2500.,  3150.,  4000.,  5000.,  6300.,  8000.,  9000., 10000.,
    47  12500., 15000., 20000., 25100
     47 12500., 15000., 20000., 25100., -1.
    4848};
    4949
     
    7373  for (i = 0; i < p->weight->length; i++) {
    7474    freq = (smpl_t) i / (smpl_t) bufsize *(smpl_t) samplerate;
    75     while (freq > freqs[j]) {
     75    while (freq > freqs[j] && freqs[j] > 0) {
     76      //AUBIO_DBG("freq %3.5f > %3.5f \tsamplerate %d (Hz) \t"
     77      //    "(weight length %d, bufsize %d) %d %d\n", freq, freqs[j],
     78      //    samplerate, p->weight->length, bufsize, i, j);
    7679      j += 1;
    7780    }
Note: See TracChangeset for help on using the changeset viewer.