Skip to content

Commit b8e48ad

Browse files
pidarpedpidarped
committed
Definition of the Camera AV StreamManagement Cluster.
Spec in `cameras` branch. Draft PR: CHIP-Specifications/connectedhomeip-spec#10004
1 parent 7eb96cd commit b8e48ad

File tree

7 files changed

+700
-2
lines changed

7 files changed

+700
-2
lines changed

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ jobs:
109109
src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml \
110110
src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml \
111111
src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml \
112+
src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml \
112113
src/app/zap-templates/zcl/data-model/chip/chip-ota.xml \
113114
src/app/zap-templates/zcl/data-model/chip/chip-types.xml \
114115
src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml \

‎scripts/rules.matterlint

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml";
1414
load "../src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml";
1515
load "../src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml";
1616
load "../src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml";
17+
load "../src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml";
1718
load "../src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml";
1819
load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml";
1920
load "../src/app/zap-templates/zcl/data-model/chip/chip-types.xml";

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

+578
Large diffs are not rendered by default.

‎src/app/zap-templates/zcl/data-model/chip/global-enums.xml

+6
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,10 @@ TODO: Make these structures global rather than defining them for each cluster.
4040
<item name="FinalValue" value="0x02"/>
4141
</enum>
4242

43+
<enum name="ThreeLevelAutoEnum" type="enum8">
44+
<item name="Low" value="0x00"/>
45+
<item name="Medium" value="0x01"/>
46+
<item name="High" value="0x02"/>
47+
<item name="Auto" value="0x03"/>
48+
</enum>
4349
</configurator>

‎src/app/zap-templates/zcl/zcl-with-test-extensions.json

+55-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"boolean-state-configuration-cluster.xml",
2828
"actions-cluster.xml",
2929
"bridged-device-basic-information.xml",
30+
"camera-av-stream-management-cluster.xml",
3031
"chip-ota.xml",
3132
"channel-cluster.xml",
3233
"clusters-extensions.xml",
@@ -679,7 +680,60 @@
679680
"ThreadNetworks",
680681
"ThreadNetworkTableSize"
681682
],
682-
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
683+
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
684+
"Camera AV Stream Management": [
685+
"MaxConcurrentVideoEncoders",
686+
"MaxEncodedPixelRate",
687+
"VideoSensorParams",
688+
"NightVisionCapable",
689+
"MinViewPortWidth",
690+
"MinViewPortHeight",
691+
"RateDistortionTradeOffPoints",
692+
"MaxPreRollBufferSize",
693+
"MicrophoneCapabilities",
694+
"SpeakerCapabilities",
695+
"TwoWayTalkSupport",
696+
"SupportedSnapshotParams",
697+
"HDRCapable",
698+
"MaxNetworkBandwidth",
699+
"CurrentFrameRate",
700+
"HDRMode",
701+
"CurrentVideoCodecs",
702+
"CurrentSnapshotConfig",
703+
"FabricsUsingCamera",
704+
"AllocatedVideoStreams",
705+
"AllocatedAudioStreams",
706+
"AllocatedSnapshotStreams",
707+
"RankedVideoStreamPrioritiesList",
708+
"SoftRecordingPrivacyModeSetting",
709+
"SoftLivestreamPrivacyModeSetting",
710+
"HardPrivacyMode",
711+
"NightVision",
712+
"NightVisionIllum",
713+
"AWB",
714+
"ShutterSpeed",
715+
"ISO",
716+
"Viewport",
717+
"SpkrOnOff",
718+
"SpkrVolumeLevel",
719+
"SpkrMaxLevel",
720+
"SpkrMinLevel",
721+
"MicOnOff",
722+
"MicCurrentLevel",
723+
"MicMaxLevel",
724+
"MicMinLevel",
725+
"MicAGC",
726+
"ImageRotation",
727+
"ImageFlipHorizontal",
728+
"ImageFlipVertical",
729+
"LocalVideoRecordingEnabled",
730+
"LocalSnapshotRecordingEnabled",
731+
"StatusLight",
732+
"StatusLightBrightness",
733+
"DepthSensorStatus",
734+
"WatermarkEnabled",
735+
"OSDEnabled"
736+
]
683737
},
684738
"mandatoryDeviceTypes": "0x0016",
685739
"defaultReportingPolicy": "mandatory",

‎src/app/zap-templates/zcl/zcl.json

+55-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"boolean-state-configuration-cluster.xml",
2323
"actions-cluster.xml",
2424
"bridged-device-basic-information.xml",
25+
"camera-av-stream-management-cluster.xml",
2526
"chip-ota.xml",
2627
"channel-cluster.xml",
2728
"clusters-extensions.xml",
@@ -673,7 +674,60 @@
673674
"ThreadNetworks",
674675
"ThreadNetworkTableSize"
675676
],
676-
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
677+
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
678+
"Camera AV Stream Management": [
679+
"MaxConcurrentVideoEncoders",
680+
"MaxEncodedPixelRate",
681+
"VideoSensorParams",
682+
"NightVisionCapable",
683+
"MinViewPortWidth",
684+
"MinViewPortHeight",
685+
"RateDistortionTradeOffPoints",
686+
"MaxPreRollBufferSize",
687+
"MicrophoneCapabilities",
688+
"SpeakerCapabilities",
689+
"TwoWayTalkSupport",
690+
"SupportedSnapshotParams",
691+
"HDRCapable",
692+
"MaxNetworkBandwidth",
693+
"CurrentFrameRate",
694+
"HDRMode",
695+
"CurrentVideoCodecs",
696+
"CurrentSnapshotConfig",
697+
"FabricsUsingCamera",
698+
"AllocatedVideoStreams",
699+
"AllocatedAudioStreams",
700+
"AllocatedSnapshotStreams",
701+
"RankedVideoStreamPrioritiesList",
702+
"SoftRecordingPrivacyModeSetting",
703+
"SoftLivestreamPrivacyModeSetting",
704+
"HardPrivacyMode",
705+
"NightVision",
706+
"NightVisionIllum",
707+
"AWB",
708+
"ShutterSpeed",
709+
"ISO",
710+
"Viewport",
711+
"SpkrOnOff",
712+
"SpkrVolumeLevel",
713+
"SpkrMaxLevel",
714+
"SpkrMinLevel",
715+
"MicOnOff",
716+
"MicCurrentLevel",
717+
"MicMaxLevel",
718+
"MicMinLevel",
719+
"MicAGC",
720+
"ImageRotation",
721+
"ImageFlipHorizontal",
722+
"ImageFlipVertical",
723+
"LocalVideoRecordingEnabled",
724+
"LocalSnapshotRecordingEnabled",
725+
"StatusLight",
726+
"StatusLightBrightness",
727+
"DepthSensorStatus",
728+
"WatermarkEnabled",
729+
"OSDEnabled"
730+
]
677731
},
678732
"mandatoryDeviceTypes": "0x0016",
679733
"defaultReportingPolicy": "mandatory",

‎src/app/zap_cluster_list.json

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"BOOLEAN_STATE_CLUSTER": [],
1717
"BOOLEAN_STATE_CONFIGURATION_CLUSTER": [],
1818
"BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
19+
"CAMERA_AV_STREAM_MANAGEMENT_CLUSTER": [],
1920
"CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
2021
"CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
2122
"CHANNEL_CLUSTER": [],
@@ -158,6 +159,9 @@
158159
"BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
159160
"bridged-device-basic-information-server"
160161
],
162+
"CAMERA_AV_STREAM_MANAGEMENT_CLUSTER": [
163+
"camera-av-stream-management-server"
164+
],
161165
"CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
162166
"concentration-measurement-server"
163167
],

0 commit comments

Comments
 (0)