Skip to content

Commit ebfd212

Browse files
authored
Camera AVStreamMgmt SDK changes for spec updates (#36447)
* Incorporate Spec updates to CameraAVStreamMgmt cluster - Use Alchemy to re-generate the xml. - Add feature tag to attributes and commands. - Remove SetViewport and ImageRotation commands. * Autogenerated files after running zap_regen_all.py.
1 parent a0992d0 commit ebfd212

34 files changed

+1240
-5185
lines changed

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

+328-108
Large diffs are not rendered by default.

src/controller/data_model/controller-clusters.matter

+24-52
Original file line numberDiff line numberDiff line change
@@ -9566,12 +9566,12 @@ provisional cluster CameraAvStreamManagement = 1361 {
95669566
}
95679567

95689568
bitmap Feature : bitmap32 {
9569-
kPrivacy = 0x1;
9570-
kAudio = 0x2;
9571-
kSpeaker = 0x4;
9572-
kImageControl = 0x8;
9573-
kVideo = 0x10;
9574-
kSnapshot = 0x20;
9569+
kAudio = 0x1;
9570+
kVideo = 0x2;
9571+
kSnapshot = 0x4;
9572+
kPrivacy = 0x8;
9573+
kSpeaker = 0x10;
9574+
kImageControl = 0x20;
95759575
kWatermark = 0x40;
95769576
kOnScreenDisplay = 0x80;
95779577
kLocalStorage = 0x100;
@@ -9715,27 +9715,23 @@ provisional cluster CameraAvStreamManagement = 1361 {
97159715
readonly attribute optional boolean hardPrivacyModeOn = 23;
97169716
attribute access(read: manage, write: manage) optional TriStateAutoEnum nightVision = 24;
97179717
attribute access(read: manage, write: manage) optional TriStateAutoEnum nightVisionIllum = 25;
9718-
attribute access(read: manage, write: manage) optional boolean AWBEnabled = 26;
9719-
attribute access(read: manage, write: manage) optional boolean autoShutterSpeedEnabled = 27;
9720-
attribute access(read: manage, write: manage) optional boolean autoISOEnabled = 28;
9721-
readonly attribute optional ViewportStruct viewport = 29;
9722-
attribute access(read: manage, write: manage) optional boolean speakerMuted = 30;
9723-
attribute access(read: manage, write: manage) optional int8u speakerVolumeLevel = 31;
9724-
attribute access(read: manage, write: manage) optional int8u speakerMaxLevel = 32;
9725-
attribute access(read: manage, write: manage) optional int8u speakerMinLevel = 33;
9726-
attribute access(read: manage, write: manage) optional boolean microphoneMuted = 34;
9727-
attribute access(read: manage, write: manage) optional int8u microphoneVolumeLevel = 35;
9728-
attribute access(read: manage, write: manage) optional int8u microphoneMaxLevel = 36;
9729-
attribute access(read: manage, write: manage) optional int8u microphoneMinLevel = 37;
9730-
attribute access(read: manage, write: manage) optional boolean microphoneAGCEnabled = 38;
9731-
readonly attribute optional int16u imageRotation = 39;
9732-
readonly attribute optional boolean imageFlipHorizontal = 40;
9733-
readonly attribute optional boolean imageFlipVertical = 41;
9734-
attribute access(read: manage, write: manage) optional boolean localVideoRecordingEnabled = 42;
9735-
attribute access(read: manage, write: manage) optional boolean localSnapshotRecordingEnabled = 43;
9736-
attribute access(read: manage, write: manage) optional boolean statusLightEnabled = 44;
9737-
attribute access(read: manage, write: manage) optional ThreeLevelAutoEnum statusLightBrightness = 45;
9738-
attribute access(read: manage, write: manage) optional TriStateAutoEnum depthSensorStatus = 46;
9718+
attribute access(read: manage, write: manage) optional ViewportStruct viewport = 26;
9719+
attribute access(read: manage, write: manage) optional boolean speakerMuted = 27;
9720+
attribute access(read: manage, write: manage) optional int8u speakerVolumeLevel = 28;
9721+
readonly attribute access(read: manage) optional int8u speakerMaxLevel = 29;
9722+
readonly attribute access(read: manage) optional int8u speakerMinLevel = 30;
9723+
attribute access(read: manage, write: manage) optional boolean microphoneMuted = 31;
9724+
attribute access(read: manage, write: manage) optional int8u microphoneVolumeLevel = 32;
9725+
readonly attribute access(read: manage) optional int8u microphoneMaxLevel = 33;
9726+
readonly attribute access(read: manage) optional int8u microphoneMinLevel = 34;
9727+
attribute access(read: manage, write: manage) optional boolean microphoneAGCEnabled = 35;
9728+
attribute access(read: manage, write: manage) optional int16u imageRotation = 36;
9729+
attribute access(read: manage, write: manage) optional boolean imageFlipHorizontal = 37;
9730+
attribute access(read: manage, write: manage) optional boolean imageFlipVertical = 38;
9731+
attribute access(read: manage, write: manage) optional boolean localVideoRecordingEnabled = 39;
9732+
attribute access(read: manage, write: manage) optional boolean localSnapshotRecordingEnabled = 40;
9733+
attribute access(read: manage, write: manage) optional boolean statusLightEnabled = 41;
9734+
attribute access(read: manage, write: manage) optional ThreeLevelAutoEnum statusLightBrightness = 42;
97399735
readonly attribute command_id generatedCommandList[] = 65528;
97409736
readonly attribute command_id acceptedCommandList[] = 65529;
97419737
readonly attribute event_id eventList[] = 65530;
@@ -9822,22 +9818,6 @@ provisional cluster CameraAvStreamManagement = 1361 {
98229818
VideoResolutionStruct resolution = 2;
98239819
}
98249820

9825-
request struct SetViewportRequest {
9826-
ViewportStruct viewport = 0;
9827-
}
9828-
9829-
request struct SetImageRotationRequest {
9830-
int16u angle = 0;
9831-
}
9832-
9833-
request struct SetImageFlipHorizontalRequest {
9834-
boolean enabled = 0;
9835-
}
9836-
9837-
request struct SetImageFlipVerticalRequest {
9838-
boolean enabled = 0;
9839-
}
9840-
98419821
/** This command SHALL allocate an audio stream on the camera and return an allocated audio stream identifier. */
98429822
command access(invoke: manage) AudioStreamAllocate(AudioStreamAllocateRequest): AudioStreamAllocateResponse = 0;
98439823
/** This command SHALL deallocate an audio stream on the camera, corresponding to the given audio stream identifier. */
@@ -9855,15 +9835,7 @@ provisional cluster CameraAvStreamManagement = 1361 {
98559835
/** This command SHALL set the relative priorities of the various stream types on the camera. */
98569836
command access(invoke: administer) SetStreamPriorities(SetStreamPrioritiesRequest): DefaultSuccess = 10;
98579837
/** This command SHALL return a Snapshot from the camera. */
9858-
command access(invoke: manage) CaptureSnapshot(CaptureSnapshotRequest): DefaultSuccess = 11;
9859-
/** This command sets the viewport in all video streams. */
9860-
command access(invoke: manage) SetViewport(SetViewportRequest): DefaultSuccess = 13;
9861-
/** The data fields for this command SHALL be as follows: */
9862-
command access(invoke: manage) SetImageRotation(SetImageRotationRequest): DefaultSuccess = 14;
9863-
/** The data fields for this command SHALL be as follows: */
9864-
command access(invoke: manage) SetImageFlipHorizontal(SetImageFlipHorizontalRequest): DefaultSuccess = 15;
9865-
/** The data fields for this command SHALL be as follows: */
9866-
command access(invoke: manage) SetImageFlipVertical(SetImageFlipVerticalRequest): DefaultSuccess = 16;
9838+
command CaptureSnapshot(CaptureSnapshotRequest): DefaultSuccess = 11;
98679839
}
98689840

98699841
/** The WebRTC transport provider cluster provides a way for stream providers (e.g. Cameras) to stream or receive their data through WebRTC. */

0 commit comments

Comments
 (0)