Changeset fc9c60e
- Timestamp:
- Jul 2, 2020, 3:34:26 PM (4 years ago)
- 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. - Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
.appveyor.yml
r1ec59e4 rfc9c60e 16 16 PYTHON_ARCH: 64 17 17 18 - PYTHONDIR: C:\Python3519 PYTHON_VERSION: 3.5.x20 PYTHON_ARCH: 3221 22 - PYTHONDIR: C:\Python35-x6423 PYTHON_VERSION: 3.5.x24 PYTHON_ARCH: 6425 26 18 - PYTHONDIR: C:\Python36 27 19 PYTHON_VERSION: 3.6.x … … 38 30 - PYTHONDIR: C:\Python37-x64 39 31 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 40 40 PYTHON_ARCH: 64 41 41 -
.circleci/config.yml
r1ec59e4 rfc9c60e 67 67 path: dist/ 68 68 69 build- 37:69 build-latest: 70 70 docker: 71 - image: circleci/python: 3.771 - image: circleci/python:latest 72 72 steps: 73 73 - checkout … … 81 81 path: dist/ 82 82 83 build- 37-nodeps:83 build-latest-nodeps: 84 84 docker: 85 - image: circleci/python: 3.785 - image: circleci/python:latest 86 86 steps: 87 87 - checkout … … 101 101 - build-27 102 102 - build-36 103 - build- 37104 - build- 37-nodeps103 - build-latest 104 - build-latest-nodeps -
.gitignore
r1ec59e4 rfc9c60e 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
r1ec59e4 rfc9c60e 3 3 matrix: 4 4 include: 5 - python: 3.6 5 - name: "Linux (Python 3.8)" 6 python: 3.8 6 7 os: linux 7 compiler: gcc 8 - python: 3.5 8 distro: bionic 9 - name: "Linux (Python 3.6)" 10 python: 3.6 9 11 os: linux 10 compiler: gcc11 12 env: WAFOPTS="--build-type=debug" 12 - python: 2.7 13 - name: "Linux (Python 2.7, nodeps)" 14 python: 2.7 13 15 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" 16 21 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 20 24 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)" 24 27 os: linux 25 compiler: gcc26 env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"27 - python: 2.728 os: linux29 compiler: gcc30 28 env: CFLAGS="`dpkg-buildflags --get CFLAGS`" LDFLAGS="`dpkg-buildflags --get LDFLAGS`" 31 - language: C 29 30 - name: "macOS (xcode11)" 31 language: shell 32 32 os: osx 33 compiler: clang 34 - language: C 33 osx_image: xcode11 34 - name: "macOS (xcode12, lib only)" 35 language: shell 35 36 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 39 42 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 43 47 os: osx 44 compiler: clang45 env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac" AUBIO_NOTESTS=146 - language: C48 env: WAFOPTS="--with-target-platform=ios --nodeps" AUBIO_NOTESTS=1 49 - name: "iOSSimulator" 50 language: shell 47 51 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 50 53 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 54 62 55 63 addons: … … 80 88 update: true 81 89 82 before_install:83 - |84 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then85 export PATH="$HOME/Library/Python/2.7/bin/:$PATH"86 fi;87 88 90 install: 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 95 92 - which pip 96 93 - pip --version -
Makefile
r1ec59e4 rfc9c60e 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 -
azure-pipelines.yml
r1ec59e4 rfc9c60e 4 4 - job: linux 5 5 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' 7 20 steps: 8 21 - script: | … … 25 38 - job: macos 26 39 pool: 27 vmImage: 'macos- 10.13'40 vmImage: 'macos-latest' 28 41 steps: 29 42 - script: | -
doc/develop.rst
r1ec59e4 rfc9c60e 93 93 .. literalinclude:: ../tests/src/io/test-source.c 94 94 :language: C 95 :lines: 2 2-24, 30-32,3495 :lines: 24-26, 30, 32-34 96 96 97 97 .. note:: … … 103 103 .. literalinclude:: ../tests/src/io/test-source.c 104 104 :language: C 105 :lines: 4 0-44105 :lines: 41-45 106 106 107 107 At the end of the processing loop, memory is deallocated: … … 109 109 .. literalinclude:: ../tests/src/io/test-source.c 110 110 :language: C 111 :lines: 55-5 6111 :lines: 55-58 112 112 113 113 See the complete example: :download:`test-source.c … … 127 127 .. literalinclude:: ../tests/src/spectral/test-phasevoc.c 128 128 :language: C 129 :lines: 2 0-37129 :lines: 27-44 130 130 131 131 Time to clean up the previously allocated memory: … … 133 133 .. literalinclude:: ../tests/src/spectral/test-phasevoc.c 134 134 :language: C 135 :lines: 39-44135 :lines: 47-50 136 136 137 137 See the complete example: :download:`test-phasevoc.c -
doc/requirements.rst
r1ec59e4 rfc9c60e 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 -
examples/parse_args.h
r1ec59e4 rfc9c60e 26 26 27 27 extern int verbose; 28 extern int quiet; 28 29 // input / output 29 30 extern int usejack; … … 128 129 #endif /* defined(PROG_HAS_ONSET) && !defined(PROG_HAS_PITCH) */ 129 130 #endif /* defined(PROG_HAS_JACK) && defined(HAVE_JACK) */ 131 " -q --quiet be quiet\n" 130 132 " -v --verbose be verbose\n" 131 133 " -h --help display this message\n" … … 142 144 { 143 145 #ifdef HAVE_GETOPT_H 144 const char *options = "hv "146 const char *options = "hvq" 145 147 "i:r:B:H:" 146 148 #ifdef PROG_HAS_JACK … … 174 176 {"help", 0, NULL, 'h'}, 175 177 {"verbose", 0, NULL, 'v'}, 178 {"quiet", 0, NULL, 'q'}, 176 179 {"input", 1, NULL, 'i'}, 177 180 {"samplerate", 1, NULL, 'r'}, … … 227 230 verbose = 1; 228 231 break; 232 case 'q': /* quiet */ 233 quiet = 1; 234 break; 229 235 case 'j': 230 236 usejack = 1; -
examples/utils.c
r1ec59e4 rfc9c60e 33 33 34 34 int verbose = 0; 35 int quiet = 0; 35 36 int usejack = 0; 36 37 // input / output … … 170 171 process_func (input_buffer, output_buffer); 171 172 // print to console if verbose or no output given 172 if ( verbose || sink_uri == NULL) {173 if ((verbose || sink_uri == NULL) && !quiet) { 173 174 print(); 174 175 } -
python/demos/demo_pitch.py
r1ec59e4 rfc9c60e 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() -
python/ext/ufuncs.c
r1ec59e4 rfc9c60e 4 4 typedef smpl_t (*aubio_unary_func_t)(smpl_t input); 5 5 6 static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,7 npy_intp* steps, void* data)6 static void aubio_PyUFunc_d_d(char **args, const npy_intp *dimensions, 7 const npy_intp* steps, void* data) 8 8 { 9 9 npy_intp i; … … 23 23 } 24 24 25 static void aubio_PyUFunc_f_f_As_d_d(char **args, npy_intp *dimensions,26 npy_intp* steps, void* data)25 static void aubio_PyUFunc_f_f_As_d_d(char **args, const npy_intp *dimensions, 26 const npy_intp* steps, void* data) 27 27 { 28 28 npy_intp i; -
scripts/get_waf.sh
r1ec59e4 rfc9c60e 4 4 #set -x 5 5 6 WAFVERSION=2.0. 176 WAFVERSION=2.0.20 7 7 WAFTARBALL=waf-$WAFVERSION.tar.bz2 8 8 WAFURL=https://waf.io/$WAFTARBALL … … 49 49 popd 50 50 51 cp -prv $WAFBUILDDIR/waf-$WAFVERSION/waf $PWD51 cp -prv $WAFBUILDDIR/waf-$WAFVERSION/waf "$PWD" 52 52 chmod +x waf 53 53 -
src/aubio_priv.h
r1ec59e4 rfc9c60e 237 237 #define AUBIO_INF(...) aubio_log(AUBIO_LOG_INF, "AUBIO INFO: " __VA_ARGS__) 238 238 #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__) 240 240 #define AUBIO_WRN(...) aubio_log(AUBIO_LOG_WRN, "AUBIO WARNING: " __VA_ARGS__) 241 241 #else … … 243 243 #define AUBIO_INF(format, args...) aubio_log(AUBIO_LOG_INF, "AUBIO INFO: " format , ##args) 244 244 #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) 246 246 #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 247 258 #endif 248 259 -
src/musicutils.h
r1ec59e4 rfc9c60e 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
r1ec59e4 rfc9c60e 46 46 ' or without (--build-type=debug)' \ 47 47 ' 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') 48 54 add_option_enable_disable(ctx, 'fftw3f', default = False, 49 55 help_str = 'compile with fftw3f instead of ooura (recommended)', … … 130 136 target_platform = ctx.options.target_platform 131 137 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 132 159 from waflib import Options 133 160
Note: See TracChangeset
for help on using the changeset viewer.