Skip to content

Commit af6541f

Browse files
cemond-geneteccemond-genetec
committed
Clean to put only boolean DynamicGOV and FPS
1 parent 55cf2b5 commit af6541f

File tree

2 files changed

+16
-43
lines changed

2 files changed

+16
-43
lines changed

‎doc/Media.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,6 +1838,9 @@ The ForcePersistence element is obsolete and should always be assumed to be true
18381838
<listitem>
18391839
<para>MPEG4/H264 specifics – Defines the encoding profile and GOV length [frame].</para>
18401840
</listitem>
1841+
<listitem>
1842+
<para>DynamicEncoding - Defines the dynamic GOV and FPS.</para>
1843+
</listitem>
18411844
</itemizedlist>
18421845
<para>TheVideoEncoderConfiguration structure also contains multicast parameters and a session timeout to define video streaming behaviour. If a VideoEncoderConfiguration is used inside a profile its UseCount parameter is increased to indicate that changing this configuration could affect other users.</para>
18431846
<para>If the whole RateControl parameter structure is missing the current state of rate control is undefined and vendor specific. A device, supporting disabling rate control mechanisms shall reflect that by omitting the RateControl element after removal by a client otherwise it shall return the current values used for RateControl. If RateControl is missing, the respective options define whether a RateControl element can be (re-)added.</para>

‎wsdl/ver10/schema/onvif.xsd‎

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -797,34 +797,19 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
797797
</xs:sequence>
798798
</xs:complexType>
799799
<!--===============================-->
800-
<xs:complexType name="DynamicCompression">
800+
<xs:complexType name="DynamicEncoding">
801801
<xs:sequence>
802-
<xs:element name="GovMode" type="xs:string" minOccurs="0">
802+
<xs:element name="DynamicGov" type="xs:boolean" minOccurs="0">
803803
<xs:annotation>
804-
<xs:documentation>dynamic or fixed. Dynamic mode allows to skip unnecessary I-frames when there is no motion.</xs:documentation>
804+
<xs:documentation>Indicates if device is allowed to skip unnecessary I-frames when there is no motion. The GovLength is the maximum interval rather than a fixed value.</xs:documentation>
805805
</xs:annotation>
806806
</xs:element>
807-
<xs:element name="MaximumGovLength" type="xs:int" minOccurs="0">
807+
<xs:element name="DynamicFPS" type="xs:boolean" minOccurs="0">
808808
<xs:annotation>
809-
<xs:documentation>The maximum interval in which the I-Frames can be coded when configured in dynamic GovMode. This value is based on the configured maximum frame rate.</xs:documentation>
809+
<xs:documentation>Indicates that device is allowed to skip unnecessary P-frames when there is no motion. To ensure a minimum framerate, enable GuaranteedFrameRate and set FrameRate.</xs:documentation>
810810
</xs:annotation>
811811
</xs:element>
812-
<xs:element name="FrameRateMode" type="xs:string" minOccurs="0">
813-
<xs:annotation>
814-
<xs:documentation>dynamic or fixed. Dynamic mode allows to skip unnecessary P-frames when there is no motion.</xs:documentation>
815-
</xs:annotation>
816-
</xs:element>
817-
<xs:element name="MinimumFrameRate" type="xs:int" minOccurs="0">
818-
<xs:annotation>
819-
<xs:documentation>The minimum output framerate in fps.</xs:documentation>
820-
</xs:annotation>
821-
</xs:element>
822-
<xs:element name="CompressionStrength" type="xs:int" minOccurs="0">
823-
<xs:annotation>
824-
<xs:documentation>Level of compression of how the device can dynamically lower quality outside region of interest. 0 is disabled. At the maximum value, the highest compression is used.</xs:documentation>
825-
</xs:annotation>
826-
</xs:element>
827-
<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> <!-- first Vendor then ONVIF -->
812+
<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> <!-- first ONVIF then Vendor -->
828813
</xs:sequence>
829814
</xs:complexType>
830815
<!--===============================-->
@@ -1100,11 +1085,6 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
11001085
<xs:documentation>Optional element to configure rate control related parameters.</xs:documentation>
11011086
</xs:annotation>
11021087
</xs:element>
1103-
<xs:element name="DynamicCompression" type="tt:DynamicCompression" minOccurs="0">
1104-
<xs:annotation>
1105-
<xs:documentation>Optional element to configure dynamic compression related parameters.</xs:documentation>
1106-
</xs:annotation>
1107-
</xs:element>
11081088
<xs:element name="Multicast" type="tt:MulticastConfiguration" minOccurs="0">
11091089
<xs:annotation>
11101090
<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
@@ -1115,6 +1095,11 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
11151095
<xs:documentation>Relative value for the video quantizers and the quality of the video. A high value within supported quality range means higher quality</xs:documentation>
11161096
</xs:annotation>
11171097
</xs:element>
1098+
<xs:element name="DynamicEncoding" type="tt:DynamicEncoding" minOccurs="0">
1099+
<xs:annotation>
1100+
<xs:documentation>Optional element to configure dynamic encoding related parameters.</xs:documentation>
1101+
</xs:annotation>
1102+
</xs:element>
11181103
<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> <!-- first ONVIF then Vendor -->
11191104
</xs:sequence>
11201105
<xs:attribute name="GovLength" type="xs:int">
@@ -1260,27 +1245,12 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO
12601245
</xs:attribute>
12611246
<xs:attribute name="DynamicGovSupported" type="xs:boolean">
12621247
<xs:annotation>
1263-
<xs:documentation>Indicates the support for enabling Dynamic GOV and setting MaximumGovLength.</xs:documentation>
1248+
<xs:documentation>Indicates the support for enabling DynamicGOV.</xs:documentation>
12641249
</xs:annotation>
12651250
</xs:attribute>
12661251
<xs:attribute name="DynamicFpsSupported" type="xs:boolean">
12671252
<xs:annotation>
1268-
<xs:documentation>Indicates the support for enabling Dynamic FPS and setting MinimunFrameRate.</xs:documentation>
1269-
</xs:annotation>
1270-
</xs:attribute>
1271-
<xs:attribute name="DynamicCompressionSupported" type="xs:boolean">
1272-
<xs:annotation>
1273-
<xs:documentation>Indicates the support for CompressionStrength configuration.</xs:documentation>
1274-
</xs:annotation>
1275-
</xs:attribute>
1276-
<xs:attribute name="MaximumGovLengthLimit" type="xs:int">
1277-
<xs:annotation>
1278-
<xs:documentation>Indicates the maximum allowed gov length when Dynamic Gov is enabled.</xs:documentation>
1279-
</xs:annotation>
1280-
</xs:attribute>
1281-
<xs:attribute name="MaximumDynamicCompressionStrength" type="xs:int">
1282-
<xs:annotation>
1283-
<xs:documentation>Indicates the maximum strength value for dynamic compression.</xs:documentation>
1253+
<xs:documentation>Indicates the support for enabling DynamicFPS.</xs:documentation>
12841254
</xs:annotation>
12851255
</xs:attribute>
12861256
<xs:anyAttribute processContents="lax"/>

0 commit comments

Comments
 (0)