Skip to content

Commit

Permalink
Removal of 2 redundant attributes in CameraAVStreamMgmt cluster. (#36478
Browse files Browse the repository at this point in the history 
)

SDK update for corresponding Spec change.
Remove the CurrentSnapshotConfig and CurrentVideoCodecs as they
are captured by the Allocated Video and Snapshot stream attributes.
Also, fix a field name in the Snapshotstream allocation command.

Run ZAP regen for the corresponding changes.
  • Loading branch information
@pidarped @pull
pidarped authored and pull[bot] committed Dec 11, 2024
1 parent 14f4055 commit 4880753
Show file tree
Hide file tree
Showing 29 changed files with 423 additions and 1,519 deletions.
72 changes: 29 additions & 43 deletions src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
XML generated by Alchemy; DO NOT EDIT.
Source: src/app_clusters/CameraAVStreamManagement.adoc
Parameters: in-progress
Git: 1.3-3824-g29c49ca54
Git: 1.3-3830-g1f08d6f40
-->
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
<domain name="Cameras"/>
Expand Down Expand Up @@ -239,62 +239,48 @@ Git: 1.3-3824-g29c49ca54
<feature name="VDO"/>
</optionalConform>
</attribute>
<attribute code="0x000E" side="server" define="CURRENT_VIDEO_CODECS" type="array" entryType="VideoCodecEnum" optional="true">
<description>CurrentVideoCodecs</description>
<mandatoryConform>
<feature name="VDO"/>
</mandatoryConform>
</attribute>
<attribute code="0x000F" side="server" define="CURRENT_SNAPSHOT_CONFIG" type="SnapshotParamsStruct" optional="true">
<description>CurrentSnapshotConfig</description>
<mandatoryConform>
<feature name="SNP"/>
</mandatoryConform>
</attribute>
<attribute code="0x0010" side="server" define="FABRICS_USING_CAMERA" type="array" entryType="fabric_idx">FabricsUsingCamera</attribute>
<attribute code="0x0011" side="server" define="ALLOCATED_VIDEO_STREAMS" type="array" entryType="VideoStreamStruct" optional="true">
<attribute code="0x000E" side="server" define="FABRICS_USING_CAMERA" type="array" entryType="fabric_idx">FabricsUsingCamera</attribute>
<attribute code="0x000F" side="server" define="ALLOCATED_VIDEO_STREAMS" type="array" entryType="VideoStreamStruct" optional="true">
<description>AllocatedVideoStreams</description>
<mandatoryConform>
<feature name="VDO"/>
</mandatoryConform>
</attribute>
<attribute code="0x0012" side="server" define="ALLOCATED_AUDIO_STREAMS" type="array" entryType="AudioStreamStruct" optional="true">
<attribute code="0x0010" side="server" define="ALLOCATED_AUDIO_STREAMS" type="array" entryType="AudioStreamStruct" optional="true">
<description>AllocatedAudioStreams</description>
<mandatoryConform>
<feature name="ADO"/>
</mandatoryConform>
</attribute>
<attribute code="0x0013" side="server" define="ALLOCATED_SNAPSHOT_STREAMS" type="array" entryType="SnapshotStreamStruct" optional="true">
<attribute code="0x0011" side="server" define="ALLOCATED_SNAPSHOT_STREAMS" type="array" entryType="SnapshotStreamStruct" optional="true">
<description>AllocatedSnapshotStreams</description>
<mandatoryConform>
<feature name="SNP"/>
</mandatoryConform>
</attribute>
<attribute code="0x0014" side="server" define="RANKED_VIDEO_STREAM_PRIORITIES_LIST" type="array" entryType="StreamTypeEnum" writable="true" optional="true">
<attribute code="0x0012" side="server" define="RANKED_VIDEO_STREAM_PRIORITIES_LIST" type="array" entryType="StreamTypeEnum" optional="true">
<description>RankedVideoStreamPrioritiesList</description>
<access op="read" privilege="administer"/>
<access op="write" privilege="administer"/>
<mandatoryConform>
<feature name="VDO"/>
</mandatoryConform>
</attribute>
<attribute code="0x0015" side="server" define="SOFT_RECORDING_PRIVACY_MODE_ENABLED" type="boolean" default="0" writable="true" optional="true">
<attribute code="0x0013" side="server" define="SOFT_RECORDING_PRIVACY_MODE_ENABLED" type="boolean" default="0" writable="true" optional="true">
<description>SoftRecordingPrivacyModeEnabled</description>
<mandatoryConform>
<feature name="PRIV"/>
</mandatoryConform>
</attribute>
<attribute code="0x0016" side="server" define="SOFT_LIVESTREAM_PRIVACY_MODE_ENABLED" type="boolean" default="0" writable="true" optional="true">
<attribute code="0x0014" side="server" define="SOFT_LIVESTREAM_PRIVACY_MODE_ENABLED" type="boolean" default="0" writable="true" optional="true">
<description>SoftLivestreamPrivacyModeEnabled</description>
<mandatoryConform>
<feature name="PRIV"/>
</mandatoryConform>
</attribute>
<attribute code="0x0017" side="server" define="HARD_PRIVACY_MODE_ON" type="boolean" default="0" optional="true">
<attribute code="0x0015" side="server" define="HARD_PRIVACY_MODE_ON" type="boolean" default="0" optional="true">
<description>HardPrivacyModeOn</description>
<optionalConform/>
</attribute>
<attribute code="0x0018" side="server" define="NIGHT_VISION" type="TriStateAutoEnum" min="0x00" max="0x02" writable="true" optional="true">
<attribute code="0x0016" side="server" define="NIGHT_VISION" type="TriStateAutoEnum" min="0x00" max="0x02" writable="true" optional="true">
<description>NightVision</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
Expand All @@ -305,7 +291,7 @@ Git: 1.3-3824-g29c49ca54
</orTerm>
</optionalConform>
</attribute>
<attribute code="0x0019" side="server" define="NIGHT_VISION_ILLUM" type="TriStateAutoEnum" min="0x00" max="0x02" writable="true" optional="true">
<attribute code="0x0017" side="server" define="NIGHT_VISION_ILLUM" type="TriStateAutoEnum" min="0x00" max="0x02" writable="true" optional="true">
<description>NightVisionIllum</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
Expand All @@ -316,15 +302,15 @@ Git: 1.3-3824-g29c49ca54
</orTerm>
</optionalConform>
</attribute>
<attribute code="0x001A" side="server" define="VIEWPORT" type="ViewportStruct" writable="true" optional="true">
<attribute code="0x0018" side="server" define="VIEWPORT" type="ViewportStruct" writable="true" optional="true">
<description>Viewport</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
<mandatoryConform>
<feature name="VDO"/>
</mandatoryConform>
</attribute>
<attribute code="0x001B" side="server" define="SPEAKER_MUTED" type="boolean" default="0" writable="true" optional="true">
<attribute code="0x0019" side="server" define="SPEAKER_MUTED" type="boolean" default="0" writable="true" optional="true">
<description>SpeakerMuted</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
Expand All @@ -335,7 +321,7 @@ Git: 1.3-3824-g29c49ca54
</andTerm>
</mandatoryConform>
</attribute>
<attribute code="0x001C" side="server" define="SPEAKER_VOLUME_LEVEL" type="int8u" max="254" writable="true" optional="true">
<attribute code="0x001A" side="server" define="SPEAKER_VOLUME_LEVEL" type="int8u" max="254" writable="true" optional="true">
<description>SpeakerVolumeLevel</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
Expand All @@ -346,7 +332,7 @@ Git: 1.3-3824-g29c49ca54
</andTerm>
</mandatoryConform>
</attribute>
<attribute code="0x001D" side="server" define="SPEAKER_MAX_LEVEL" type="int8u" max="254" optional="true">
<attribute code="0x001B" side="server" define="SPEAKER_MAX_LEVEL" type="int8u" max="254" optional="true">
<description>SpeakerMaxLevel</description>
<access op="read" privilege="manage"/>
<mandatoryConform>
Expand All @@ -356,7 +342,7 @@ Git: 1.3-3824-g29c49ca54
</andTerm>
</mandatoryConform>
</attribute>
<attribute code="0x001E" side="server" define="SPEAKER_MIN_LEVEL" type="int8u" max="254" optional="true">
<attribute code="0x001C" side="server" define="SPEAKER_MIN_LEVEL" type="int8u" max="254" optional="true">
<description>SpeakerMinLevel</description>
<access op="read" privilege="manage"/>
<mandatoryConform>
Expand All @@ -366,69 +352,69 @@ Git: 1.3-3824-g29c49ca54
</andTerm>
</mandatoryConform>
</attribute>
<attribute code="0x001F" side="server" define="MICROPHONE_MUTED" type="boolean" default="0" writable="true" optional="true">
<attribute code="0x001D" side="server" define="MICROPHONE_MUTED" type="boolean" default="0" writable="true" optional="true">
<description>MicrophoneMuted</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
<mandatoryConform>
<feature name="ADO"/>
</mandatoryConform>
</attribute>
<attribute code="0x0020" side="server" define="MICROPHONE_VOLUME_LEVEL" type="int8u" max="254" writable="true" optional="true">
<attribute code="0x001E" side="server" define="MICROPHONE_VOLUME_LEVEL" type="int8u" max="254" writable="true" optional="true">
<description>MicrophoneVolumeLevel</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
<mandatoryConform>
<feature name="ADO"/>
</mandatoryConform>
</attribute>
<attribute code="0x0021" side="server" define="MICROPHONE_MAX_LEVEL" type="int8u" max="254" optional="true">
<attribute code="0x001F" side="server" define="MICROPHONE_MAX_LEVEL" type="int8u" max="254" optional="true">
<description>MicrophoneMaxLevel</description>
<access op="read" privilege="manage"/>
<mandatoryConform>
<feature name="ADO"/>
</mandatoryConform>
</attribute>
<attribute code="0x0022" side="server" define="MICROPHONE_MIN_LEVEL" type="int8u" max="254" optional="true">
<attribute code="0x0020" side="server" define="MICROPHONE_MIN_LEVEL" type="int8u" max="254" optional="true">
<description>MicrophoneMinLevel</description>
<access op="read" privilege="manage"/>
<mandatoryConform>
<feature name="ADO"/>
</mandatoryConform>
</attribute>
<attribute code="0x0023" side="server" define="MICROPHONE_AGCENABLED" type="boolean" default="1" writable="true" optional="true">
<attribute code="0x0021" side="server" define="MICROPHONE_AGCENABLED" type="boolean" default="1" writable="true" optional="true">
<description>MicrophoneAGCEnabled</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
<optionalConform>
<feature name="ADO"/>
</optionalConform>
</attribute>
<attribute code="0x0024" side="server" define="IMAGE_ROTATION" type="int16u" max="359" writable="true" optional="true">
<attribute code="0x0022" side="server" define="IMAGE_ROTATION" type="int16u" max="359" writable="true" optional="true">
<description>ImageRotation</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
<optionalConform choice="b" more="true" min="1">
<feature name="ICTL"/>
</optionalConform>
</attribute>
<attribute code="0x0025" side="server" define="IMAGE_FLIP_HORIZONTAL" type="boolean" default="0" writable="true" optional="true">
<attribute code="0x0023" side="server" define="IMAGE_FLIP_HORIZONTAL" type="boolean" default="0" writable="true" optional="true">
<description>ImageFlipHorizontal</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
<optionalConform choice="b" more="true" min="1">
<feature name="ICTL"/>
</optionalConform>
</attribute>
<attribute code="0x0026" side="server" define="IMAGE_FLIP_VERTICAL" type="boolean" default="0" writable="true" optional="true">
<attribute code="0x0024" side="server" define="IMAGE_FLIP_VERTICAL" type="boolean" default="0" writable="true" optional="true">
<description>ImageFlipVertical</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
<optionalConform choice="b" more="true" min="1">
<feature name="ICTL"/>
</optionalConform>
</attribute>
<attribute code="0x0027" side="server" define="LOCAL_VIDEO_RECORDING_ENABLED" type="boolean" default="0" writable="true" optional="true">
<attribute code="0x0025" side="server" define="LOCAL_VIDEO_RECORDING_ENABLED" type="boolean" default="0" writable="true" optional="true">
<description>LocalVideoRecordingEnabled</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
Expand All @@ -439,7 +425,7 @@ Git: 1.3-3824-g29c49ca54
</andTerm>
</mandatoryConform>
</attribute>
<attribute code="0x0028" side="server" define="LOCAL_SNAPSHOT_RECORDING_ENABLED" type="boolean" default="0" writable="true" optional="true">
<attribute code="0x0026" side="server" define="LOCAL_SNAPSHOT_RECORDING_ENABLED" type="boolean" default="0" writable="true" optional="true">
<description>LocalSnapshotRecordingEnabled</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
Expand All @@ -450,13 +436,13 @@ Git: 1.3-3824-g29c49ca54
</andTerm>
</mandatoryConform>
</attribute>
<attribute code="0x0029" side="server" define="STATUS_LIGHT_ENABLED" type="boolean" default="1" writable="true" optional="true">
<attribute code="0x0027" side="server" define="STATUS_LIGHT_ENABLED" type="boolean" default="1" writable="true" optional="true">
<description>StatusLightEnabled</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
<optionalConform/>
</attribute>
<attribute code="0x002A" side="server" define="STATUS_LIGHT_BRIGHTNESS" type="ThreeLevelAutoEnum" min="0x00" max="0x03" writable="true" optional="true">
<attribute code="0x0028" side="server" define="STATUS_LIGHT_BRIGHTNESS" type="ThreeLevelAutoEnum" min="0x00" max="0x03" writable="true" optional="true">
<description>StatusLightBrightness</description>
<access op="read" privilege="manage"/>
<access op="write" privilege="manage"/>
Expand Down Expand Up @@ -546,7 +532,7 @@ Git: 1.3-3824-g29c49ca54
<description>This command SHALL allocate a snapshot stream on the device and return an allocated snapshot stream identifier.</description>
<access op="invoke" privilege="manage"/>
<arg id="1" name="ImageCodec" type="ImageCodecEnum" min="0x00" max="0x00"/>
<arg id="2" name="FrameRate" type="int16u" min="1"/>
<arg id="2" name="MaxFrameRate" type="int16u" min="1"/>
<arg id="3" name="BitRate" type="int32u" min="1"/>
<arg id="4" name="MinResolution" type="VideoResolutionStruct"/>
<arg id="5" name="MaxResolution" type="VideoResolutionStruct"/>
Expand Down
1 change: 0 additions & 1 deletion src/app/zap-templates/zcl/zcl-with-test-extensions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,6 @@
"MinViewport",
"MicrophoneCapabilities",
"SpeakerCapabilities",
"CurrentSnapshotConfig",
"Viewport"
]
},
Expand Down
1 change: 0 additions & 1 deletion src/app/zap-templates/zcl/zcl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,6 @@
"MinViewport",
"MicrophoneCapabilities",
"SpeakerCapabilities",
"CurrentSnapshotConfig",
"Viewport"
]
},
Expand Down
Loading

0 comments on commit 4880753

Please sign in to comment.