# HG changeset patch # User cannam # Date 1214396422 0 # Node ID 7c08ba8083b2b7ae46ba6a0a575d38da2d689fa4 # Parent 62ab43ce97907204fd57cf8bd785936c1721b4d0 * Update vamp example plugins rdf against new ontology * Update vamp.rdf again (with right base url) diff -r 62ab43ce9790 -r 7c08ba8083b2 examples/vamp-example-plugins.n3 --- a/examples/vamp-example-plugins.n3 Wed Jun 25 12:13:03 2008 +0000 +++ b/examples/vamp-example-plugins.n3 Wed Jun 25 12:20:22 2008 +0000 @@ -32,12 +32,12 @@ owl:versionInfo "1" ; vamp:input_domain vamp:TimeDomain ; - vamp:parameter_descriptor plugbase:amplitudefollower_param_attack ; - vamp:parameter_descriptor plugbase:amplitudefollower_param_release ; + vamp:parameter plugbase:amplitudefollower_param_attack ; + vamp:parameter plugbase:amplitudefollower_param_release ; - vamp:output_descriptor plugbase:amplitudefollower_output_amplitude ; + vamp:output plugbase:amplitudefollower_output_amplitude ; . -plugbase:amplitudefollower_param_attack a vamp:ParameterDescriptor ; +plugbase:amplitudefollower_param_attack a vamp:Parameter ; vamp:identifier "attack" ; dc:title "Attack time" ; dc:format "s" ; @@ -47,7 +47,7 @@ vamp:default_value 0.01 ; vamp:value_names (); . -plugbase:amplitudefollower_param_release a vamp:ParameterDescriptor ; +plugbase:amplitudefollower_param_release a vamp:Parameter ; vamp:identifier "release" ; dc:title "Release time" ; dc:format "s" ; @@ -79,13 +79,13 @@ owl:versionInfo "2" ; vamp:input_domain vamp:FrequencyDomain ; - vamp:parameter_descriptor plugbase:percussiononsets_param_threshold ; - vamp:parameter_descriptor plugbase:percussiononsets_param_sensitivity ; + vamp:parameter plugbase:percussiononsets_param_threshold ; + vamp:parameter plugbase:percussiononsets_param_sensitivity ; - vamp:output_descriptor plugbase:percussiononsets_output_onsets ; - vamp:output_descriptor plugbase:percussiononsets_output_detectionfunction ; + vamp:output plugbase:percussiononsets_output_onsets ; + vamp:output plugbase:percussiononsets_output_detectionfunction ; . -plugbase:percussiononsets_param_threshold a vamp:ParameterDescriptor ; +plugbase:percussiononsets_param_threshold a vamp:Parameter ; vamp:identifier "threshold" ; dc:title "Energy rise threshold" ; dc:format "dB" ; @@ -95,7 +95,7 @@ vamp:default_value 3 ; vamp:value_names (); . -plugbase:percussiononsets_param_sensitivity a vamp:ParameterDescriptor ; +plugbase:percussiononsets_param_sensitivity a vamp:Parameter ; vamp:identifier "sensitivity" ; dc:title "Sensitivity" ; dc:format "%" ; @@ -143,8 +143,8 @@ vamp:input_domain vamp:FrequencyDomain ; - vamp:output_descriptor plugbase:spectralcentroid_output_logcentroid ; - vamp:output_descriptor plugbase:spectralcentroid_output_linearcentroid ; + vamp:output plugbase:spectralcentroid_output_logcentroid ; + vamp:output plugbase:spectralcentroid_output_linearcentroid ; . plugbase:spectralcentroid_output_logcentroid a vamp:DenseOutput ; vamp:identifier "logcentroid" ; @@ -180,8 +180,8 @@ vamp:input_domain vamp:TimeDomain ; - vamp:output_descriptor plugbase:zerocrossing_output_counts ; - vamp:output_descriptor plugbase:zerocrossing_output_zerocrossings ; + vamp:output plugbase:zerocrossing_output_counts ; + vamp:output plugbase:zerocrossing_output_zerocrossings ; . plugbase:zerocrossing_output_counts a vamp:DenseOutput ; vamp:identifier "counts" ; diff -r 62ab43ce9790 -r 7c08ba8083b2 examples/vamp-example-plugins.rdf --- a/examples/vamp-example-plugins.rdf Wed Jun 25 12:13:03 2008 +0000 +++ b/examples/vamp-example-plugins.rdf Wed Jun 25 12:20:22 2008 +0000 @@ -1,7 +1,7 @@ - + @@ -21,16 +21,15 @@ Vamp SDK Example Plugins - amplitudefollower 1 - - - + + + - + attack Attack time s @@ -39,8 +38,8 @@ s 0.01 - - + + release Release time s @@ -49,7 +48,7 @@ s 0.01 - + amplitude Amplitude @@ -63,8 +62,6 @@ - - Simple Percussion Onset Detector @@ -75,17 +72,16 @@ Vamp SDK Example Plugins - percussiononsets 2 - - - - + + + + - + threshold Energy rise threshold dB @@ -94,8 +90,8 @@ dB 3 - - + + sensitivity Sensitivity % @@ -104,7 +100,7 @@ % 40 - + onsets Onsets @@ -115,8 +111,6 @@ 44100 - - detectionfunction @@ -133,8 +127,6 @@ - - Spectral Centroid @@ -145,13 +137,12 @@ Vamp SDK Example Plugins - spectralcentroid 2 - - + + logcentroid @@ -166,8 +157,6 @@ - - linearcentroid @@ -182,8 +171,6 @@ - - Zero Crossings @@ -194,13 +181,12 @@ Vamp SDK Example Plugins - zerocrossing 2 - - + + counts @@ -217,8 +203,6 @@ - - zerocrossings @@ -232,7 +216,5 @@ 44100 - - diff -r 62ab43ce9790 -r 7c08ba8083b2 rdf/generator/template-generator.cpp --- a/rdf/generator/template-generator.cpp Wed Jun 25 12:13:03 2008 +0000 +++ b/rdf/generator/template-generator.cpp Wed Jun 25 12:20:22 2008 +0000 @@ -112,7 +112,7 @@ Plugin::OutputList outputs = plugin->getOutputDescriptors(); for (Plugin::OutputList::const_iterator i = outputs.begin(); i!= outputs.end(); i++) - res+=" vamp:output plugbase:"+plugin->getIdentifier()+"_output_"+(*i).identifier+" ;\n"; + res+=" vamp:output plugbase:"+plugin->getIdentifier()+"_output_"+(*i).identifier+" ;\n"; res+=" .\n"; return res; diff -r 62ab43ce9790 -r 7c08ba8083b2 rdf/vamp.n3 --- a/rdf/vamp.n3 Wed Jun 25 12:13:03 2008 +0000 +++ b/rdf/vamp.n3 Wed Jun 25 12:20:22 2008 +0000 @@ -193,12 +193,6 @@ ##### Plugin properties -##!!! -## cc -- -## I think parameter_descriptor and output_descriptor should be simply -## called parameter and output respectively, and vamp:Transform should -## be included in the domain of vamp:output because transforms need to -## be able to specify an output as well as a plugin. ##!!! lacking plugin version? diff -r 62ab43ce9790 -r 7c08ba8083b2 rdf/vamp.rdf --- a/rdf/vamp.rdf Wed Jun 25 12:13:03 2008 +0000 +++ b/rdf/vamp.rdf Wed Jun 25 12:20:22 2008 +0000 @@ -1,5 +1,5 @@ - + Vamp Plugins Ontology Vamp Plugins Ontology @@ -21,261 +21,261 @@ $Date: 2008/05/21 17:05:11 $ - + Vamp Plugin A Vamp plugin is an implementation of an audio feature extraction algorithm using the Vamp API. stable - + Vamp Plugin Library Library of Vamp Plugins. This may need to include rights. stable - + Vamp Plugin Parameter Descriptor for a plugin parameter. Hosts need to know about the specific type and form of the parameters of a particular plugin for a correct transform setup. stable - + Quantized Parameter - + Descriptor of a parameter that does have quantized values. The property quantize_step is just defined for this subclass and not for the general Parameter. stable - + Vamp Plugin output descriptor Descriptor for an output of a plugin. This descriptor provides information that is necessary to correctly interpret the output features. The output type will determine how to read the temporal information of the extracted features and how to manage the burden of ouput data. unstable - + Quantized Output - + Descriptor of an output that does have quantized values. stable - + Known Extents Output - + Descriptor of an output that does have known extents. stable - - + + Dense output Specific output type for data evenly spaced in time, which may be of high volume and which it is usually desirable to represent in a compact form. unstable - + Sparse output - + Specific output type for data that consist of features that require their own individual temporal information. unstable - + track level output - + Specific output type for track level information. The Vamp API does not provide for this sort of output directly, so this will require a "hacky" interpretation of the feature timestamp to establish that it reflects track metadata instead of temporal data. unstable - + Plugin program The program is a predefined context of parameters. We may not need a concept for this and just a property linking a string representing the program name. unstable - + Vamp Feature This may be removed mighty soon as we rely on the Audio Features Ontology for this deprecated - + Plugin input domain Plugins declare the input domain they require, so the host can convert the input data properly. Hosts using the Vamp SDK PluginAdapter to wrap plugins should see this work done for them automatically - see the Vamp documentation. stable - + sample type The sample type specifies the temporal information of the plugin output. This information should be combined with the output type for a correct interpretation. stable - + parameter descriptor Links each parameter descriptor to the plugin. - - - + + + stable - + output Links each output type to the plugin. - - - + + + stable - + available plugin Available plugins in the library - - + + stable - + plugin identifier Machine-readable identifier for a Vamp plugin within the scope of its library, or for a plugin descriptor within the scope of the plugin. - - - - - - + + + + + + stable - + plugin name Human-readable identifier for the plugin. - + stable - + vamp API version Version of the Vamp API used to implement this plugin. - + stable - + input domain Input domain required by the plugin (time or frequency). - - + + stable - + max value Maximum value of the parameter range - - + + unstable - + min value Minimum value of the parameter range - - + + unstable - + default value Default value of the parameter - + unstable - + quantized step Quantize step. Only defined if is_quantized is true - - + + unstable - + unit Unit of the output/parameter. A string type - - + + unstable - + value names List of value names if available - + unstable - + fixed bin count Fixed bin count. A boolean type. - + unstable - + sample rate Sample rate of the output if any. Should be read depending on SampleType and Output classes. - + unstable @@ -285,115 +285,115 @@ Specifies the sample rate if it is not constant. - + - + bin count Number of elements of the bin output. This information is necessary to define the output as belonging to a specific subclass of Plugin Output. - + unstable - + bin names List of bin names if available. - + unstable - + sample type The sample type specifies the temporal information of the output. - - + + unstable - + feature type Feature Types output by the plugin. Links the vamp ontology to the audio features ontology. - - + + unstable - + event type Event Type output by the plugin. - - + + unstable - - - - - - + + + + + + Transform stable The Transform defines the environment of any audio processing computation. - + Parameter binding unstable Parameter setting used by the plugin transform to set up the plugin. - + Configuration unstable For extension (key/value data provided to DSSI plugins, not relevant to Vamp) - + Transform Type unstable Specifies the type of transform. May be feature extraction, effect... - + Feature Extraction unstable Feature extraction transform. This may be just a subclass of Transform... - + Effect unstable Effect transform. This may be just a subclass of Transform... - + plugin stable Specifies the sort of plugin in execution. This is an extension to use Transform with other plugin libraries - - + + - + program @@ -401,10 +401,10 @@ Specifies the program to set the plugin in execution. Here the plugin program matches with the one in the plugin descriptor. There is not descriptor required for the program (just a string), is it? - - + + - + program @@ -412,20 +412,20 @@ Extension for configuration. - - + + - + parameter stable Specifies the parameter to set the plugin in execution. - - + + - + step size @@ -433,9 +433,9 @@ Specifies the step size for the framing. - + - + block size @@ -443,9 +443,9 @@ Specifies the block size for the framing. - + - + transform type @@ -453,9 +453,9 @@ Specifies the transform type (we could do this by subclassin transform instead of using a property). - + - + window type @@ -463,9 +463,9 @@ Specifies the window type (they should be individuals and clearly not here). - + - + start @@ -473,9 +473,9 @@ Specifies temporal information when processing a data stream. - + - + start @@ -483,9 +483,9 @@ Specifies temporal information when processing a data stream. - + - + value @@ -493,7 +493,6 @@ Specifies the current value of the parameter. - + -