Skip to content

Commit c92b4c3

Browse files
pidarpedpidarped
committed
Update CameraAVStreamMgmt xml to reflect spec changes.
1 parent 28c1d83 commit c92b4c3

File tree

1 file changed

+85
-111
lines changed

1 file changed

+85
-111
lines changed

‎src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml

+85-111
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/app_clusters/CameraAVStreamManagement.adoc
2020
Parameters: in-progress
21-
Git: 1.4-526-g306635762
21+
Git: 0.7-summer-2025-285-g2a2bd1961
2222
-->
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="Cameras"/>
@@ -111,9 +111,8 @@ Git: 1.4-526-g306635762
111111
<cluster code="0x0551"/>
112112
<item fieldId="0" name="SensorWidth" type="int16u" min="64"/>
113113
<item fieldId="1" name="SensorHeight" type="int16u" min="64"/>
114-
<item fieldId="2" name="HDRCapable" type="boolean"/>
115-
<item fieldId="3" name="MaxFPS" type="int16u" min="1"/>
116-
<item fieldId="4" name="MaxHDRFPS" type="int16u" min="1"/>
114+
<item fieldId="2" name="MaxFPS" type="int16u" min="1"/>
115+
<item fieldId="3" name="MaxHDRFPS" type="int16u" optional="true"/>
117116
</struct>
118117

119118
<struct name="VideoStreamStruct" apiMaturity="provisional">
@@ -188,12 +187,7 @@ Git: 1.4-526-g306635762
188187
<feature name="VDO"/>
189188
</mandatoryConform>
190189
</attribute>
191-
<attribute code="0x0006" side="server" define="MAX_CONTENT_BUFFER_SIZE" type="int32u" optional="true">
192-
<description>MaxContentBufferSize</description>
193-
<mandatoryConform>
194-
<feature name="VDO"/>
195-
</mandatoryConform>
196-
</attribute>
190+
<attribute code="0x0006" side="server" define="MAX_CONTENT_BUFFER_SIZE" type="int32u">MaxContentBufferSize</attribute>
197191
<attribute code="0x0007" side="server" define="MICROPHONE_CAPABILITIES" type="AudioCapabilitiesStruct" optional="true">
198192
<description>MicrophoneCapabilities</description>
199193
<mandatoryConform>
@@ -203,19 +197,13 @@ Git: 1.4-526-g306635762
203197
<attribute code="0x0008" side="server" define="SPEAKER_CAPABILITIES" type="AudioCapabilitiesStruct" optional="true">
204198
<description>SpeakerCapabilities</description>
205199
<mandatoryConform>
206-
<andTerm>
207-
<feature name="ADO"/>
208-
<feature name="SPKR"/>
209-
</andTerm>
200+
<feature name="SPKR"/>
210201
</mandatoryConform>
211202
</attribute>
212203
<attribute code="0x0009" side="server" define="TWO_WAY_TALK_SUPPORT" type="TwoWayTalkSupportTypeEnum" min="0x00" max="0x02" optional="true">
213204
<description>TwoWayTalkSupport</description>
214205
<mandatoryConform>
215-
<andTerm>
216-
<feature name="ADO"/>
217-
<feature name="SPKR"/>
218-
</andTerm>
206+
<feature name="SPKR"/>
219207
</mandatoryConform>
220208
</attribute>
221209
<attribute code="0x000A" side="server" define="SUPPORTED_SNAPSHOT_PARAMS" type="array" entryType="SnapshotParamsStruct" optional="true">
@@ -235,11 +223,11 @@ Git: 1.4-526-g306635762
235223
<description>HDRModeEnabled</description>
236224
<access op="read" privilege="manage"/>
237225
<access op="write" privilege="manage"/>
238-
<optionalConform>
239-
<feature name="VDO"/>
240-
</optionalConform>
226+
<mandatoryConform>
227+
<feature name="HDR"/>
228+
</mandatoryConform>
241229
</attribute>
242-
<attribute code="0x000E" side="server" define="FABRICS_USING_CAMERA" type="array" entryType="fabric_idx">FabricsUsingCamera</attribute>
230+
<attribute code="0x000E" side="server" define="FABRICS_USING_CAMERA" type="array" entryType="StreamUsageEnum">SupportedStreamUsages</attribute>
243231
<attribute code="0x000F" side="server" define="ALLOCATED_VIDEO_STREAMS" type="array" entryType="VideoStreamStruct" optional="true">
244232
<description>AllocatedVideoStreams</description>
245233
<mandatoryConform>
@@ -315,41 +303,29 @@ Git: 1.4-526-g306635762
315303
<access op="read" privilege="manage"/>
316304
<access op="write" privilege="manage"/>
317305
<mandatoryConform>
318-
<andTerm>
319-
<feature name="ADO"/>
320-
<feature name="SPKR"/>
321-
</andTerm>
306+
<feature name="SPKR"/>
322307
</mandatoryConform>
323308
</attribute>
324309
<attribute code="0x001A" side="server" define="SPEAKER_VOLUME_LEVEL" type="int8u" max="254" writable="true" optional="true">
325310
<description>SpeakerVolumeLevel</description>
326311
<access op="read" privilege="manage"/>
327312
<access op="write" privilege="manage"/>
328313
<mandatoryConform>
329-
<andTerm>
330-
<feature name="ADO"/>
331-
<feature name="SPKR"/>
332-
</andTerm>
314+
<feature name="SPKR"/>
333315
</mandatoryConform>
334316
</attribute>
335317
<attribute code="0x001B" side="server" define="SPEAKER_MAX_LEVEL" type="int8u" max="254" optional="true">
336318
<description>SpeakerMaxLevel</description>
337319
<access op="read" privilege="manage"/>
338320
<mandatoryConform>
339-
<andTerm>
340-
<feature name="ADO"/>
341-
<feature name="SPKR"/>
342-
</andTerm>
321+
<feature name="SPKR"/>
343322
</mandatoryConform>
344323
</attribute>
345324
<attribute code="0x001C" side="server" define="SPEAKER_MIN_LEVEL" type="int8u" max="254" optional="true">
346325
<description>SpeakerMinLevel</description>
347326
<access op="read" privilege="manage"/>
348327
<mandatoryConform>
349-
<andTerm>
350-
<feature name="ADO"/>
351-
<feature name="SPKR"/>
352-
</andTerm>
328+
<feature name="SPKR"/>
353329
</mandatoryConform>
354330
</attribute>
355331
<attribute code="0x001D" side="server" define="MICROPHONE_MUTED" type="boolean" default="0" writable="true" optional="true">
@@ -482,18 +458,18 @@ Git: 1.4-526-g306635762
482458
<command code="0x03" source="client" name="VideoStreamAllocate" optional="true" response="VideoStreamAllocateResponse">
483459
<description>This command SHALL allocate a video stream on the camera and return an allocated video stream identifier.</description>
484460
<access op="invoke" privilege="manage"/>
485-
<arg id="1" name="StreamUsage" type="StreamUsageEnum" min="0x00" max="0x03"/>
486-
<arg id="2" name="VideoCodec" type="VideoCodecEnum" min="0x00" max="0x03"/>
487-
<arg id="3" name="MinFrameRate" type="int16u" min="1"/>
488-
<arg id="4" name="MaxFrameRate" type="int16u" min="1"/>
489-
<arg id="5" name="MinResolution" type="VideoResolutionStruct"/>
490-
<arg id="6" name="MaxResolution" type="VideoResolutionStruct"/>
491-
<arg id="7" name="MinBitRate" type="int32u" min="1"/>
492-
<arg id="8" name="MaxBitRate" type="int32u" min="1"/>
493-
<arg id="9" name="MinFragmentLen" type="int16u" default="4000" max="65500"/>
494-
<arg id="10" name="MaxFragmentLen" type="int16u" default="4000" max="65500"/>
495-
<arg id="11" name="WatermarkEnabled" type="boolean" optional="true" default="0"/>
496-
<arg id="12" name="OSDEnabled" type="boolean" optional="true" default="0"/>
461+
<arg id="0" name="StreamUsage" type="StreamUsageEnum" min="0x00" max="0x03"/>
462+
<arg id="1" name="VideoCodec" type="VideoCodecEnum" min="0x00" max="0x03"/>
463+
<arg id="2" name="MinFrameRate" type="int16u" min="1"/>
464+
<arg id="3" name="MaxFrameRate" type="int16u" min="1"/>
465+
<arg id="4" name="MinResolution" type="VideoResolutionStruct"/>
466+
<arg id="5" name="MaxResolution" type="VideoResolutionStruct"/>
467+
<arg id="6" name="MinBitRate" type="int32u" min="1"/>
468+
<arg id="7" name="MaxBitRate" type="int32u" min="1"/>
469+
<arg id="8" name="MinFragmentLen" type="int16u" default="4000" max="65500"/>
470+
<arg id="9" name="MaxFragmentLen" type="int16u" default="4000" max="65500"/>
471+
<arg id="10" name="WatermarkEnabled" type="boolean" optional="true" default="0"/>
472+
<arg id="11" name="OSDEnabled" type="boolean" optional="true" default="0"/>
497473
<mandatoryConform>
498474
<feature name="VDO"/>
499475
</mandatoryConform>
@@ -536,12 +512,14 @@ Git: 1.4-526-g306635762
536512
<command code="0x07" source="client" name="SnapshotStreamAllocate" optional="true" response="SnapshotStreamAllocateResponse">
537513
<description>This command SHALL allocate a snapshot stream on the device and return an allocated snapshot stream identifier.</description>
538514
<access op="invoke" privilege="manage"/>
539-
<arg id="1" name="ImageCodec" type="ImageCodecEnum" min="0x00" max="0x00"/>
540-
<arg id="2" name="MaxFrameRate" type="int16u" min="1"/>
541-
<arg id="3" name="BitRate" type="int32u" min="1"/>
542-
<arg id="4" name="MinResolution" type="VideoResolutionStruct"/>
543-
<arg id="5" name="MaxResolution" type="VideoResolutionStruct"/>
544-
<arg id="6" name="Quality" type="int8u" min="1" max="100"/>
515+
<arg id="0" name="ImageCodec" type="ImageCodecEnum" min="0x00" max="0x00"/>
516+
<arg id="1" name="MaxFrameRate" type="int16u" min="1"/>
517+
<arg id="2" name="BitRate" type="int32u" min="1"/>
518+
<arg id="3" name="MinResolution" type="VideoResolutionStruct"/>
519+
<arg id="4" name="MaxResolution" type="VideoResolutionStruct"/>
520+
<arg id="5" name="Quality" type="int8u" min="1" max="100"/>
521+
<arg id="6" name="WatermarkEnabled" type="boolean" optional="true" default="0"/>
522+
<arg id="7" name="OSDEnabled" type="boolean" optional="true" default="0"/>
545523
<mandatoryConform>
546524
<feature name="SNP"/>
547525
</mandatoryConform>
@@ -555,7 +533,24 @@ Git: 1.4-526-g306635762
555533
</mandatoryConform>
556534
</command>
557535

558-
<command code="0x09" source="client" name="SnapshotStreamDeallocate" optional="true">
536+
<command code="0x09" source="client" name="SnapshotStreamModify" optional="true">
537+
<description>This command SHALL be used to modify a stream specified by the VideoStreamID.</description>
538+
<access op="invoke" privilege="manage"/>
539+
<arg id="0" name="SnapshotStreamID" type="int16u"/>
540+
<arg id="1" name="WatermarkEnabled" type="boolean" optional="true"/>
541+
<arg id="2" name="OSDEnabled" type="boolean" optional="true"/>
542+
<mandatoryConform>
543+
<andTerm>
544+
<feature name="SNP"/>
545+
<orTerm>
546+
<feature name="WMARK"/>
547+
<feature name="OSD"/>
548+
</orTerm>
549+
</andTerm>
550+
</mandatoryConform>
551+
</command>
552+
553+
<command code="0x0A" source="client" name="SnapshotStreamDeallocate" optional="true">
559554
<description>This command SHALL deallocate an snapshot stream on the camera, corresponding to the given snapshot stream identifier.</description>
560555
<access op="invoke" privilege="manage"/>
561556
<arg id="0" name="SnapshotStreamID" type="int16u"/>
@@ -564,13 +559,13 @@ Git: 1.4-526-g306635762
564559
</mandatoryConform>
565560
</command>
566561

567-
<command code="0x0A" source="client" name="SetStreamPriorities" optional="false">
562+
<command code="0x0B" source="client" name="SetStreamPriorities" optional="false">
568563
<description>This command SHALL set the relative priorities of the various stream usages on the camera.</description>
569564
<access op="invoke" privilege="administer"/>
570-
<arg id="0" name="StreamPriorities" array="true" type="StreamUsageEnum"/>
565+
<arg id="0" name="StreamPriorities" type="StreamUsageEnum" array="true"/>
571566
</command>
572567

573-
<command code="0x0B" source="client" name="CaptureSnapshot" optional="true" response="CaptureSnapshotResponse">
568+
<command code="0x0C" source="client" name="CaptureSnapshot" optional="true" response="CaptureSnapshotResponse">
574569
<description>This command SHALL return a Snapshot from the camera.</description>
575570
<quality largeMessage="true"/>
576571
<arg id="0" name="SnapshotStreamID" type="int16u"/>
@@ -580,7 +575,7 @@ Git: 1.4-526-g306635762
580575
</mandatoryConform>
581576
</command>
582577

583-
<command code="0x0C" source="server" name="CaptureSnapshotResponse" optional="true" disableDefaultResponse="true">
578+
<command code="0x0D" source="server" name="CaptureSnapshotResponse" optional="true" disableDefaultResponse="true">
584579
<description>This command SHALL be sent by the device in response to the CaptureSnapshot command, carrying the requested snapshot.</description>
585580
<quality largeMessage="true"/>
586581
<arg id="0" name="Data" type="octet_string"/>
@@ -591,52 +586,6 @@ Git: 1.4-526-g306635762
591586
</mandatoryConform>
592587
</command>
593588

594-
<event code="0x0000" name="VideoStreamChanged" priority="info" side="server" optional="true">
595-
<field id="0" name="VideoStreamID" type="int16u"/>
596-
<field id="1" name="StreamUsage" type="StreamUsageEnum" optional="true" min="0x00" max="0x03"/>
597-
<field id="2" name="VideoCodec" type="VideoCodecEnum" optional="true" min="0x00" max="0x03"/>
598-
<field id="3" name="MinFrameRate" type="int16u" optional="true" min="1"/>
599-
<field id="4" name="MaxFrameRate" type="int16u" optional="true" min="1"/>
600-
<field id="5" name="MinResolution" type="VideoResolutionStruct" optional="true"/>
601-
<field id="6" name="MaxResolution" type="VideoResolutionStruct" optional="true"/>
602-
<field id="7" name="MinBitRate" type="int32u" optional="true" min="1"/>
603-
<field id="8" name="MaxBitRate" type="int32u" optional="true" min="1"/>
604-
<field id="9" name="MinFragmentLen" type="int16u" optional="true" max="65500"/>
605-
<field id="10" name="MaxFragmentLen" type="int16u" optional="true" max="65500"/>
606-
<description>This event SHALL be generated when there is a modification in the corresponding video stream.</description>
607-
<mandatoryConform>
608-
<feature name="VDO"/>
609-
</mandatoryConform>
610-
</event>
611-
612-
<event code="0x0001" name="AudioStreamChanged" priority="info" side="server" optional="true">
613-
<field id="0" name="AudioStreamID" type="int16u"/>
614-
<field id="1" name="StreamUsage" type="StreamUsageEnum" optional="true" min="0x00" max="0x03"/>
615-
<field id="2" name="AudioCodec" type="AudioCodecEnum" optional="true" min="0x00" max="0x01"/>
616-
<field id="3" name="ChannelCount" type="int8u" optional="true" min="1" max="8"/>
617-
<field id="4" name="SampleRate" type="int32u" optional="true" min="1"/>
618-
<field id="5" name="BitRate" type="int32u" optional="true" min="1"/>
619-
<field id="6" name="BitDepth" type="int8u" optional="true" min="8" max="32"/>
620-
<description>This event SHALL be generated when there is a modification in the corresponding audio stream.</description>
621-
<mandatoryConform>
622-
<feature name="ADO"/>
623-
</mandatoryConform>
624-
</event>
625-
626-
<event code="0x0002" name="SnapshotStreamChanged" priority="info" side="server" optional="true">
627-
<field id="0" name="SnapshotStreamID" type="int16u"/>
628-
<field id="1" name="ImageCodec" type="ImageCodecEnum" optional="true" min="0x00" max="0x00"/>
629-
<field id="2" name="FrameRate" type="int16u" optional="true" min="1"/>
630-
<field id="3" name="BitRate" type="int32u" optional="true" min="1"/>
631-
<field id="4" name="MinResolution" type="VideoResolutionStruct" optional="true"/>
632-
<field id="5" name="MaxResolution" type="VideoResolutionStruct" optional="true"/>
633-
<field id="6" name="Quality" type="int8u" optional="true" min="1" max="100"/>
634-
<description>This event SHALL be generated when there is a modification in the corresponding snapshot stream.</description>
635-
<mandatoryConform>
636-
<feature name="SNP"/>
637-
</mandatoryConform>
638-
</event>
639-
640589
<features>
641590
<feature bit="0" code="ADO" name="Audio" summary="Audio Streams supported">
642591
<optionalConform choice="a" more="true" min="1"/>
@@ -651,20 +600,45 @@ Git: 1.4-526-g306635762
651600
<optionalConform/>
652601
</feature>
653602
<feature bit="4" code="SPKR" name="Speaker" summary="Speaker supported">
654-
<optionalConform/>
603+
<optionalConform>
604+
<feature name="AUD"/>
605+
</optionalConform>
655606
</feature>
656607
<feature bit="5" code="ICTL" name="ImageControl" summary="Image control supported">
657-
<optionalConform/>
608+
<optionalConform>
609+
<orTerm>
610+
<feature name="VDO"/>
611+
<feature name="SNP"/>
612+
</orTerm>
613+
</optionalConform>
658614
</feature>
659615
<feature bit="6" code="WMARK" name="Watermark" summary="Watermark supported">
660-
<optionalConform/>
616+
<optionalConform>
617+
<orTerm>
618+
<feature name="VDO"/>
619+
<feature name="SNP"/>
620+
</orTerm>
621+
</optionalConform>
661622
</feature>
662623
<feature bit="7" code="OSD" name="OnScreenDisplay" summary="OSD supported">
663-
<optionalConform/>
624+
<optionalConform>
625+
<orTerm>
626+
<feature name="VDO"/>
627+
<feature name="SNP"/>
628+
</orTerm>
629+
</optionalConform>
664630
</feature>
665631
<feature bit="8" code="STOR" name="LocalStorage" summary="Local Storage available">
666632
<optionalConform/>
667633
</feature>
634+
<feature bit="9" code="HDR" name="HighDynamicRange" summary="High Dynamic Range supported">
635+
<optionalConform>
636+
<orTerm>
637+
<feature name="VDO"/>
638+
<feature name="SNP"/>
639+
</orTerm>
640+
</optionalConform>
641+
</feature>
668642
</features>
669643
</cluster>
670644
</configurator>

0 commit comments

Comments
 (0)