Merge pull request #71 from onvif/20.12

Merge 20.12
onvif · Dec 21, 2020 · 7f5eeaa · 7f5eeaa
2 parents 72b4285 + f18f128
commit 7f5eeaa
Show file tree

Hide file tree

Showing 43 changed files with 8,495 additions and 1,587 deletions.
diff --git a/doc/AccessControl.xml b/doc/AccessControl.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Access Control Service Specification</title>
@@ -301,19 +302,17 @@ Added support for authentication behavior</revremark>
         <tgroup cols="2">
           <colspec colname="c1" colwidth="13*" />
           <colspec colname="c2" colwidth="87*" />
-          <tbody valign="top">
+          <thead>
             <row>
               <entry>
-                <para>
-                  <emphasis role="bold">Prefix</emphasis>
-                </para>
+                <para> Prefix </para>
               </entry>
               <entry>
-                <para>
-                  <emphasis role="bold">Namespace URI</emphasis>
-                </para>
+                <para> Namespace URI </para>
               </entry>
             </row>
+          </thead>
+          <tbody valign="top">
             <row>
               <entry>
                 <para>env</para>

diff --git a/doc/AccessRules.xml b/doc/AccessRules.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Access Rules Service Specification</title>

diff --git a/doc/ActionEngine.xml b/doc/ActionEngine.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Action Engine Service Specification</title>

diff --git a/doc/Analytics.xml b/doc/Analytics.xml
diff --git a/doc/AppMgmt.xml b/doc/AppMgmt.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Applicaton Management Service Specification</title>

diff --git a/doc/AuthenticationBehavior.xml b/doc/AuthenticationBehavior.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Authentication Behavior Service Specification</title>
@@ -176,19 +177,17 @@
         <tgroup cols="2">
           <colspec colname="c1" colwidth="13*" />
           <colspec colname="c2" colwidth="87*" />
-          <tbody valign="top">
+          <thead>
             <row>
               <entry>
-                <para>
-                  <emphasis role="bold">Prefix</emphasis>
-                </para>
+                <para> Prefix </para>
               </entry>
               <entry>
-                <para>
-                  <emphasis role="bold">Namespace URI</emphasis>
-                </para>
+                <para> Namespace URI </para>
               </entry>
             </row>
+          </thead>
+          <tbody valign="top">
             <row>
               <entry>
                 <para>env</para>

diff --git a/doc/Core.xml b/doc/Core.xml
diff --git a/doc/Credential.xml b/doc/Credential.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Credential Service Specification</title>
@@ -275,14 +276,10 @@ Updated command table format</revremark>
           <tbody valign="top">
             <row>
               <entry>
-                <para>
-                  <emphasis role="bold">Prefix</emphasis>
-                </para>
+                <para> Prefix </para>
               </entry>
               <entry>
-                <para>
-                  <emphasis role="bold">Namespace URI</emphasis>
-                </para>
+                <para> Namespace URI </para>
               </entry>
             </row>
             <row>

diff --git a/doc/DeviceIo.xml b/doc/DeviceIo.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Device IO Service Specification</title>

diff --git a/doc/Display.xml b/doc/Display.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book version="5.0" xmlns="http://docbook.org/ns/docbook"
       xmlns:xlink="http://www.w3.org/1999/xlink"
       xmlns:ns5="http://www.w3.org/1999/xhtml"

diff --git a/doc/DoorControl.xml b/doc/DoorControl.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book version="5.0" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg"
       xmlns:ns="http://docbook.org/ns/docbook">
   <info>

diff --git a/doc/ExportFileFormat.xml b/doc/ExportFileFormat.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Export File Format Specification</title>
@@ -104,30 +105,16 @@ Add suep version 1 and Annex B</revremark>
     <title>Terms and Definitions</title>
     <section>
       <title>Definitions</title>
-      <informaltable>
-        <tgroup cols="2">
-          <colspec colname="c1" colwidth="24*" />
-          <colspec colname="c2" colwidth="76*" />
-          <tbody valign="top">
-            <row>
-              <entry align="left">
-                <para>Certificate </para>
-              </entry>
-              <entry align="left">
-                <para>A certificate as used in this specification binds a public key to a subject entity. The certificate is digitally signed by the certificate issuer to allow for verifying its authenticity </para>
-              </entry>
-            </row>
-            <row>
-              <entry align="left">
-                <para>Signature</para>
-              </entry>
-              <entry align="left">
-                <para>A digital signature or digital signature scheme is a mathematical scheme for demonstrating the authenticity of a digital message or document.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+      <variablelist>
+        <varlistentry>
+          <term>Certificate</term>
+          <listitem><para>A certificate as used in this specification binds a public key to a subject entity. The certificate is digitally signed by the certificate issuer to allow for verifying its authenticity </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>Signature</term>
+          <listitem><para>A digital signature or digital signature scheme is a mathematical scheme for demonstrating the authenticity of a digital message or document.</para></listitem>
+        </varlistentry>
+      </variablelist>
     </section>
     <section>
       <title>Abbreviations</title>
@@ -471,17 +458,17 @@ class AdditionalUserInformationBox
   <appendix>
     <title>Repeated Signing (informative)</title>
     <para><xref linkend="image3" /> characterizes the box arrangement defined in the present specification for data export.</para>
-    <figure>
-      <title xml:id="image3" >Box structure with single signature</title>
+    <figure xml:id="image3">
+      <title>Box structure with single signature</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="media/ExportFileFormat/image3.svg" contentwidth="134.85mm" />
         </imageobject>
       </mediaobject>
     </figure>
     <para><xref linkend="image4" /> characterizes the box arrangement after repeated signing.</para>
-    <figure>
-      <title xml:id="image4">Box structure with double signature</title>
+    <figure xml:id="image4">
+      <title>Box structure with double signature</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="media/ExportFileFormat/image4.svg" contentwidth="134.85mm" />

diff --git a/doc/Imaging.xml b/doc/Imaging.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Imaging Service Specification</title>

diff --git a/doc/Media.xml b/doc/Media.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="docbook.xsl" type="text/xsl" ?>
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <info>
     <title>Media Service Specification</title>
@@ -493,8 +494,8 @@ Change Request 2430, 2479</revremark>
       </itemizedlist>
       <para>A profile consists of all or a subset of these configuration entities. Depending on the capabilities of the device, a particular configuration entity can be part of a profile or not. For example, a profile with an audio source and an audio encoder configuration can exist only in a device with audio support. </para>
       <para>An example of a complete profile configuration is illustrated in <xref linkend="_Ref210451597" />.</para>
-      <figure>
-        <title xml:id="_Ref210451597">Figure 2: Complete profile configuration </title>
+      <figure xml:id="_Ref210451597">
+        <title>Figure 2: Complete profile configuration </title>
         <mediaobject>
           <imageobject>
             <imagedata fileref="media/Media/mediaProfile.svg" contentwidth="140mm" />
@@ -2640,8 +2641,8 @@ The ForcePersistence element is obsolete and should always assumed to be true.
         <para>EXI encoding allows for a more compact representation of XML metadata. Provision is signalled if the CompressionType returned via GetMetadataConfigurationOptions contains "EXI". </para>
         <para>The ONVIF defined EXI configuration (see <xref linkend="_Ref11683239" /> and <xref linkend="_Ref422899119" />) shall be supported by a devices signalling the support for EXI compression via GetMetadataConfigurationOptions. </para>
         <para>The EXI header shall only be transmitted if a setting different then the ONVIF defined configuration is used. Except for the setting of the two elements “Presence Bit” and “EXI Options” the ONVIF defined EXI header settings (see <xref linkend="_Ref11683239" />) shall always be used.</para>
-        <table>
-          <title xml:id="_Ref11683239">Table 51 ONVIF defined EXI header settings</title>
+        <table xml:id="_Ref11683239">
+          <title>Table 51 ONVIF defined EXI header settings</title>
           <tgroup cols="2">
             <colspec colname="c1" colwidth="33*" />
             <colspec colname="c2" colwidth="67*" />
@@ -2707,8 +2708,8 @@ The ForcePersistence element is obsolete and should always assumed to be true.
             </tbody>
           </tgroup>
         </table>
-        <table>
-          <title xml:id="_Ref422899119">Table 52 ONVIF defined EXI configuration settings</title>
+        <table xml:id="_Ref422899119">
+          <title>ONVIF defined EXI configuration settings</title>
           <tgroup cols="2">
             <colspec colname="c1" colwidth="34*" />
             <colspec colname="c2" colwidth="66*" />
@@ -3474,8 +3475,8 @@ The ForcePersistence element is obsolete and should always assumed to be true.
         <title>GetStreamUri</title>
         <para>This operation requests a URI that can be used to initiate a live media stream using RTSP as the control protocol. The returned URI should remain valid indefinitely even if the profile is changed. The InvalidAfterConnect, InvalidAfterReboot and Timeout Parameter should be set accordingly (InvalidAfterConnect=false, InvalidAfterReboot=false, timeout=PT0S). A device shall support the retrieval of a media stream URI for a specific media profile through the GetStreamUri command unless the NoRTSPStreaming capability is set.</para>
         <para>The correct syntax for the StreamSetup element for the media stream setups as defined in 5.1.1 of the ONVIF Streaming Specification are defined in <xref linkend="SetupParameterCombinations" />.</para>
-        <table>
-          <title xml:id="SetupParameterCombinations">Valid setup parameter conbinations</title>
+        <table xml:id="SetupParameterCombinations">
+          <title>Valid setup parameter conbinations</title>
           <tgroup cols="3">
             <colspec colname="c1" colwidth="52*" />
             <colspec colname="c2" colwidth="21*" />