Skip to content

Commit 4df081c

Browse files
pidarpedpidarped
authored
Definition of the Camera AV StreamManagement Cluster. (#35841)
* 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 * Keep the jclass and its corresponding constructor jmethod inside a scope block. This is to prevent duplicate declaration error when multiple variables of the same struct type are present. * Auto-generated files from zap-regen for Camera AV Stream Management.
1 parent bf37d4e commit 4df081c

File tree

82 files changed

+50448
-4628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+50448
-4628
lines changed

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ jobs:
111111
src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml \
112112
src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml \
113113
src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml \
114+
src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml \
114115
src/app/zap-templates/zcl/data-model/chip/chip-ota.xml \
115116
src/app/zap-templates/zcl/data-model/chip/chip-types.xml \
116117
src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml \

‎docs/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ Generally regenerate using one of:
130130
| 1295 | 0x50F | ContentControl |
131131
| 1296 | 0x510 | ContentAppObserver |
132132
| 1360 | 0x550 | ZoneManagement |
133+
| 1361 | 0x551 | CameraAvStreamManagement |
133134
| 1363 | 0x553 | WebRTCTransportProvider |
134135
| 1364 | 0x554 | WebRTCTransportRequestor |
135136
| 1366 | 0x556 | Chime |

‎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

+478
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

+10-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",
@@ -668,7 +669,15 @@
668669
"ThreadNetworks",
669670
"ThreadNetworkTableSize"
670671
],
671-
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
672+
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
673+
"Camera AV Stream Management": [
674+
"VideoSensorParams",
675+
"MinViewport",
676+
"MicrophoneCapabilities",
677+
"SpeakerCapabilities",
678+
"CurrentSnapshotConfig",
679+
"Viewport"
680+
]
672681
},
673682
"mandatoryDeviceTypes": "0x0016",
674683
"defaultReportingPolicy": "mandatory",

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

+10-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",
@@ -662,7 +663,15 @@
662663
"ThreadNetworks",
663664
"ThreadNetworkTableSize"
664665
],
665-
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
666+
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
667+
"Camera AV Stream Management": [
668+
"VideoSensorParams",
669+
"MinViewport",
670+
"MicrophoneCapabilities",
671+
"SpeakerCapabilities",
672+
"CurrentSnapshotConfig",
673+
"Viewport"
674+
]
666675
},
667676
"mandatoryDeviceTypes": "0x0016",
668677
"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": [],
@@ -162,6 +163,7 @@
162163
"BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
163164
"bridged-device-basic-information-server"
164165
],
166+
"CAMERA_AV_STREAM_MANAGEMENT_CLUSTER": [],
165167
"CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
166168
"concentration-measurement-server"
167169
],

0 commit comments

Comments
 (0)