Skip to content
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

22.06 #222

Merged
merged 32 commits into from
Jun 17, 2022
Merged

22.06 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7c429c9
AppMgmt/State Event State type correction (Fix Issue:#179)
sujithhanwha Jan 20, 2022
12c7beb
Merge pull request #183 from sujithhanwha/22.06
HansBusch Feb 2, 2022
ea5115d
Fix empty links. (#185)
HansBusch Feb 16, 2022
656b900
Clarify color value range. (#180)
HansBusch Feb 16, 2022
9025bdc
Specify access class in a uniform way in all docs (#187)
svefredrik Feb 16, 2022
a641589
Add missing Access Class for DeleteAnalyticsModule (#186)
svefredrik Feb 17, 2022
11da6dd
Add location information to MP4 file.Video/export location (#175)
HansBusch Mar 1, 2022
e88a4fb
Fix small typo (#189)
SergeyBogdanov Mar 1, 2022
f714a65
Rename sections to show real name of service command (#190)
SergeyBogdanov Mar 1, 2022
792ca35
media2 schema: complexType Mask anyattribute issue #188 (#192)
sujithhanwha Mar 4, 2022
0d10f34
Event vs createpullpoint (#202)
HansBusch Apr 21, 2022
431d6da
Fix fault namespace prefix. (#205)
HansBusch Apr 28, 2022
b54ec2f
Draft: Begin Addon addition to the spec. (#209)
michael-msi May 12, 2022
5891d2d
CertPathValidationPolicyID added to uplink configuration (#212)
sujithhanwha May 12, 2022
3e9ca3b
Add missing attribute extension points (#216)
HansBusch May 30, 2022
7af2cf6
Restructure MQTT topic and payload sections (#159)
svefredrik May 31, 2022
0d403bf
Add section 5.6 on media streaming and add cited references. (#218)
HansBusch Jun 1, 2022
8523d00
Remove requirement to accept missing MAC when passphrase is present. …
HansBusch Jun 1, 2022
5ed5906
Fix JSON event example typo (#221)
svefredrik Jun 1, 2022
7136bf6
Additions to license plate rule configurtaion
venki5685 Jun 2, 2022
2aa81a0
Update version numbers and release information.
HansBusch Jun 8, 2022
5fa8111
Fix title of documents first time released from DocBook.
HansBusch Jun 8, 2022
cbd2cab
Fix typos.
HansBusch Jun 9, 2022
33057ed
Add section for JSON metadata over MQTT (#157)
svefredrik Jun 10, 2022
ae12fcb
Update revision history.
HansBusch Jun 10, 2022
987ede3
Update Core.xml
HansBusch Jun 10, 2022
f15313c
Split MQTT hanging introduction section. Move first part to general o…
HansBusch Jun 10, 2022
a173fcd
Update based on Hanwha review: move custom color space requirement fr…
HansBusch Jun 10, 2022
f6e7c6e
Release review: move addition before xs:any to avoid breaking change.
HansBusch Jun 13, 2022
a9b292f
Update revision information based on review.
HansBusch Jun 14, 2022
31d6daa
Fix according to review comments: correct method encoding.
HansBusch Jun 14, 2022
425dfb9
Merge change from event.wsdl: Add section for JSON metadata over MQTT…
HansBusch Jun 15, 2022
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
644 changes: 619 additions & 25 deletions doc/Analytics.xml

Large diffs are not rendered by default.

16 changes: 12 additions & 4 deletions doc/AppMgmt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<info>
<title>Application Management Service Specification</title>
<titleabbrev>App Mgmt</titleabbrev>
<releaseinfo>21.12</releaseinfo>
<releaseinfo>22.06</releaseinfo>
<author>
<orgname>ONVIF™</orgname>
<uri>www.onvif.org</uri>
</author>
<pubdate> December, 2021</pubdate>
<pubdate> June, 2022</pubdate>
<mediaobject>
<imageobject>
<imagedata fileref="media/logo.png" contentwidth="60mm"/>
</imageobject>
</mediaobject>
<copyright>
<year>2008-2021</year>
<year>2008-2022</year>
<holder>ONVIF™ All rights reserved.</holder>
</copyright>
<legalnotice>
Expand Down Expand Up @@ -64,6 +64,14 @@
</author>
<revremark>Fix inconsistencies between appmgmt schema and doc.</revremark>
</revision>
<revision>
<revnumber>22.06</revnumber>
<date>Jun-2022</date>
<author>
<personname>Sujith Raman</personname>
</author>
<revremark>Correct namespace of event State member.</revremark>
</revision>
</revhistory>
</info>
<chapter>
Expand Down Expand Up @@ -584,7 +592,7 @@
<tt:SimpleItemDescription Name="AppID" Type="xs:string"/>
</tt:Source>
<tt:Data>
<tt:SimpleItemDescription Name="State" Type="tam:State"/>
<tt:SimpleItemDescription Name="State" Type="ans:AppState"/>
<tt:SimpleItemDescription Name="Status" Type="xs:string"/>
</tt:Data>
</tt:MessageDescription>]]></programlisting>
Expand Down
165 changes: 112 additions & 53 deletions doc/Core.xml

Large diffs are not rendered by default.

18 changes: 13 additions & 5 deletions doc/DeviceIo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<info>
<title>Device IO Service Specification</title>
<titleabbrev>Device-IO</titleabbrev>
<releaseinfo>19.06</releaseinfo>
<releaseinfo>22.06</releaseinfo>
<author>
<orgname>ONVIF™</orgname>
<uri>www.onvif.org</uri>
</author>
<pubdate>June, 2019</pubdate>
<pubdate>June, 2022</pubdate>
<mediaobject>
<imageobject>
<imagedata fileref="media/logo.png" contentwidth="60mm" />
</imageobject>
</mediaobject>
<copyright>
<year>2008-2020</year>
<year>2008-2022</year>
<holder>ONVIF™ All rights reserved.</holder>
</copyright>
<legalnotice>
Expand Down Expand Up @@ -147,6 +147,14 @@ Change Request 2065</revremark>
</author>
<revremark>Change Request 2454</revremark>
</revision>
<revision>
<revnumber>22.06</revnumber>
<date>Jun-2022</date>
<author>
<personname>Sergey Bogdanov</personname>
</author>
<revremark>Rename sections to show real name of service command.</revremark>
</revision>
</revhistory>
</info>
<chapter>
Expand Down Expand Up @@ -967,7 +975,7 @@ Change Request 2065</revremark>
</variablelist>
</section>
<section>
<title>Send ReceiveSerialCommand</title>
<title>SendReceiveSerialCommand</title>
<para>This section describes operations to transmit/receive <emphasis>generic</emphasis> controlling data to/from a serial device that is connected to the serial port of the device.</para>
<para>This operation can be used for the following purposes.</para>
<itemizedlist>
Expand Down Expand Up @@ -1041,7 +1049,7 @@ Change Request 2065</revremark>
</section>
</section>
<section>
<title>Capabilities</title>
<title>GetServiceCapabilities</title>
<para>The capabilities reflect optional functions and functionality of a service. The information is static and does not change during device operation. </para>
<variablelist role="op">
<varlistentry>
Expand Down
90 changes: 87 additions & 3 deletions doc/ExportFileFormat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<info>
<title>Export File Format Specification</title>
<titleabbrev>ExportFileFormat</titleabbrev>
<releaseinfo>21.12</releaseinfo>
<releaseinfo>22.06</releaseinfo>
<author>
<orgname>ONVIF™</orgname>
<uri>www.onvif.org</uri>
</author>
<pubdate>December, 2021</pubdate>
<pubdate>June, 2022</pubdate>
<mediaobject>
<imageobject>
<imagedata fileref="media/logo.png" contentwidth="60mm"/>
</imageobject>
</mediaobject>
<copyright>
<year>2013-2021</year>
<year>2013-2022</year>
<holder>ONVIF™ All rights reserved.</holder>
</copyright>
<legalnotice>
Expand Down Expand Up @@ -102,6 +102,14 @@
</author>
<revremark>Add timed metadata.</revremark>
</revision>
<revision>
<revnumber>22.06</revnumber>
<date>Jun-2022</date>
<author>
<personname>Hans Busch</personname>
</author>
<revremark>Add location information.</revremark>
</revision>
</revhistory>
</info>
<chapter>
Expand All @@ -124,6 +132,8 @@
<para role="reference">&lt;<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://csrc.nist.gov/publications/detail/fips/180/4/final"></link>&gt;</para>
<para>ISO/IEC 14888-2 Information technology – Security techniques – Digital signatures with appendix – Part 2: Integer factorization based mechanisms</para>
<para role="reference">&lt;<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.iso.org/obp/ui/#iso:std:iso-iec:14888:-2:ed-2:v1:en"></link>&gt;</para>
<para>ETSI TS 126 244 3GPP file format </para>
<para role="reference">&lt;<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.etsi.org/deliver/etsi_ts/126200_126299/126244/16.01.00_60/ts_126244v160100p.pdf"></link>&gt;</para>
<para>PKCS#1, v2.1 RSA Cryptographic Standard</para>
<para>NIST FIPS 186 Digital Signature Standard (DSS)</para>
<para role="reference">&lt;<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://csrc.nist.gov/publications/detail/fips/186/4/final"></link>&gt;</para>
Expand Down Expand Up @@ -178,6 +188,30 @@
<para>The ISO Base File Format has been mainly designed for storing movies and music clips. It defines a media timeline relative to the beginning which is defined as time zero. For Video Surveillance purposes it is important that the file preserves the absolute time of the captured frames. This specification refers to ISO 23000-10 for storing the absolute start time. All other times can be derived using the relative time data defined in ISO/IEC 14496-12. Additional to this time information time corrections can be stored during the sealing process.</para>
<para>In order to improve random access the ISOM baseline requires the movie fragment table at the end of the file. This redundant information does not require the protection seal.</para>
</section>
<section>
<title>Location</title>
<para>Three mechanism for storing location information are defined for MP4 files by the mobile
industry.</para>
<para>This specification refers to the ETSI standard which has defined means for textual and
spherical representation using the so called 'loci' box. </para>
<para>Beside the ETSI standard two defacto standards exist for Android and iOS based mobile
phones:</para>
<itemizedlist>
<listitem>
<para>Android phones use the '©xyz' box holding an alphanumeric string with lon and lat
degrees.</para></listitem>
<listitem>
<para>Mobile phones based on iOS store similar information in sub atoms of the meta box.
Note that this meta box is incompatible with the ISO Base File Format
specification.</para>
</listitem>
</itemizedlist>
<para>The location information is designated to provide a best effort for the video location
in order to be able to geo-locate the video. For fixed cameras the location should
approximate to the intersection of the camera axis with the ground location. For moving
cameras such an appoach may not be feasible and a fallback to the camera location may be
more suitable.</para>
</section>
<section>
<title>Sealing</title>
<para>All data that a user wishes to carry away separately are put into a metaphorical bag. The bag is then sealed to enable tamper detection. Anyone wanting to use the data from the bag first examines the seal. <phrase>The data in the bag are identical with the original data as long as the seal is intact.</phrase> Here, the metaphorical bag is represented by a file and the seal is represented by a signature over all data in the file.</para>
Expand Down Expand Up @@ -348,6 +382,52 @@ class CorrectStartTimeBox extends Box (‘cstb’) {
</varlistentry>
</variablelist>
</section>
<section>
<title>Location information</title>
<para>When available, the location of the camera view shall be provided as 'loci' box
according to ETSI TS 126 244. See below informal repetition of the definition.</para>
<para>
<emphasis role="bold">Location Box</emphasis>
</para>
<programlisting>Box Types: 'loci'
Container: User Data Box (‘udta’)
Mandatory: No
Quantity: Zero or one</programlisting>
<para>
<emphasis role="bold">Syntax</emphasis>
</para>
<programlisting><![CDATA[aligned(8)
class LocationInformationBox extends FullBox (‘loci’) {
UInt(16) language;
String Name;
UInt(8) Role;
UInt(32) Logitude;
UInt(32) Latitude;
UInt(32) Altitude;
String AstronomicalBody;
String Notes;
)
]]></programlisting>
<para>All characters of string based fields shall be encoded as UTF-8. The following semantics apply:</para>
<variablelist>
<varlistentry>
<term>Role</term>
<listitem><para>Shall be '1' - real location</para></listitem>
</varlistentry>
<varlistentry>
<term>Name</term>
<listitem><para>Human readable street address of the location, optionally including building internal addressing.</para></listitem>
</varlistentry>
<varlistentry>
<term>Longitude and Latitude</term>
<listitem><para>16.16 bit fixed point angle in degree.</para></listitem>
</varlistentry>
<varlistentry>
<term>Altitude</term>
<listitem><para>Height of the location in meter.</para></listitem>
</varlistentry>
</variablelist>
</section>
<section>
<title>Timed metadata</title>
<para>ONVIF metadata supports transport of frame related scene description, events and PTZ
Expand Down Expand Up @@ -655,6 +735,8 @@ class AdditionalUserInformationBox
<emphasis role="bold">stts</emphasis><superscript>1</superscript> Sample index by time
<emphasis role="bold">stsc</emphasis><superscript>1</superscript> Sample to chunk mapping
<emphasis role="bold">stco</emphasis><superscript>1</superscript> List of Chunk offsets inside 'mdat' relative to file begin
<emphasis role="bold">udta</emphasis><superscript>1</superscript> User data
<emphasis role="bold">loci</emphasis><superscript>4</superscript> Geo location information
<emphasis role="bold">trak</emphasis><superscript>1</superscript> Third track with timed metadata
<emphasis role="bold">tkhd</emphasis><superscript>1</superscript> Track header with creation time, timescale, duration, track ID
<emphasis role="bold">mdia</emphasis><superscript>1</superscript>
Expand Down Expand Up @@ -708,6 +790,8 @@ class AdditionalUserInformationBox
<superscript>2</superscript> ISO/IEC 23000-10</para>
<para>
<superscript>3</superscript> This specification</para>
<para>
<superscript>4</superscript> ETSI TS 126 244</para>
</appendix>
<appendix role="revhistory">
<title>Revision History</title>
Expand Down
30 changes: 23 additions & 7 deletions doc/Imaging.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<info>
<title>Imaging Service Specification</title>
<titleabbrev>Imaging</titleabbrev>
<releaseinfo>19.06</releaseinfo>
<releaseinfo>22.06</releaseinfo>
<author>
<orgname>ONVIF™</orgname>
<uri>www.onvif.org</uri>
</author>
<pubdate>June, 2019</pubdate>
<pubdate>June, 2022</pubdate>
<mediaobject>
<imageobject>
<imagedata fileref="media/logo.png" contentwidth="60mm" />
</imageobject>
</mediaobject>
<copyright>
<year>2008-2020</year>
<year>2008-2022</year>
<holder>ONVIF™ All rights reserved.</holder>
</copyright>
<legalnotice>
Expand Down Expand Up @@ -126,6 +126,14 @@ Change Request 1843</revremark>
<revremark>Added Focus Modes
Change Request 2384, 2431, 2477, 2478</revremark>
</revision>
<revision>
<revnumber>22.06</revnumber>
<date>June-2022</date>
<author>
<personname>Fredrik Svensson</personname>
</author>
<revremark>Change the "role" attribute for request access class.</revremark>
</revision>
</revhistory>
</info>
<chapter>
Expand Down Expand Up @@ -569,9 +577,13 @@ Change Request 2384, 2431, 2477, 2478</revremark>
<para role="text">The requested video source does not support imaging settings.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>access class</term>
<listitem>
<para role="access">READ_MEDIA</para>
</listitem>
</varlistentry>
</variablelist>
<para>Access Class: </para>
<para> READ_MEDIA</para>
<para>If the video source supports any of the imaging settings as defined by the ImagingSettings type in the [ONVIF Schema], then it should be possible to retrieve the imaging settings from the device through the GetImagingSettings command.</para>
</section>
<section xml:id="_Toc86847688">
Expand Down Expand Up @@ -644,9 +656,13 @@ Change Request 2384, 2431, 2477, 2478</revremark>
<para role="text">The requested VideoSource does not support imaging settings.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>access class</term>
<listitem>
<para role="access">READ_MEDIA</para>
</listitem>
</varlistentry>
</variablelist>
<para>Access Class: </para>
<para>READ_MEDIA</para>
</section>
</section>
<section xml:id="_Toc214944255">
Expand Down
24 changes: 16 additions & 8 deletions doc/RecordingSearch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<info>
<title>Recording Search Specification</title>
<titleabbrev>RecordingSearch</titleabbrev>
<releaseinfo>21.12</releaseinfo>
<releaseinfo>22.06</releaseinfo>
<author>
<orgname>ONVIF™</orgname>
<uri>www.onvif.org</uri>
</author>
<pubdate>December, 2021</pubdate>
<pubdate>June, 2022</pubdate>
<mediaobject>
<imageobject>
<imagedata fileref="media/logo.png" contentwidth="60mm" />
Expand Down Expand Up @@ -149,6 +149,14 @@ Change Request 1843, 2050, 2053, 2055, 2065</revremark>
</author>
<revremark>Change the "role" attribute for request access class.</revremark>
</revision>
<revision>
<revnumber>22.06</revnumber>
<date>June-2022</date>
<author>
<personname>Fredrik Svensson</personname>
</author>
<revremark>Change the "role" attribute for request access class.</revremark>
</revision>
</revhistory>
</info>
<chapter>
Expand Down Expand Up @@ -1337,13 +1345,13 @@ http://www.onvif.org/ver10/tptz/ZoomSpaces/PositionGenericSpace
<para role="text">The search token is invalid.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>access class</term>
<listitem>
<para role="access">READ_MEDIA</para>
</listitem>
</varlistentry>
</variablelist>
<para>ACCES CLASS:</para>
<itemizedlist>
<listitem>
<para>READ_MEDIA</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>GetServiceCapabilities</title>
Expand Down
Loading