Changeset d1decd5
- Timestamp:
- Jul 2, 2020, 3:39:25 PM (4 years ago)
- 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. - Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
.gitignore
r7c9285f rd1decd5 13 13 14 14 # ignore compiled test programs 15 RE:tests/src/test-[a-z -_]*$16 RE:tests/cpp/test-[a-z -_]*$15 RE:tests/src/test-[a-z_-]*$ 16 RE:tests/cpp/test-[a-z_-]*$ 17 17 18 18 # only sgml manpages count -
.travis.yml
r7c9285f rd1decd5 11 11 os: linux 12 12 env: WAFOPTS="--build-type=debug" 13 - name: "Linux (Python 2.7 )"13 - name: "Linux (Python 2.7, nodeps)" 14 14 python: 2.7 15 15 os: linux 16 16 distro: trusty 17 env: WAFOPTS="--nodeps" 17 18 - name: "Linux (Python pypy3.5)" 18 19 language: python 19 20 python: "pypy3.5" 20 21 os: linux 21 - name: "Linux ( fftw3, no other deps)"22 - name: "Linux (double, fftw3)" 22 23 python: 3.8 23 24 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" 25 26 - name: "Linux (default, dpkg-buildflags)" 26 27 os: linux … … 41 42 os: osx 42 43 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" 44 45 - name: "iOS" 45 46 language: shell 46 47 os: osx 47 env: WAFOPTS="--with-target-platform=ios -- disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=148 env: WAFOPTS="--with-target-platform=ios --nodeps" AUBIO_NOTESTS=1 48 49 - name: "iOSSimulator" 49 50 language: shell 50 51 os: osx 51 env: WAFOPTS="--with-target-platform=iosimulator -- disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=152 env: WAFOPTS="--with-target-platform=iosimulator --nodeps" AUBIO_NOTESTS=1 52 53 53 54 # - name: "Windows (Python 3.8.0, lib only)" -
Makefile
r7c9285f rd1decd5 184 184 -$(SOX) -r 32000 -b 16 -n "$(TESTSOUNDS)/32000Hz_127f_sine440.wav" synth 127s sine 440 vol 0.9 185 185 -$(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.9186 -$(SOX) -r 48000 -b 16 -n "$(TESTSOUNDS)/48000Hz_60s_sweep.wav" synth 60 sine 100-20000 vol 0.9 187 187 -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_44100f_sine441.wav" synth 44100s sine 441 vol 0.9 188 188 -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_100f_sine441.wav" synth 100s sine 441 vol 0.9 -
doc/requirements.rst
r7c9285f rd1decd5 31 31 If ``pkg-config`` is not found in ``PATH``, the configure step will 32 32 succeed, but none of the external libraries will be used. 33 34 To build aubio with no external libraries, use the ``--nodeps`` build option. 33 35 34 36 Media libraries -
python/demos/demo_pitch.py
r7c9285f rd1decd5 98 98 ax3.plot(times, [tolerance]*len(confidences)) 99 99 ax3.axis( xmin = times[0], xmax = times[-1]) 100 ax3.set_ylabel('con didence')100 ax3.set_ylabel('confidence') 101 101 set_xlabels_sample2time(ax3, times[-1], samplerate) 102 102 plt.show() -
src/musicutils.h
r7c9285f rd1decd5 241 241 \param threshold threshold in dB SPL 242 242 243 \return 0 if level is under the given threshold, 1otherwise243 \return 1 if level is under the given threshold, 0 otherwise 244 244 245 245 */ -
wscript
r7c9285f rd1decd5 49 49 dest = 'build_type', const = 'debug', 50 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') 51 54 add_option_enable_disable(ctx, 'fftw3f', default = False, 52 55 help_str = 'compile with fftw3f instead of ooura (recommended)', … … 130 133 target_platform = ctx.options.target_platform 131 134 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 132 156 from waflib import Options 133 157
Note: See TracChangeset
for help on using the changeset viewer.