8000 Core/attr list by HansBusch · Pull Request #87 · onvif/specs · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Core/attr list #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2021
Merged

Core/attr list #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffb1579
Align simple item list types with elements for float and int.
HansBusch Mar 5, 2021
d4be924
Remove accidentally added file devicemgmt.xml.
HansBusch Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions wsdl/ver10/device/wsdl/devicemgmt.wsdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
<xs:anyAttribute processContents="lax"/>
</xs:complexType>
<!--===============================-->
<xs:simpleType name="EAPMethodTypes">
<xs:list itemType="xs:int"/>
</xs:simpleType>
<xs:complexType name="SecurityCapabilities">
<xs:attribute name="TLS1.0" type="xs:boolean">
<xs:annotation>
Expand Down Expand Up @@ -235,7 +232,7 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
<xs:documentation>Indicates support for WS-Security REL token.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="SupportedEAPMethods" type="tds:EAPMethodTypes">
<xs:attribute name="SupportedEAPMethods" type="tt:IntList">
<xs:annotation>
<xs:documentation>EAP Methods supported by the device. The int values refer to the <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.</xs:documentation>
</xs:annotation>
Expand Down
4,129 changes: 0 additions & 4,129 deletions wsdl/ver10/device/wsdl/devicemgmt.xml
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions wsdl/ver10/deviceio.wsdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
<xs:documentation>Supported Modes.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="DelayTimes" type="tmd:DelayTimes" minOccurs="0">
<xs:element name="DelayTimes" type="tt:FloatList" minOccurs="0">
<xs:annotation>
<xs:documentation>Supported delay time range or discrete values in seconds. This element must be present if MonoStable mode is supported.</xs:documentation>
</xs:annotation>
Expand All @@ -136,9 +136,6 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
<xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax"/> <!-- first Vendor then ONVIF -->
</xs:sequence>
</xs:complexType>
<xs:simpleType name="DelayTimes">
<xs:list itemType="xs:float"/>
</xs:simpleType>
<!--===============================-->
<xs:complexType name="Get">
<xs:sequence>
Expand Down
9 changes: 1 addition & 8 deletions wsdl/ver10/media/wsdl/media.wsdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1738,13 +1738,6 @@ AudioOutputConfiguration shall be removed.</xs:documentation>
</xs:complexType>
</xs:element>
<!--===============================-->
<xs:simpleType name="EncodingTypes">
<xs:annotation>
<xs:documentation>Indication which encodings are supported for this video source. The list may contain one or more enumeration values of tt:VideoEncoding.</xs:documentation>
</xs:annotation>
<xs:list itemType="xs:string"/>
</xs:simpleType>
<!--===============================-->
<xs:complexType name="VideoSourceMode">
<xs:sequence>
<xs:element name="MaxFramerate" type="xs:float">
Expand All @@ -1757,7 +1750,7 @@ AudioOutputConfiguration shall be removed.</xs:documentation>
<xs:documentation>Max horizontal and vertical resolution for this video source mode.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Encodings" type="trt:EncodingTypes">
<xs:element name="Encodings" type="tt:StringList">
<xs:annotation>
<xs:documentation>Indication which encodings are supported for this video source. The list may contain one or more enumeration values of tt:VideoEncoding.</xs:documentation>
</xs:annotation>
Expand Down
5 changes: 1 addition & 4 deletions wsdl/ver10/recording.wsdl
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
<xs:documentation>Indication if the device supports dynamic creation and deletion of tracks</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Encoding" type="trc:EncodingTypes">
<xs:attribute name="Encoding" type="tt:StringList">
<xs:annotation>
<xs:documentation>Indication which encodings are supported for recording. The list may contain one or more enumeration values of tt:VideoEncoding and tt:AudioEncoding. For encodings that are neither defined in tt:VideoEncoding nor tt:AudioEncoding the device shall use the <a href="http://www.iana.org/assignments/media-types/media-types.xhtml">IANA</a> defintions. Note, that a device without audio support shall not return audio encodings. </xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -91,9 +91,6 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
</xs:attribute>
<xs:anyAttribute processContents="lax"/>
</xs:complexType>
<xs:simpleType name="EncodingTypes">
<xs:list itemType="xs:string"/>
</xs:simpleType>
<xs:element name="Capabilities" type="trc:Capabilities"/>
<!--===============================-->
<xs:element name="CreateRecording">
Expand Down
2 changes: 1 addition & 1 deletion wsdl/ver10/replay.wsdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
<xs:documentation>Indicator that the Device supports reverse playback as defined in the ONVIF Streaming Specification. </xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="SessionTimeoutRange" type="tt:FloatAttrList">
<xs:attribute name="SessionTimeoutRange" type="tt:FloatList">
<xs:annotation>
<xs:documentation>The list contains two elements defining the minimum and maximum valid values supported as session timeout in seconds. </xs:documentation>
</xs:annotation>
Expand Down
14 changes: 7 additions & 7 deletions wsdl/ver10/schema/onvif.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
</xs:sequence>
</xs:complexType>
<!--===============================-->
<xs:simpleType name="IntAttrList">
<xs:simpleType name="IntList">
<xs:list itemType="xs:int"/>
</xs:simpleType>
<!--===============================-->
<xs:simpleType name="FloatAttrList">
<xs:simpleType name="FloatList">
<xs:list itemType="xs:float"/>
</xs:simpleType>
<!--===============================-->
Expand Down Expand Up @@ -139,9 +139,9 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
</xs:element>
<xs:element name="StringList" type="tt:StringList"/>
<xs:element name="IntRange" type="tt:IntRange"/>
<xs:element name="IntList" type="tt:IntAttrList"/>
<xs:element name="IntList" type="tt:IntList"/>
<xs:element name="FloatRange" type="tt:FloatRange"/>
<xs:element name="FloatList" type="tt:FloatAttrList"/>
<xs:element name="FloatList" type="tt:FloatList"/>
<xs:element name="DurationRange" type="tt:DurationRange"/>
<xs:element name="IntRectangleRange" type="tt:IntRectangleRange"/>
<!--===============================-->
Expand Down Expand Up @@ -1148,12 +1148,12 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
</xs:element>
<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> <!-- first ONVIF then Vendor -->
</xs:sequence>
<xs:attribute name="GovLengthRange" type="tt:IntAttrList">
<xs:attribute name="GovLengthRange" type="tt:IntList">
<xs:annotation>
<xs:documentation>Exactly two values, which define the Lower and Upper bounds for the supported group of Video frames length. These values typically correspond to the I-Frame distance.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="FrameRatesSupported" type="tt:FloatAttrList">
<xs:attribute name="FrameRatesSupported" type="tt:FloatList">
<xs:annotation>
<xs:documentation>List of supported target frame rates in fps (frames per second). The list shall be sorted with highest values first.</xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -4423,7 +4423,7 @@ decoding .A decoder shall decode every data it receives (according to its capabi
</xs:element>
<xs:element name="Extension" type="tt:PTZConfigurationOptions2" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="PTZRamps" type="tt:IntAttrList">
<xs:attribute name="PTZRamps" type="tt:IntList">
<xs:annotation>
<xs:documentation>
The list of acceleration ramps supported by the device. The
Expand Down
9 changes: 1 addition & 8 deletions wsdl/ver20/media/wsdl/media.wsdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,13 +874,6 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
</xs:complexType>
</xs:element>
<!--===============================-->
<xs:simpleType name="EncodingTypes">
<xs:annotation>
<xs:documentation>List of one or more encodings supported for this video source. For name definitions see tt:VideoEncodingMimeNames, and see <a href="https://www.iana.org/assignments/media-types/media-types.xhtml#video">IANA Media Types</a>.</xs:documentation>
</xs:annotation>
<xs:list itemType="xs:string"/>
</xs:simpleType>
<!--===============================-->
<xs:complexType name="VideoSourceMode">
<xs:sequence>
<xs:element name="MaxFramerate" type="xs:float">
Expand All @@ -893,7 +886,7 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
<xs:documentation>Max horizontal and vertical resolution for this video source mode.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Encodings" type="tr2:EncodingTypes">
<xs:element name="Encodings" type="tt:StringList">
<xs:annotation>
<xs:documentation>List of one or more encodings supported for this video source. For name definitions see tt:VideoEncodingMimeNames, and see <a href="https://www.iana.org/assignments/media-types/media-types.xhtml#video">IANA Media Types</a>.</xs:documentation>
</xs:annotation>
Expand Down
0