Skip to content

Commit fb82723

Browse files
committed
Definition of the Camera AV StreamManagement Cluster.
Define StreamTypeEnum in global-enums.xml, moving from WebRTC Provider cluster and AV Stream Management. Spec in `cameras` branch. Draft PR: CHIP-Specifications/connectedhomeip-spec#10004
1 parent 9ae53c5 commit fb82723

8 files changed

+614
-12
lines changed

.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jobs:
110110
src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml \
111111
src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml \
112112
src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml \
113+
src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml \
113114
src/app/zap-templates/zcl/data-model/chip/chip-ota.xml \
114115
src/app/zap-templates/zcl/data-model/chip/chip-types.xml \
115116
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/chime-cluster.xml";
1920
load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml";

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

+576
Large diffs are not rendered by default.

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

+12-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ TODO: Make these structures global rather than defining them for each cluster.
3434
<item name="High" value="0x02"/>
3535
<item name="Automatic" value="0x03"/>
3636
</enum>
37+
38+
<enum name="StreamTypeEnum" type="enum8">
39+
<cluster code="0x0551"/>
40+
<cluster code="0x0553"/>
41+
<cluster code="0x0554"/>
42+
<cluster code="0x0555"/>
43+
<item name="Internal" value="0x00"/>
44+
<item name="Recording" value="0x01"/>
45+
<item name="Analysis" value="0x02"/>
46+
<item name="LiveView" value="0x03"/>
47+
</enum>
48+
3749
<!--
3850
These are test global items (no cluster attached) for testing only.
3951
Their usage is defined for UnitTestCluster only.
@@ -43,5 +55,4 @@ TODO: Make these structures global rather than defining them for each cluster.
4355
<item name="SomeOtherValue" value="0x01"/>
4456
<item name="FinalValue" value="0x02"/>
4557
</enum>
46-
4758
</configurator>

src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml

-9
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ Git: 0.9-fall2024-234-gf4d359001
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="General"/>
2525

26-
<enum name="StreamTypeEnum" type="enum8">
27-
<cluster code="0x0553"/>
28-
<cluster code="0x0554"/>
29-
<item name="Internal" value="0x00"/>
30-
<item name="Recording" value="0x01"/>
31-
<item name="Analysis" value="0x02"/>
32-
<item name="LiveView" value="0x03"/>
33-
</enum>
34-
3526
<bitmap name="WebRTCMetadataOptions" type="bitmap8">
3627
<cluster code="0x0553"/>
3728
<cluster code="0x0554"/>

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

+11-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
"chime-cluster.xml",
3132
"chip-ota.xml",
3233
"channel-cluster.xml",
@@ -666,7 +667,16 @@
666667
"ThreadNetworks",
667668
"ThreadNetworkTableSize"
668669
],
669-
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
670+
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
671+
"Camera AV Stream Management": [
672+
"VideoSensorParams",
673+
"MinViewPortWidth",
674+
"MinViewPortHeight",
675+
"MicrophoneCapabilities",
676+
"SpeakerCapabilities",
677+
"CurrentSnapshotConfig",
678+
"Viewport"
679+
]
670680
},
671681
"mandatoryDeviceTypes": "0x0016",
672682
"defaultReportingPolicy": "mandatory",

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

+11-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
"chime-cluster.xml",
2627
"chip-ota.xml",
2728
"channel-cluster.xml",
@@ -660,7 +661,16 @@
660661
"ThreadNetworks",
661662
"ThreadNetworkTableSize"
662663
],
663-
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
664+
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
665+
"Camera AV Stream Management": [
666+
"VideoSensorParams",
667+
"MinViewPortWidth",
668+
"MinViewPortHeight",
669+
"MicrophoneCapabilities",
670+
"SpeakerCapabilities",
671+
"CurrentSnapshotConfig",
672+
"Viewport"
673+
]
664674
},
665675
"mandatoryDeviceTypes": "0x0016",
666676
"defaultReportingPolicy": "mandatory",

src/app/zap_cluster_list.json

+2
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": [],
@@ -160,6 +161,7 @@
160161
"BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
161162
"bridged-device-basic-information-server"
162163
],
164+
"CAMERA_AV_STREAM_MANAGEMENT_CLUSTER": [],
163165
"CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
164166
"concentration-measurement-server"
165167
],

0 commit comments

Comments
 (0)