Mercurial > hg > sonic-annotator
changeset 290:6122159556bd
Update subrepos to SV 3.0beta1 level
| author | Chris Cannam |
|---|---|
| date | Fri, 13 Jan 2017 10:53:47 +0000 |
| parents | d9f6b5fcde6a |
| children | 4f852e5af5f1 |
| files | .hgsub .hgsubstate base.pri bq-files.pri runner/MultiplexedReader.cpp runner/MultiplexedReader.h sonic-annotator.pro test-svcore-base.pro test-svcore-data-fileio.pro |
| diffstat | 9 files changed, 30 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Fri Jan 13 10:24:21 2017 +0000 +++ b/.hgsub Fri Jan 13 10:53:47 2017 +0000 @@ -1,6 +1,7 @@ vamp-plugin-sdk = https://code.soundsoftware.ac.uk/hg/vamp-plugin-sdk bqvec = https://bitbucket.org/breakfastquay/bqvec bqfft = https://bitbucket.org/breakfastquay/bqfft +bqresample = https://bitbucket.org/breakfastquay/bqresample dataquay = https://bitbucket.org/breakfastquay/dataquay svcore = https://code.soundsoftware.ac.uk/hg/svcore sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds
--- a/.hgsubstate Fri Jan 13 10:24:21 2017 +0000 +++ b/.hgsubstate Fri Jan 13 10:53:47 2017 +0000 @@ -1,7 +1,8 @@ -44865d17ef69a891af778e7b9a4c82e790775c45 bqfft -68f8e88d6d76fc4ca074166cb80979ccbfc2b6c9 bqvec -896aefe629c85b05ae0880ec93a396b9e3a5a304 dataquay -3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp -5f67a29f0fc7f1b908f7cde4866173a7af337862 sv-dependency-builds -a421e752d22c71a9cd55db40a62f053f61d9ce57 svcore -0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk +fec5b1dfb6cd59c632f4aa412e3458f49e36367d bqfft +482d0362594bce1e5347295a188c5a81cf2ab0fd bqresample +ede817a08bd1e9835348a6477530bd3253fb379c bqvec +3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay +5d784c857cc6e253d74cfeb2f361f0953877c00c piper-cpp +95867ba8caa86f69fdd57366dbfe2f977dd9cb5d sv-dependency-builds +3382d914e1109e33c2fead4dc8eba898a1fb1807 svcore +ea8e56f0796afebe78e9e678f4b674c1d7fb279e vamp-plugin-sdk
--- a/base.pri Fri Jan 13 10:24:21 2017 +0000 +++ b/base.pri Fri Jan 13 10:53:47 2017 +0000 @@ -4,6 +4,7 @@ bqvec \ bqvec/bqvec \ bqfft \ + bqresample \ piper-cpp \ dataquay \ dataquay/dataquay \
--- a/bq-files.pri Fri Jan 13 10:24:21 2017 +0000 +++ b/bq-files.pri Fri Jan 13 10:53:47 2017 +0000 @@ -9,11 +9,14 @@ bqvec/bqvec/VectorOps.h \ bqvec/pommier/neon_mathfun.h \ bqvec/pommier/sse_mathfun.h \ - bqfft/bqfft/FFT.h + bqfft/bqfft/FFT.h \ + bqresample/bqresample/Resampler.h \ + bqresample/speex/speex_resampler.h BQ_SOURCES += \ bqvec/src/Allocators.cpp \ bqvec/src/Barrier.cpp \ bqvec/src/VectorOpsComplex.cpp \ - bqfft/src/FFT.cpp + bqfft/src/FFT.cpp \ + bqresample/src/Resampler.cpp
--- a/runner/MultiplexedReader.cpp Fri Jan 13 10:24:21 2017 +0000 +++ b/runner/MultiplexedReader.cpp Fri Jan 13 10:53:47 2017 +0000 @@ -54,13 +54,13 @@ } } -std::vector<float> +floatvec_t MultiplexedReader::getInterleavedFrames(sv_frame_t start, sv_frame_t frameCount) const { int out_chans = m_readers.size(); // Allocate and zero - std::vector<float> block(frameCount * out_chans, 0.f); + floatvec_t block(frameCount * out_chans, 0.f); for (int out_chan = 0; out_chan < out_chans; ++out_chan) {
--- a/runner/MultiplexedReader.h Fri Jan 13 10:24:21 2017 +0000 +++ b/runner/MultiplexedReader.h Fri Jan 13 10:53:47 2017 +0000 @@ -33,7 +33,7 @@ virtual QString getError() const override { return m_error; } virtual bool isQuicklySeekable() const override { return m_quicklySeekable; } - virtual std::vector<float> getInterleavedFrames + virtual floatvec_t getInterleavedFrames (sv_frame_t start, sv_frame_t count) const override; virtual int getDecodeCompletion() const override;
--- a/sonic-annotator.pro Fri Jan 13 10:24:21 2017 +0000 +++ b/sonic-annotator.pro Fri Jan 13 10:53:47 2017 +0000 @@ -1,13 +1,12 @@ TEMPLATE = subdirs -!win* { - # We should build and run the tests on any platform, - # but doing it automatically doesn't work so well from - # within an IDE on Windows, so remove that from here - SUBDIRS += \ - sub_test_svcore_base \ +# We build the tests on every platform, though at the time of +# writing they are only automatically run on non-Windows platforms +# (because of the difficulty of getting them running nicely in the +# IDE without causing great confusion if a test fails). +SUBDIRS += \ + sub_test_svcore_base \ sub_test_svcore_data_fileio -} SUBDIRS += sub_runner
--- a/test-svcore-base.pro Fri Jan 13 10:24:21 2017 +0000 +++ b/test-svcore-base.pro Fri Jan 13 10:53:47 2017 +0000 @@ -28,4 +28,6 @@ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) } -QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT} +!win32* { + QMAKE_POST_LINK = ./$${TARGET} +}
--- a/test-svcore-data-fileio.pro Fri Jan 13 10:24:21 2017 +0000 +++ b/test-svcore-data-fileio.pro Fri Jan 13 10:53:47 2017 +0000 @@ -28,4 +28,6 @@ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) } -QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT} +!win32* { + QMAKE_POST_LINK = ./$${TARGET} +}