Changeset d1decd5


Ignore:
Timestamp:
Jul 2, 2020, 3:39:25 PM (4 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/cnn, feature/crepe, fix/ffmpeg5, master
Children:
e625579
Parents:
7c9285f (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/timestretch

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r7c9285f rd1decd5  
    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

    r7c9285f rd1decd5  
    1111      os: linux
    1212      env: WAFOPTS="--build-type=debug"
    13     - name: "Linux (Python 2.7)"
     13    - name: "Linux (Python 2.7, nodeps)"
    1414      python: 2.7
    1515      os: linux
    1616      distro: trusty
     17      env: WAFOPTS="--nodeps"
    1718    - name: "Linux (Python pypy3.5)"
    1819      language: python
    1920      python: "pypy3.5"
    2021      os: linux
    21     - name: "Linux (fftw3, no other deps)"
     22    - name: "Linux (double, fftw3)"
    2223      python: 3.8
    2324      os: linux
    24       env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3 --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
     25      env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"
    2526    - name: "Linux (default, dpkg-buildflags)"
    2627      os: linux
     
    4142      os: osx
    4243      osx_image: xcode10
    43       env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
     44      env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate --nodeps"
    4445    - name: "iOS"
    4546      language: shell
    4647      os: osx
    47       env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
     48      env: WAFOPTS="--with-target-platform=ios --nodeps" AUBIO_NOTESTS=1
    4849    - name: "iOSSimulator"
    4950      language: shell
    5051      os: osx
    51       env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
     52      env: WAFOPTS="--with-target-platform=iosimulator --nodeps" AUBIO_NOTESTS=1
    5253
    5354#    - name: "Windows (Python 3.8.0, lib only)"
  • Makefile

    r7c9285f rd1decd5  
    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
  • doc/requirements.rst

    r7c9285f rd1decd5  
    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
  • python/demos/demo_pitch.py

    r7c9285f rd1decd5  
    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()
  • src/musicutils.h

    r7c9285f rd1decd5  
    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

    r7c9285f rd1decd5  
    4949            dest = 'build_type', const = 'debug',
    5050            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')
    5154    add_option_enable_disable(ctx, 'fftw3f', default = False,
    5255            help_str = 'compile with fftw3f instead of ooura (recommended)',
     
    130133        target_platform = ctx.options.target_platform
    131134
     135    if ctx.options.nodeps:
     136        external_deps = [
     137                'sndfile',
     138                'samplerate',
     139                'jack',
     140                'avcodec',
     141                'blas',
     142                'fftw3',
     143                'fftw3f',
     144        ]
     145        for d in external_deps:
     146            if not hasattr(ctx.options, 'enable_' + d):
     147                raise ctx.errors.ConfigurationError ('--enable-%s missing from options' % d)
     148            if getattr(ctx.options, 'enable_' + d) == True:
     149                msg = 'Option --nodeps can not be used along with --enable-%s' % d
     150                raise ctx.errors.ConfigurationError (msg)
     151            elif getattr(ctx.options, 'enable_' + d) is None:
     152                msg = 'Option --nodeps used but automatic detection with --enable-%s' % d
     153                ctx.msg('Warning', msg)
     154            setattr(ctx.options, 'enable_' + d, False)
     155
    132156    from waflib import Options
    133157
Note: See TracChangeset for help on using the changeset viewer.