-
Notifications
You must be signed in to change notification settings - Fork 125
Extend preset tours to recorded tours. #735
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.
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
base: development
Are you sure you want to change the base?
Changes from all commits
e56fe77
5327fe5
e804653
a1aac80
2b0af46
5c25aef
ad041a1
30d5ba2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4162,6 +4162,13 @@ decoding .A decoder shall decode every data it receives (according to its capabi | |
| </xs:documentation> | ||
| </xs:annotation> | ||
| </xs:attribute> | ||
| <xs:attribute name="MaxRecordedTours" type="xs:int"> | ||
| <xs:annotation> | ||
| <xs:documentation> | ||
| Indicates the maximum number of different tours that can be recorded. | ||
| </xs:documentation> | ||
| </xs:annotation> | ||
| </xs:attribute> | ||
| <xs:anyAttribute processContents="lax"/> | ||
| </xs:extension> | ||
| </xs:complexContent> | ||
|
|
@@ -4196,7 +4203,7 @@ decoding .A decoder shall decode every data it receives (according to its capabi | |
| </xs:element> | ||
| <xs:element name="PTZPresetTourOperation" type="tt:PTZPresetTourOperation" minOccurs="0" maxOccurs="unbounded"> | ||
| <xs:annotation> | ||
| <xs:documentation>Indicates which preset tour operations are available for this PTZ Node.</xs:documentation> | ||
| <xs:documentation>List of operations provided for preset tours.</xs:documentation> | ||
| </xs:annotation> | ||
| </xs:element> | ||
| <xs:element name="Extension" type="tt:PTZPresetTourSupportedExtension" minOccurs="0"/> | ||
|
|
@@ -4763,6 +4770,11 @@ decoding .A decoder shall decode every data it receives (according to its capabi | |
| <xs:documentation>Unique identifier of this preset tour.</xs:documentation> | ||
| </xs:annotation> | ||
| </xs:attribute> | ||
| <xs:attribute name="IsRecorded" type="xs:boolean"> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As per PTZ Wsdl with onvif.xsd, IsRecorded is mandatory parameter in ModifyPresetTour client request which creates backward compatibility issue.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe attributes are optional by default so I don't think it would cause any backward issues. |
||
| <xs:annotation> | ||
| <xs:documentation>Signal that this tour has been recorded and may have an empty list of tour spots.</xs:documentation> | ||
| </xs:annotation> | ||
| </xs:attribute> | ||
| <xs:anyAttribute processContents="lax"/> | ||
| </xs:complexType> | ||
| <!--===============================--> | ||
|
|
@@ -4973,7 +4985,7 @@ decoding .A decoder shall decode every data it receives (according to its capabi | |
| </xs:element> | ||
| <xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0" maxOccurs="unbounded"> | ||
| <xs:annotation> | ||
| <xs:documentation>Supported options for Direction of Preset Tour.</xs:documentation> | ||
| <xs:documentation>Supported direction of Preset Tour. Defaults to forward.</xs:documentation> | ||
| </xs:annotation> | ||
| </xs:element> | ||
| <xs:element name="Extension" type="tt:PTZPresetTourStartingConditionOptionsExtension" minOccurs="0"/> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -634,6 +634,26 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO | |
| </xs:complexType> | ||
| </xs:element> | ||
| <!--===============================--> | ||
| <xs:element name="RecordTour"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
| <xs:element name="ProfileToken" type="tt:ReferenceToken"/> | ||
| <xs:element name="TourToken" type="tt:ReferenceToken" minOccurs="0"> | ||
| <xs:annotation> | ||
| <xs:documentation>Optional tour to be overwritten. By default create a new tour.</xs:documentation> | ||
| </xs:annotation> | ||
| </xs:element> | ||
| </xs:sequence> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| <xs:element name="RecordTourResponse"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
| <xs:element name="TourToken" type="tt:ReferenceToken"/> | ||
| </xs:sequence> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| <!--===============================--> | ||
| <xs:element name="ModifyPresetTour"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
|
|
@@ -896,6 +916,12 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO | |
| <wsdl:message name="CreatePresetTourResponse"> | ||
| <wsdl:part name="parameters" element="tptz:CreatePresetTourResponse"/> | ||
| </wsdl:message> | ||
| <wsdl:message name="RecordTourRequest"> | ||
| <wsdl:part name="parameters" element="tptz:RecordTour"/> | ||
| </wsdl:message> | ||
| <wsdl:message name="RecordTourResponse"> | ||
| <wsdl:part name="parameters" element="tptz:RecordTourResponse"/> | ||
| </wsdl:message> | ||
| <wsdl:message name="ModifyPresetTourRequest"> | ||
| <wsdl:part name="parameters" element="tptz:ModifyPresetTour"/> | ||
| </wsdl:message> | ||
|
|
@@ -1146,6 +1172,11 @@ If no stop argument for pan, tilt or zoom is set, the device will stop all ongoi | |
| <wsdl:input message="tptz:CreatePresetTourRequest"/> | ||
| <wsdl:output message="tptz:CreatePresetTourResponse"/> | ||
| </wsdl:operation> | ||
| <wsdl:operation name="RecordTour"> | ||
| <wsdl:documentation>Start recording of a new recorded tour or start overwriting an existing tour.</wsdl:documentation> | ||
| <wsdl:input message="tptz:RecordTourRequest"/> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How to stop the recording of a recording tour? Is client needs to use OperatePresetTour for play of the record tour i.e PTZPresetTourOperation - Start and for stop the playing record tour - PTZPresetTourOperation Stop. |
||
| <wsdl:output message="tptz:RecordTourResponse"/> | ||
| </wsdl:operation> | ||
| <wsdl:operation name="ModifyPresetTour"> | ||
| <wsdl:documentation>Operation to modify a preset tour for the selected media profile.</wsdl:documentation> | ||
| <wsdl:input message="tptz:ModifyPresetTourRequest"/> | ||
|
|
@@ -1399,6 +1430,15 @@ If no stop argument for pan, tilt or zoom is set, the device will stop all ongoi | |
| <soap:body use="literal"/> | ||
| </wsdl:output> | ||
| </wsdl:operation> | ||
| <wsdl:operation name="RecordTour"> | ||
| <soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RecordTour"/> | ||
| <wsdl:input> | ||
| <soap:body use="literal"/> | ||
| </wsdl:input> | ||
| <wsdl:output> | ||
| <soap:body use="literal"/> | ||
| </wsdl:output> | ||
| </wsdl:operation> | ||
| <wsdl:operation name="ModifyPresetTour"> | ||
| <soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/ModifyPresetTour"/> | ||
| <wsdl:input> | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add GetRecordedTourOptions for AutoStart and recurring time ?