Mercurial > hg > sonic-annotator
changeset 369:ddcbbd85c1ea
Towards a 1.6 release - primarily for Opus support
| author | Chris Cannam |
|---|---|
| date | Thu, 04 Jun 2020 17:39:27 +0100 |
| parents | d9d509d29fa1 |
| children | 3e0133aa2354 |
| files | noconfig.pri repoint-lock.json runner/main.cpp tests/audio/3clicks.opus tests/include.sh tests/test-audioformat/expected/percussiononsets-opus.csv tests/test-audioformat/test-audioformat.sh tests/test-multiple-audio/expected/all-files.csv version.h |
| diffstat | 9 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/noconfig.pri Tue May 19 08:52:01 2020 +0100 +++ b/noconfig.pri Thu Jun 04 17:39:27 2020 +0100 @@ -78,7 +78,7 @@ -L$$PWD/sv-dependency-builds/win64-msvc/lib } - DEFINES += NOMINMAX _USE_MATH_DEFINES HAVE_MEDIAFOUNDATION + DEFINES += NOMINMAX _USE_MATH_DEFINES HAVE_MEDIAFOUNDATION AVOID_WINRT_DEPENDENCY QMAKE_CXXFLAGS_RELEASE += -fp:fast -gl QMAKE_LFLAGS_RELEASE += -ltcg
--- a/repoint-lock.json Tue May 19 08:52:01 2020 +0100 +++ b/repoint-lock.json Thu Jun 04 17:39:27 2020 +0100 @@ -1,10 +1,10 @@ { "libraries": { "vamp-plugin-sdk": { - "pin": "8ffb8985ae8f" + "pin": "0e32c328b02a" }, "svcore": { - "pin": "db489a1ece9b" + "pin": "14bf9bf5ac28" }, "checker": { "pin": "e839338d3869"
--- a/runner/main.cpp Tue May 19 08:52:01 2020 +0100 +++ b/runner/main.cpp Thu Jun 04 17:39:27 2020 +0100 @@ -192,7 +192,7 @@ cerr << "Sonic Annotator v" << RUNNER_VERSION << endl; cerr << "A utility for batch feature extraction from audio files." << endl; cerr << "Mark Levy, Chris Sutton, and Chris Cannam, Queen Mary, University of London." << endl; - cerr << "Copyright 2007-2017 Queen Mary, University of London." << endl; + cerr << "Copyright 2007-2020 Queen Mary, University of London." << endl; cerr << endl; cerr << "This program is free software. You may redistribute copies of it under the" << endl; cerr << "terms of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>." << endl;
--- a/tests/include.sh Tue May 19 08:52:01 2020 +0100 +++ b/tests/include.sh Thu Jun 04 17:39:27 2020 +0100 @@ -13,12 +13,12 @@ ;; esac -version=1.5pre -nextversion=1.6 - testdir=$mypath/.. r=$testdir/../sonic-annotator +version=$(perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' $testdir/../version.h | sed 's/-//g') +nextversion=$version.1 + audiopath=$testdir/audio percplug=vamp:vamp-example-plugins:percussiononsets
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-audioformat/expected/percussiononsets-opus.csv Thu Jun 04 17:39:27 2020 +0100 @@ -0,0 +1,3 @@ +"./../audio/3clicks.opus",0.778666666 +,1.653333333 +,2.410666666
--- a/tests/test-audioformat/test-audioformat.sh Tue May 19 08:52:01 2020 +0100 +++ b/tests/test-audioformat/test-audioformat.sh Thu Jun 04 17:39:27 2020 +0100 @@ -8,7 +8,7 @@ trap "rm -f $tmpfile1 $tmpfile2" 0 -for extension in wav ogg mp3 ; do +for extension in wav ogg mp3 opus ; do transform=$mypath/transforms/percussiononsets.n3 expected=$mypath/expected/percussiononsets-$extension.csv
--- a/tests/test-multiple-audio/expected/all-files.csv Tue May 19 08:52:01 2020 +0100 +++ b/tests/test-multiple-audio/expected/all-files.csv Thu Jun 04 17:39:27 2020 +0100 @@ -7,6 +7,9 @@ "./../audio/3clicks.ogg",0.000000000,4.992290250,mean,0.000303,"(mean value, continuous-time average)" ,0.000000000,4.992290250,median,2.42e-5,"(median value, continuous-time average)" ,0.000000000,4.992290250,mean,0.00108,"(mean value, continuous-time average)" +"./../audio/3clicks.opus",0.000000000,4.992290250,mean,0.00232,"(mean value, continuous-time average)" +,0.000000000,4.992290250,median,0.00208,"(median value, continuous-time average)" +,0.000000000,4.992290250,mean,0.00304,"(mean value, continuous-time average)" "./../audio/3clicks8.wav",0.000000000,4.992290250,mean,0.00369,"(mean value, continuous-time average)" ,0.000000000,4.992290250,median,0.00354,"(median value, continuous-time average)" ,0.000000000,4.992290250,mean,0.0042,"(mean value, continuous-time average)"