Changeset fc9c60e


Ignore:
Timestamp:
Jul 2, 2020, 3:34:26 PM (4 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/cnn, feature/crepe, fix/ffmpeg5, master
Children:
e836160
Parents:
1ec59e4 (diff), 9c730b5 (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 feature/autosink

Files:
16 edited

Legend:

Unmodified
Added
Removed

  • .appveyor.yml

    r1ec59e4 rfc9c60e  
    1616      PYTHON_ARCH: 64
    1717
    18     - PYTHONDIR: C:\Python35
    19       PYTHON_VERSION: 3.5.x
    20       PYTHON_ARCH: 32
    21 
    22     - PYTHONDIR: C:\Python35-x64
    23       PYTHON_VERSION: 3.5.x
    24       PYTHON_ARCH: 64
    25 
    2618    - PYTHONDIR: C:\Python36
    2719      PYTHON_VERSION: 3.6.x
    … …  
    3830    - PYTHONDIR: C:\Python37-x64
    3931      PYTHON_VERSION: 3.7.x
     32      PYTHON_ARCH: 64
     33
     34    - PYTHONDIR: C:\Python38
     35      PYTHON_VERSION: 3.8.x
     36      PYTHON_ARCH: 32
     37
     38    - PYTHONDIR: C:\Python38-x64
     39      PYTHON_VERSION: 3.8.x
    4040      PYTHON_ARCH: 64
    4141

  • .circleci/config.yml

    r1ec59e4 rfc9c60e  
    6767          path: dist/
    6868
    69   build-37:
     69  build-latest:
    7070    docker:
    71       - image: circleci/python:3.7
     71      - image: circleci/python:latest
    7272    steps:
    7373      - checkout
    … …  
    8181          path: dist/
    8282
    83   build-37-nodeps:
     83  build-latest-nodeps:
    8484    docker:
    85       - image: circleci/python:3.7
     85      - image: circleci/python:latest
    8686    steps:
    8787      - checkout
    … …  
    101101      - build-27
    102102      - build-36
    103       - build-37
    104       - build-37-nodeps
     103      - build-latest
     104      - build-latest-nodeps

  • .gitignore

    r1ec59e4 rfc9c60e  
    1313
    1414# ignore compiled test programs
    15 RE:tests/src/test-[a-z-_]*$
    16 RE:tests/cpp/test-[a-z-_]*$
     15RE:tests/src/test-[a-z_-]*$
     16RE:tests/cpp/test-[a-z_-]*$
    1717
    1818# only sgml manpages count

  • .travis.yml

    r1ec59e4 rfc9c60e  
    33matrix:
    44  include:
    5     - python: 3.6
     5    - name: "Linux (Python 3.8)"
     6      python: 3.8
    67      os: linux
    7       compiler: gcc
    8     - python: 3.5
     8      distro: bionic
     9    - name: "Linux (Python 3.6)"
     10      python: 3.6
    911      os: linux
    10       compiler: gcc
    1112      env: WAFOPTS="--build-type=debug"
    12     - python: 2.7
     13    - name: "Linux (Python 2.7, nodeps)"
     14      python: 2.7
    1315      os: linux
    14       compiler: gcc
    15     - python: "pypy3.5"
     16      distro: trusty
     17      env: WAFOPTS="--nodeps"
     18    - name: "Linux (Python pypy3.5)"
     19      language: python
     20      python: "pypy3.5"
    1621      os: linux
    17       compiler: gcc
    18       env: CFLAGS="-Os" WAFOPTS="--disable-avcodec"
    19     - python: 3.6
     22    - name: "Linux (double, fftw3)"
     23      python: 3.8
    2024      os: linux
    21       compiler: gcc
    22       env: CFLAGS="-Os" WAFOPTS="--disable-samplerate"
    23     - python: 3.5
     25      env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"
     26    - name: "Linux (default, dpkg-buildflags)"
    2427      os: linux
    25       compiler: gcc
    26       env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"
    27     - python: 2.7
    28       os: linux
    29       compiler: gcc
    3028      env: CFLAGS="`dpkg-buildflags --get CFLAGS`" LDFLAGS="`dpkg-buildflags --get LDFLAGS`"
    31     - language: C
     29
     30    - name: "macOS (xcode11)"
     31      language: shell
    3232      os: osx
    33       compiler: clang
    34     - language: C
     33      osx_image: xcode11
     34    - name: "macOS (xcode12, lib only)"
     35      language: shell
    3536      os: osx
    36       compiler: clang
    37       env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate"
    38     - language: C
     37      osx_image: xcode12
     38      script:
     39        - make test_lib_only_clean
     40    - name: "macOS (xcode10, noopt, nodeps)"
     41      language: shell
    3942      os: osx
    40       compiler: clang
    41       env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac"
    42     - language: C
     43      osx_image: xcode10
     44      env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate --nodeps"
     45    - name: "iOS"
     46      language: shell
    4347      os: osx
    44       compiler: clang
    45       env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
    46     - language: C
     48      env: WAFOPTS="--with-target-platform=ios --nodeps" AUBIO_NOTESTS=1
     49    - name: "iOSSimulator"
     50      language: shell
    4751      os: osx
    48       compiler: clang
    49       env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
     52      env: WAFOPTS="--with-target-platform=iosimulator --nodeps" AUBIO_NOTESTS=1
    5053
    51 # use trusty
    52 dist: trusty
    53 sudo: required
     54#    - name: "Windows (Python 3.8.0, lib only)"
     55#      language: shell
     56#      os: windows
     57#      before_install:
     58#        - choco install python --version 3.8.0
     59#        - choco install make
     60#        - python -m pip install --upgrade pip
     61#      env: PATH=/c/Python38:/c/Python38/Scripts:$PATH AUBIO_NOTESTS=1
    5462
    5563addons:
    … …  
    8088    update: true
    8189
    82 before_install:
    83    - |
    84      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
    85        export PATH="$HOME/Library/Python/2.7/bin/:$PATH"
    86      fi;
    87 
    8890install:
    89   - |
    90     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
    91       alias pip=pip2
    92     fi;
    93   - travis_retry pip install --upgrade pip
    94   - travis_retry make getwaf expandwaf deps_python
     91  - make getwaf deps_python
    9592  - which pip
    9693  - pip --version

  • Makefile

    r1ec59e4 rfc9c60e  
    184184        -$(SOX) -r 32000 -b 16 -n "$(TESTSOUNDS)/32000Hz_127f_sine440.wav"    synth 127s sine 440        vol 0.9
    185185        -$(SOX) -r  8000 -b 16 -n "$(TESTSOUNDS)/8000Hz_30s_silence.wav"      trim 0 30
    186         -$(SOX) -r 48000 -b 32 -n "$(TESTSOUNDS)/48000Hz_60s_sweep.wav"       synth 60   sine 100-20000  vol 0.9
     186        -$(SOX) -r 48000 -b 16 -n "$(TESTSOUNDS)/48000Hz_60s_sweep.wav"       synth 60   sine 100-20000  vol 0.9
    187187        -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_44100f_sine441.wav"  synth 44100s   sine 441   vol 0.9
    188188        -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_100f_sine441.wav"    synth 100s sine 441       vol 0.9

  • azure-pipelines.yml

    r1ec59e4 rfc9c60e  
    44- job: linux
    55  pool:
    6     vmImage: 'ubuntu-16.04'
     6    vmImage: 'ubuntu-latest'
     7  steps:
     8  - script: |
     9      sudo apt install libavformat-dev
     10    displayName: 'deps'
     11  - script: |
     12      make
     13    displayName: 'make'
     14    env:
     15      CFLAGS: -Werror
     16
     17- job: linux_nodeps
     18  pool:
     19    vmImage: 'ubuntu-latest'
    720  steps:
    821  - script: |
    … …  
    2538- job: macos
    2639  pool:
    27     vmImage: 'macos-10.13'
     40    vmImage: 'macos-latest'
    2841  steps:
    2942  - script: |

  • doc/develop.rst

    r1ec59e4 rfc9c60e  
    9393.. literalinclude:: ../tests/src/io/test-source.c
    9494   :language: C
    95    :lines: 22-24, 30-32, 34
     95   :lines: 24-26, 30, 32-34
    9696
    9797.. note::
    … …  
    103103.. literalinclude:: ../tests/src/io/test-source.c
    104104   :language: C
    105    :lines: 40-44
     105   :lines: 41-45
    106106
    107107At the end of the processing loop, memory is deallocated:
    … …  
    109109.. literalinclude:: ../tests/src/io/test-source.c
    110110   :language: C
    111    :lines: 55-56
     111   :lines: 55-58
    112112
    113113See the complete example: :download:`test-source.c
    … …  
    127127.. literalinclude:: ../tests/src/spectral/test-phasevoc.c
    128128   :language: C
    129    :lines: 20-37
     129   :lines: 27-44
    130130
    131131Time to clean up the previously allocated memory:
    … …  
    133133.. literalinclude:: ../tests/src/spectral/test-phasevoc.c
    134134   :language: C
    135    :lines: 39-44
     135   :lines: 47-50
    136136
    137137See the complete example: :download:`test-phasevoc.c

  • doc/requirements.rst

    r1ec59e4 rfc9c60e  
    3131    If ``pkg-config`` is not found in ``PATH``, the configure step will
    3232    succeed, but none of the external libraries will be used.
     33
     34To build aubio with no external libraries, use the ``--nodeps`` build option.
    3335
    3436Media libraries

  • examples/parse_args.h

    r1ec59e4 rfc9c60e  
    2626
    2727extern int verbose;
     28extern int quiet;
    2829// input / output
    2930extern int usejack;
    … …  
    128129#endif /* defined(PROG_HAS_ONSET) && !defined(PROG_HAS_PITCH) */
    129130#endif /* defined(PROG_HAS_JACK) && defined(HAVE_JACK) */
     131      "       -q      --quiet            be quiet\n"
    130132      "       -v      --verbose          be verbose\n"
    131133      "       -h      --help             display this message\n"
    … …  
    142144{
    143145#ifdef HAVE_GETOPT_H
    144   const char *options = "hv"
     146  const char *options = "hvq"
    145147    "i:r:B:H:"
    146148#ifdef PROG_HAS_JACK
    … …  
    174176    {"help",                  0, NULL, 'h'},
    175177    {"verbose",               0, NULL, 'v'},
     178    {"quiet",                 0, NULL, 'q'},
    176179    {"input",                 1, NULL, 'i'},
    177180    {"samplerate",            1, NULL, 'r'},
    … …  
    227230        verbose = 1;
    228231        break;
     232      case 'q':                /* quiet */
     233        quiet = 1;
     234        break;
    229235      case 'j':
    230236        usejack = 1;

  • examples/utils.c

    r1ec59e4 rfc9c60e  
    3333
    3434int verbose = 0;
     35int quiet = 0;
    3536int usejack = 0;
    3637// input / output
    … …  
    170171      process_func (input_buffer, output_buffer);
    171172      // print to console if verbose or no output given
    172       if (verbose || sink_uri == NULL) {
     173      if ((verbose || sink_uri == NULL) && !quiet) {
    173174        print();
    174175      }

  • python/demos/demo_pitch.py

    r1ec59e4 rfc9c60e  
    9898ax3.plot(times, [tolerance]*len(confidences))
    9999ax3.axis( xmin = times[0], xmax = times[-1])
    100 ax3.set_ylabel('condidence')
     100ax3.set_ylabel('confidence')
    101101set_xlabels_sample2time(ax3, times[-1], samplerate)
    102102plt.show()

  • python/ext/ufuncs.c

    r1ec59e4 rfc9c60e  
    44typedef smpl_t (*aubio_unary_func_t)(smpl_t input);
    55
    6 static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,
    7                             npy_intp* steps, void* data)
     6static void aubio_PyUFunc_d_d(char **args, const npy_intp *dimensions,
     7                            const npy_intp* steps, void* data)
    88{
    99    npy_intp i;
    … …  
    2323}
    2424
    25 static void aubio_PyUFunc_f_f_As_d_d(char **args, npy_intp *dimensions,
    26                             npy_intp* steps, void* data)
     25static void aubio_PyUFunc_f_f_As_d_d(char **args, const npy_intp *dimensions,
     26                            const npy_intp* steps, void* data)
    2727{
    2828    npy_intp i;

  • scripts/get_waf.sh

    r1ec59e4 rfc9c60e  
    44#set -x
    55
    6 WAFVERSION=2.0.17
     6WAFVERSION=2.0.20
    77WAFTARBALL=waf-$WAFVERSION.tar.bz2
    88WAFURL=https://waf.io/$WAFTARBALL
    … …  
    4949popd
    5050
    51 cp -prv $WAFBUILDDIR/waf-$WAFVERSION/waf $PWD
     51cp -prv $WAFBUILDDIR/waf-$WAFVERSION/waf "$PWD"
    5252chmod +x waf
    5353

  • src/aubio_priv.h

    r1ec59e4 rfc9c60e  
    237237#define AUBIO_INF(...)               aubio_log(AUBIO_LOG_INF, "AUBIO INFO: " __VA_ARGS__)
    238238#define AUBIO_MSG(...)               aubio_log(AUBIO_LOG_MSG, __VA_ARGS__)
    239 #define AUBIO_DBG(...)               aubio_log(AUBIO_LOG_DBG, __VA_ARGS__)
     239#define _AUBIO_DBG(...)              aubio_log(AUBIO_LOG_DBG, __VA_ARGS__)
    240240#define AUBIO_WRN(...)               aubio_log(AUBIO_LOG_WRN, "AUBIO WARNING: " __VA_ARGS__)
    241241#else
    … …  
    243243#define AUBIO_INF(format, args...)   aubio_log(AUBIO_LOG_INF, "AUBIO INFO: " format , ##args)
    244244#define AUBIO_MSG(format, args...)   aubio_log(AUBIO_LOG_MSG, format , ##args)
    245 #define AUBIO_DBG(format, args...)   aubio_log(AUBIO_LOG_DBG, format , ##args)
     245#define _AUBIO_DBG(format, args...)  aubio_log(AUBIO_LOG_DBG, format , ##args)
    246246#define AUBIO_WRN(format, args...)   aubio_log(AUBIO_LOG_WRN, "AUBIO WARNING: " format, ##args)
     247#endif
     248
     249#ifdef DEBUG
     250#define AUBIO_DBG _AUBIO_DBG
     251#else
     252// disable debug output
     253#ifdef HAVE_C99_VARARGS_MACROS
     254#define AUBIO_DBG(...)               {}
     255#else
     256#define AUBIO_DBG(format, args...)   {}
     257#endif
    247258#endif
    248259

  • src/musicutils.h

    r1ec59e4 rfc9c60e  
    241241  \param threshold threshold in dB SPL
    242242
    243   \return 0 if level is under the given threshold, 1 otherwise
     243  \return 1 if level is under the given threshold, 0 otherwise
    244244
    245245*/

  • wscript

    r1ec59e4 rfc9c60e  
    4646                    ' or without (--build-type=debug)' \
    4747                    ' compiler opimizations [default: release]')
     48    ctx.add_option('--debug', action = 'store_const',
     49            dest = 'build_type', const = 'debug',
     50            help = 'build in debug mode (see --build-type)')
     51    ctx.add_option('--nodeps', action = 'store_const',
     52            dest = 'nodeps', const = 'debug',
     53            help = 'build with no external dependencies')
    4854    add_option_enable_disable(ctx, 'fftw3f', default = False,
    4955            help_str = 'compile with fftw3f instead of ooura (recommended)',
    … …  
    130136        target_platform = ctx.options.target_platform
    131137
     138    if ctx.options.nodeps:
     139        external_deps = [
     140                'sndfile',
     141                'samplerate',
     142                'jack',
     143                'avcodec',
     144                'blas',
     145                'fftw3',
     146                'fftw3f',
     147        ]
     148        for d in external_deps:
     149            if not hasattr(ctx.options, 'enable_' + d):
     150                raise ctx.errors.ConfigurationError ('--enable-%s missing from options' % d)
     151            if getattr(ctx.options, 'enable_' + d) == True:
     152                msg = 'Option --nodeps can not be used along with --enable-%s' % d
     153                raise ctx.errors.ConfigurationError (msg)
     154            elif getattr(ctx.options, 'enable_' + d) is None:
     155                msg = 'Option --nodeps used but automatic detection with --enable-%s' % d
     156                ctx.msg('Warning', msg)
     157            setattr(ctx.options, 'enable_' + d, False)
     158
    132159    from waflib import Options
    133160
Note: See TracChangeset for help on using the changeset viewer.