Changeset 841ceed


Ignore:
Timestamp:
Jun 28, 2019, 3:03:56 PM (6 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/timestretch, master
Children:
673d7e3
Parents:
11c46c8 (diff), e3fde21 (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 fix/setbiquad

Files:
11 edited

Legend:

Unmodified
Added
Removed
  • .travis.yml

    r11c46c8 r841ceed  
    3939      os: osx
    4040      compiler: clang
    41       env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile"
     41      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate"
    4242    - language: C
    4343      os: osx
    4444      compiler: clang
    45       env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
     45      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate" AUBIO_NOTESTS=1
    4646    - language: C
    4747      os: osx
    4848      compiler: clang
    49       env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
     49      env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate" AUBIO_NOTESTS=1
    5050
    5151# use trusty
     
    7474    - libsndfile
    7575    - lcov
    76     #update: true
     76    update: true
    7777
    7878before_install:
  • doc/binaries.rst

    r11c46c8 r841ceed  
    99`windows <https://aubio.org/download#win>`_
    1010
     11For Windows, aubio is also available from `vcpkg
     12<https://vcpkg.readthedocs.io/en/latest/examples/installing-and-using-packages/>`_.
     13
    1114To use aubio in a macOS or iOS application, see :ref:`xcode-frameworks-label`.
    1215
  • python/demos/demo_wav2midi.py

    r11c46c8 r841ceed  
    6464        if new_note[2] > 0:
    6565            track.append(Message('note_off', note=int(new_note[2]),
    66                 velocity=127, time=0)
     66                velocity=127, time=delta)
    6767                )
    6868        track.append(Message('note_on',
  • python/ext/aubio-docstrings.h

    r11c46c8 r841ceed  
    22    "dct(size=1024)\n"\
    33    "\n"\
    4     "Compute Discrete Fourier Transorms of Type-II.\n"\
     4    "Compute Discrete Fourier Transforms of Type-II.\n"\
    55    "\n"\
    66    "Parameters\n"\
  • python/ext/py-fft.c

    r11c46c8 r841ceed  
    44"fft(size=1024)\n"
    55"\n"
    6 "Compute Fast Fourier Transorms.\n"
     6"Compute Fast Fourier Transforms.\n"
    77"\n"
    88"Parameters\n"
  • python/ext/py-sink.c

    r11c46c8 r841ceed  
    8282"\n"
    8383"By default, the sink will be closed before being deleted.\n"
    84 "Explicitely closing a sink can be useful to control the number\n"
     84"Explicitly closing a sink can be useful to control the number\n"
    8585"of files simultaneously opened.\n"
    8686"";
  • python/lib/gen_external.py

    r11c46c8 r841ceed  
    121121    proc = subprocess.Popen(cpp_cmd,
    122122                            stderr=subprocess.PIPE,
    123                             stdout=subprocess.PIPE)
     123                            stdout=subprocess.PIPE,
     124                            universal_newlines=True)
    124125    assert proc, 'Proc was none'
    125126    cpp_output = proc.stdout.read()
     
    127128    if err_output:
    128129        print("Warning: preprocessor produced errors or warnings:\n%s" \
    129                 % err_output.decode('utf8'))
     130                % err_output)
    130131    if not cpp_output:
    131132        raise_msg = "preprocessor output is empty! Running command " \
    132133                + "\"%s\" failed" % " ".join(cpp_cmd)
    133134        if err_output:
    134             raise_msg += " with stderr: \"%s\"" % err_output.decode('utf8')
     135            raise_msg += " with stderr: \"%s\"" % err_output
    135136        else:
    136137            raise_msg += " with no stdout or stderr"
    137138        raise Exception(raise_msg)
    138139    if not isinstance(cpp_output, list):
    139         cpp_output = [l.strip() for l in cpp_output.decode('utf8').split('\n')]
     140        cpp_output = [l.strip() for l in cpp_output.split('\n')]
    140141
    141142    return cpp_output
  • python/tests/test_hztomel.py

    r11c46c8 r841ceed  
    55from numpy.testing import assert_equal, assert_almost_equal
    66from _tools import assert_warns
     7from utils import is32bit
    78import numpy as np
    89import aubio
     
    1011from aubio import hztomel, meltohz
    1112from aubio import hztomel_htk, meltohz_htk
    12 
    1313
    1414class aubio_hztomel_test_case(TestCase):
     
    1818        assert_almost_equal(hztomel(400. / 3.), 2., decimal=5)
    1919        assert_almost_equal(hztomel(1000. / 3), 5.)
    20         assert_equal(hztomel(200.), 3.)
     20        # on 32bit, some of these tests fails unless compiling with -ffloat-store
     21        try:
     22            assert_equal(hztomel(200.), 3.)
     23        except AssertionError:
     24            if not is32bit(): raise
     25            assert_almost_equal(hztomel(200.), 3., decimal=5)
    2126        assert_almost_equal(hztomel(1000.), 15)
    22         assert_almost_equal(hztomel(6400), 42)
    23         assert_almost_equal(hztomel(40960), 69)
     27        assert_almost_equal(hztomel(6400), 42, decimal=5)
     28        assert_almost_equal(hztomel(40960), 69, decimal=5)
    2429
    2530        for m in np.linspace(0, 1000, 100):
     
    2934        assert_equal(meltohz(0.), 0.)
    3035        assert_almost_equal(meltohz(2), 400. / 3., decimal=4)
    31         assert_equal(meltohz(3.), 200.)
     36        try:
     37            assert_equal(meltohz(3.), 200.)
     38        except AssertionError:
     39            if not is32bit(): raise
     40            assert_almost_equal(meltohz(3.), 200., decimal=5)
    3241        assert_almost_equal(meltohz(5), 1000. / 3., decimal=4)
    3342        assert_almost_equal(meltohz(15), 1000., decimal=4)
  • python/tests/test_phasevoc.py

    r11c46c8 r841ceed  
    22
    33from numpy.testing import TestCase, assert_equal, assert_array_less
    4 from _tools import parametrize
     4from _tools import parametrize, skipTest
    55from aubio import fvec, cvec, pvoc, float_type
    66import numpy as np
     
    5252                assert_equal (s.phas[s.phas < 0], -np.pi)
    5353                assert_equal (np.abs(s.phas[np.abs(s.phas) != np.pi]), 0)
    54                 self.skipTest('pvoc(fvec(%d)).phas != +0, ' % win_s \
     54                skipTest('pvoc(fvec(%d)).phas != +0, ' % win_s \
    5555                        + 'This is expected when using fftw3 on powerpc.')
    5656            assert_equal ( r, 0.)
  • python/tests/utils.py

    r11c46c8 r841ceed  
    44import re
    55import glob
     6import struct
    67import numpy as np
    78from tempfile import mkstemp
    89
    910DEFAULT_SOUND = '22050Hz_5s_brownnoise.wav'
     11
     12def is32bit():
     13    return struct.calcsize("P") * 8 == 32
    1014
    1115def array_from_text_file(filename, dtype = 'float'):
  • scripts/get_waf.sh

    r11c46c8 r841ceed  
    44#set -x
    55
    6 WAFVERSION=2.0.14
     6WAFVERSION=2.0.17
    77WAFTARBALL=waf-$WAFVERSION.tar.bz2
    88WAFURL=https://waf.io/$WAFTARBALL
Note: See TracChangeset for help on using the changeset viewer.