# HG changeset patch # User Chris Cannam # Date 1441385010 -3600 # Node ID 170b90ac1105aa1eaa8efd5917d3ea605bf9ef45 # Parent 194ddc4bd6b00ac3e966b59a9d59f8cb8f4ebc68 Update some more submissions for 2015 diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_beat_tracking/beatroot-vamp/README.txt --- a/audio_beat_tracking/beatroot-vamp/README.txt Wed Aug 12 19:34:12 2015 +0100 +++ b/audio_beat_tracking/beatroot-vamp/README.txt Fri Sep 04 17:43:30 2015 +0100 @@ -1,9 +1,10 @@ # -# MIREX 2014 submission +# MIREX 2015 submission # # Audio Beat Tracking # BeatRoot Vamp plugin by Simon Dixon and Chris Cannam -# Prepared by Chris Cannam, chris.cannam@eecs.qmul.ac.uk +# Prepared by Chris Cannam, c.cannam@qmul.ac.uk + # Architecture diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_beat_tracking/qm-tempotracker/README.txt --- a/audio_beat_tracking/qm-tempotracker/README.txt Wed Aug 12 19:34:12 2015 +0100 +++ b/audio_beat_tracking/qm-tempotracker/README.txt Fri Sep 04 17:43:30 2015 +0100 @@ -1,8 +1,9 @@ # -# MIREX 2014 submission +# MIREX 2015 submission # # Audio Beat Tracking -# Chris Cannam, chris.cannam@eecs.qmul.ac.uk +# Chris Cannam, c.cannam@qmul.ac.uk + # Architecture diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_chord_estimation/chordino/README.txt --- a/audio_chord_estimation/chordino/README.txt Wed Aug 12 19:34:12 2015 +0100 +++ b/audio_chord_estimation/chordino/README.txt Fri Sep 04 17:43:30 2015 +0100 @@ -1,8 +1,8 @@ # -# MIREX 2014 submission +# MIREX 2015 submission # # Audio Chord Estimation -# Chris Cannam, chris.cannam@eecs.qmul.ac.uk +# Contact: Chris Cannam, c.cannam@qmul.ac.uk # Architecture diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_chord_estimation/chordino/chordino.sh --- a/audio_chord_estimation/chordino/chordino.sh Wed Aug 12 19:34:12 2015 +0100 +++ b/audio_chord_estimation/chordino/chordino.sh Fri Sep 04 17:43:30 2015 +0100 @@ -9,7 +9,9 @@ exit 2 fi -mkdir -p "$mydir"/out || exit 1 +set -eu + +touch "$outfile" echo "Processing input WAV file $infile, writing results to $outfile..." 1>&2 diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_chord_estimation/chordino/doChordID.sh --- a/audio_chord_estimation/chordino/doChordID.sh Wed Aug 12 19:34:12 2015 +0100 +++ b/audio_chord_estimation/chordino/doChordID.sh Fri Sep 04 17:43:30 2015 +0100 @@ -14,6 +14,10 @@ exit 2 fi +set -eu + +mkdir -p "$resultsdir" + cat "$filelist" | while read i; do echo "Processing $i" ofile="$resultsdir/`basename \"$i\"`.txt" diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_chord_estimation/chordino/nnls-chroma.n3 --- a/audio_chord_estimation/chordino/nnls-chroma.n3 Wed Aug 12 19:34:12 2015 +0100 +++ b/audio_chord_estimation/chordino/nnls-chroma.n3 Fri Sep 04 17:43:30 2015 +0100 @@ -6,46 +6,58 @@ @prefix dc: . @prefix af: . @prefix foaf: . +@prefix doap: . @prefix cc: . @prefix : <#> . <> a vamp:PluginDescription ; foaf:maker ; - foaf:primaryTopic . + foaf:primaryTopic . + +:maker + foaf:name "Matthias Mauch" ; + foaf:logo ; + foaf:page . :nnls-chroma a vamp:PluginLibrary ; - vamp:identifier "nnls-chroma" ; + vamp:identifier "nnls-chroma" ; + dc:title "Chordino and NNLS Chroma" ; + dc:description "Harmony and chord extraction plugins by Matthias Mauch at C4DM" ; vamp:available_plugin plugbase:chordino ; vamp:available_plugin plugbase:nnls-chroma ; - vamp:available_plugin plugbase:tuning ; -# foaf:page ; + vamp:available_plugin plugbase:tuning ; + foaf:page ; + doap:download-page ; + foaf:page ; + foaf:page ; + foaf:maker :maker ; + vamp:has_source true ; + vamp:has_binary "win32" ; + vamp:has_binary "osx" ; . plugbase:chordino a vamp:Plugin ; dc:title "Chordino" ; vamp:name "Chordino" ; - dc:description """Chordino provides a simple chord transcription based on NNLS Chroma (as in the NNLS Chroma plugin). Chord profiles given by the user in the file chord.dict are used to calculate frame-wise chord similarities. A simple (non-state-of-the-art!) algorithm smoothes these to provide a chord transcription using a standard HMM/Viterbi approach.""" ; - foaf:maker [ foaf:name "Matthias Mauch" ] ; # FIXME could give plugin author's URI here + dc:description """Chordino provides a simple chord transcription based on NNLS Chroma (as in the NNLS Chroma plugin). Chord profiles given by the user in the file chord.dict are used to calculate frame-wise chord similarities. Two simple (non-state-of-the-art!) algorithms are available that smooth these to provide a chord transcription: a simple chord change method, and a standard HMM/Viterbi approach.""" ; + foaf:maker :maker ; dc:rights """GPL""" ; # cc:license ; vamp:identifier "chordino" ; vamp:vamp_API_version vamp:api_version_2 ; - owl:versionInfo "3" ; + owl:versionInfo "1" ; vamp:input_domain vamp:FrequencyDomain ; vamp:parameter plugbase:chordino_param_useNNLS ; + vamp:parameter plugbase:chordino_param_useHMM ; vamp:parameter plugbase:chordino_param_rollon ; vamp:parameter plugbase:chordino_param_tuningmode ; vamp:parameter plugbase:chordino_param_whitening ; - vamp:parameter plugbase:chordino_param_spectralshape ; - vamp:parameter plugbase:chordino_param_boostn ; - vamp:parameter plugbase:chordino_param_usehartesyntax ; + vamp:parameter plugbase:chordino_param_s ; vamp:output plugbase:chordino_output_simplechord ; - vamp:output plugbase:chordino_output_chordnotes ; vamp:output plugbase:chordino_output_harmonicchange ; - vamp:output plugbase:chordino_output_loglikelihood ; . plugbase:chordino_param_useNNLS a vamp:QuantizedParameter ; vamp:identifier "useNNLS" ; @@ -58,10 +70,21 @@ vamp:default_value 1 ; vamp:value_names (); . +plugbase:chordino_param_useHMM a vamp:QuantizedParameter ; + vamp:identifier "useHMM" ; + dc:title "HMM (Viterbi decoding)" ; + dc:format "" ; + vamp:min_value 0 ; + vamp:max_value 1 ; + vamp:unit "" ; + vamp:quantize_step 1 ; + vamp:default_value 1 ; + vamp:value_names (); + . plugbase:chordino_param_rollon a vamp:QuantizedParameter ; vamp:identifier "rollon" ; - dc:title "bass noise threshold" ; - dc:format "%" ; + dc:title "spectral roll-on" ; + dc:format "" ; vamp:min_value 0 ; vamp:max_value 5 ; vamp:unit "%" ; @@ -90,8 +113,8 @@ vamp:default_value 1 ; vamp:value_names (); . -plugbase:chordino_param_spectralshape a vamp:Parameter ; - vamp:identifier "spectralshape" ; +plugbase:chordino_param_s a vamp:Parameter ; + vamp:identifier "s" ; dc:title "spectral shape" ; dc:format "" ; vamp:min_value 0.5 ; @@ -100,57 +123,18 @@ vamp:default_value 0.7 ; vamp:value_names (); . -plugbase:chordino_param_boostn a vamp:Parameter ; - vamp:identifier "boostn" ; - dc:title "boost N" ; - dc:format "" ; - vamp:min_value 0 ; - vamp:max_value 1 ; - vamp:unit "" ; - vamp:default_value 0.1 ; - vamp:value_names (); - . -plugbase:chordino_param_usehartesyntax a vamp:QuantizedParameter ; - vamp:identifier "usehartesyntax" ; - dc:title "use Harte syntax" ; - dc:format "" ; - vamp:min_value 0 ; - vamp:max_value 1 ; - vamp:unit "" ; - vamp:quantize_step 1 ; - vamp:default_value 0 ; - vamp:value_names ( "no" "yes"); - . plugbase:chordino_output_simplechord a vamp:SparseOutput ; vamp:identifier "simplechord" ; dc:title "Chord Estimate" ; - dc:description """Estimated chord times and labels.""" ; + dc:description """Estimated chord times and labels. Two simple (non-state-of-the-art!) algorithms are available that smooth these to provide a chord transcription: a simple chord change method, and a standard HMM/Viterbi approach.""" ; vamp:fixed_bin_count "true" ; - vamp:unit "" ; + vamp:unit "chord" ; + a vamp:QuantizedOutput ; + vamp:quantize_step 1 ; vamp:bin_count 0 ; vamp:sample_type vamp:VariableSampleRate ; vamp:sample_rate 21.5332 ; - vamp:computes_event_type af:ChordSegment ; -# vamp:computes_feature ; -# vamp:computes_signal_type ; - . -plugbase:chordino_output_chordnotes a vamp:SparseOutput ; - vamp:identifier "chordnotes" ; - dc:title "Note Representation of Chord Estimate" ; - dc:description """A simple represenation of the estimated chord with bass note (if applicable) and chord notes.""" ; - vamp:fixed_bin_count "true" ; - vamp:unit "MIDI units" ; - a vamp:QuantizedOutput ; - vamp:quantize_step 1 ; - a vamp:KnownExtentsOutput ; - vamp:min_value 0 ; - vamp:max_value 127 ; - vamp:bin_count 1 ; - vamp:sample_type vamp:VariableSampleRate ; - vamp:sample_rate 21.5332 ; - vamp:computes_event_type af:Note ; -# vamp:computes_feature ; -# vamp:computes_signal_type ; + vamp:computes_event_type af:ChordSegment ; . plugbase:chordino_output_harmonicchange a vamp:DenseOutput ; vamp:identifier "harmonicchange" ; @@ -158,32 +142,22 @@ dc:description """An indication of the likelihood of harmonic change. Depends on the chord dictionary. Calculation is different depending on whether the Viterbi algorithm is used for chord estimation, or the simple chord estimate.""" ; vamp:fixed_bin_count "true" ; vamp:unit "" ; + a vamp:KnownExtentsOutput ; + vamp:min_value 0 ; + vamp:max_value 0.999 ; vamp:bin_count 1 ; -# vamp:computes_event_type ; -# vamp:computes_feature ; -# vamp:computes_signal_type ; - . -plugbase:chordino_output_loglikelihood a vamp:DenseOutput ; - vamp:identifier "loglikelihood" ; - dc:title "Log-Likelihood of Chord Estimate" ; - dc:description """Logarithm of the likelihood value of the simple chord estimate.""" ; - vamp:fixed_bin_count "true" ; - vamp:unit "" ; - vamp:bin_count 1 ; -# vamp:computes_event_type ; -# vamp:computes_feature ; -# vamp:computes_signal_type ; + vamp:computes_signal_type af:TonalChangeDetectionFunction; . plugbase:nnls-chroma a vamp:Plugin ; dc:title "NNLS Chroma" ; vamp:name "NNLS Chroma" ; dc:description """This plugin provides a number of features derived from a DFT-based log-frequency amplitude spectrum: some variants of the log-frequency spectrum, including a semitone spectrum derived from approximate transcription using the NNLS algorithm; and based on this semitone spectrum, different chroma features.""" ; - foaf:maker [ foaf:name "Matthias Mauch" ] ; # FIXME could give plugin author's URI here + foaf:maker :maker ; dc:rights """GPL""" ; # cc:license ; vamp:identifier "nnls-chroma" ; vamp:vamp_API_version vamp:api_version_2 ; - owl:versionInfo "3" ; + owl:versionInfo "1" ; vamp:input_domain vamp:FrequencyDomain ; @@ -214,8 +188,8 @@ . plugbase:nnls-chroma_param_rollon a vamp:QuantizedParameter ; vamp:identifier "rollon" ; - dc:title "bass noise threshold" ; - dc:format "%" ; + dc:title "spectral roll-on" ; + dc:format "" ; vamp:min_value 0 ; vamp:max_value 5 ; vamp:unit "%" ; @@ -272,9 +246,7 @@ vamp:fixed_bin_count "true" ; vamp:unit "" ; vamp:bin_count 256 ; -# vamp:computes_event_type ; -# vamp:computes_feature ; -# vamp:computes_signal_type ; + vamp:computes_signal_type af:Spectrogram ; . plugbase:nnls-chroma_output_tunedlogfreqspec a vamp:DenseOutput ; vamp:identifier "tunedlogfreqspec" ; @@ -283,9 +255,7 @@ vamp:fixed_bin_count "true" ; vamp:unit "" ; vamp:bin_count 256 ; -# vamp:computes_event_type ; -# vamp:computes_feature ; -# vamp:computes_signal_type ; + vamp:computes_signal_type af:Spectrogram ; . plugbase:nnls-chroma_output_semitonespectrum a vamp:DenseOutput ; vamp:identifier "semitonespectrum" ; @@ -294,9 +264,7 @@ vamp:fixed_bin_count "true" ; vamp:unit "" ; vamp:bin_count 84 ; -# vamp:computes_event_type ; -# vamp:computes_feature ; -# vamp:computes_signal_type ; + vamp:computes_signal_type af:Spectrogram ; . plugbase:nnls-chroma_output_chroma a vamp:DenseOutput ; vamp:identifier "chroma" ; @@ -306,8 +274,6 @@ vamp:unit "" ; vamp:bin_count 12 ; vamp:bin_names ( "A" "Bb" "B" "C" "C#" "D" "Eb" "E" "F" "F#" "G" "Ab"); -# vamp:computes_event_type ; -# vamp:computes_feature ; vamp:computes_signal_type af:Chromagram ; . plugbase:nnls-chroma_output_basschroma a vamp:DenseOutput ; @@ -318,8 +284,6 @@ vamp:unit "" ; vamp:bin_count 12 ; vamp:bin_names ( "A" "Bb" "B" "C" "C#" "D" "Eb" "E" "F" "F#" "G" "Ab"); -# vamp:computes_event_type ; -# vamp:computes_feature ; vamp:computes_signal_type af:Chromagram ; . plugbase:nnls-chroma_output_bothchroma a vamp:DenseOutput ; @@ -330,20 +294,18 @@ vamp:unit "" ; vamp:bin_count 24 ; vamp:bin_names ( "A (bass)" "Bb (bass)" "B (bass)" "C (bass)" "C# (bass)" "D (bass)" "Eb (bass)" "E (bass)" "F (bass)" "F# (bass)" "G (bass)" "Ab (bass)" "A" "Bb" "B" "C" "C#" "D" "Eb" "E" "F" "F#" "G" "Ab"); -# vamp:computes_event_type ; -# vamp:computes_feature ; vamp:computes_signal_type af:Chromagram ; . plugbase:tuning a vamp:Plugin ; dc:title "Tuning" ; vamp:name "Tuning" ; dc:description """The tuning plugin can estimate the local and global tuning of piece. The same tuning method is used for the NNLS Chroma and Chordino plugins.""" ; - foaf:maker [ foaf:name "Matthias Mauch" ] ; # FIXME could give plugin author's URI here + foaf:maker :maker ; dc:rights """GPL""" ; # cc:license ; vamp:identifier "tuning" ; vamp:vamp_API_version vamp:api_version_2 ; - owl:versionInfo "3" ; + owl:versionInfo "1" ; vamp:input_domain vamp:FrequencyDomain ; @@ -354,8 +316,8 @@ . plugbase:tuning_param_rollon a vamp:QuantizedParameter ; vamp:identifier "rollon" ; - dc:title "bass noise threshold" ; - dc:format "%" ; + dc:title "spectral roll-on" ; + dc:format "" ; vamp:min_value 0 ; vamp:max_value 5 ; vamp:unit "%" ; @@ -372,12 +334,10 @@ a vamp:KnownExtentsOutput ; vamp:min_value 427.47 ; vamp:max_value 452.89 ; - vamp:bin_count 1 ; + vamp:bin_count 0 ; vamp:sample_type vamp:VariableSampleRate ; - vamp:sample_rate 1.47994e-39 ; -# vamp:computes_event_type ; -# vamp:computes_feature ; -# vamp:computes_signal_type ; + vamp:sample_rate 2.38221e-44 ; + vamp:computes_event_type af:MusicSegment; . plugbase:tuning_output_localtuning a vamp:DenseOutput ; vamp:identifier "localtuning" ; diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_chord_estimation/chordino/nnls-chroma.so Binary file audio_chord_estimation/chordino/nnls-chroma.so has changed diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_key_detection/qm-keydetector/README.txt --- a/audio_key_detection/qm-keydetector/README.txt Wed Aug 12 19:34:12 2015 +0100 +++ b/audio_key_detection/qm-keydetector/README.txt Fri Sep 04 17:43:30 2015 +0100 @@ -1,9 +1,10 @@ # -# MIREX 2014 submission +# MIREX 2015 submission # # QM Key Detector # Plugin by Katy Noland and Christian Landone. -# Prepared by Chris Cannam, chris.cannam@eecs.qmul.ac.uk +# Prepared by Chris Cannam, c.cannam@qmul.ac.uk + # Architecture diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_onset_detection/onsetsds/README.txt --- a/audio_onset_detection/onsetsds/README.txt Wed Aug 12 19:34:12 2015 +0100 +++ b/audio_onset_detection/onsetsds/README.txt Fri Sep 04 17:43:30 2015 +0100 @@ -1,9 +1,10 @@ # -# MIREX 2014 submission +# MIREX 2015 submission # # Audio Onset Detection # Vamp plugin version of OnsetsDS by Dan Stowell -# Chris Cannam, chris.cannam@eecs.qmul.ac.uk +# Chris Cannam, c.cannam@qmul.ac.uk + # Architecture diff -r 194ddc4bd6b0 -r 170b90ac1105 audio_onset_detection/qm-onsetdetector/README.txt --- a/audio_onset_detection/qm-onsetdetector/README.txt Wed Aug 12 19:34:12 2015 +0100 +++ b/audio_onset_detection/qm-onsetdetector/README.txt Fri Sep 04 17:43:30 2015 +0100 @@ -1,8 +1,9 @@ # -# MIREX 2014 submission +# MIREX 2015 submission # # Audio Onset Detection -# Prepared by Chris Cannam, chris.cannam@eecs.qmul.ac.uk +# Prepared by Chris Cannam, c.cannam@qmul.ac.uk + # Architecture