Skip to content

Commit 587967d

Browse files
committed
Generated with ./scripts/tools/zap_regen_all.py
1 parent a603b57 commit 587967d

File tree

59 files changed

+2556
-2133
lines changed

Some content is hidden

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

59 files changed

+2556
-2133
lines changed

src/controller/data_model/controller-clusters.matter

+87-74
Original file line numberDiff line numberDiff line change
@@ -10044,123 +10044,136 @@ cluster WebRTCTransportRequestor = 1364 {
1004410044
cluster PushAvStreamTransport = 1365 {
1004510045
revision 1;
1004610046

10047-
enum PushAVStreamTransportContainerFormatEnum : enum8 {
10047+
enum ContainerFormatEnum : enum8 {
1004810048
kCMAF = 0;
1004910049
}
1005010050

10051-
enum PushAVStreamTransportIngestMethodEnum : enum8 {
10051+
enum IngestMethodsEnum : enum8 {
1005210052
kCMAFIngest = 0;
1005310053
}
1005410054

10055-
enum PushAVStreamTransportStatusEnum : enum8 {
10056-
kActive = 0;
10057-
kInactive = 1;
10055+
enum StatusCodeEnum : enum8 {
10056+
kAllocationNotPermitted = 2;
10057+
kInvalidTlsEndpoint = 3;
10058+
kInvalidStream = 4;
10059+
kInvalidURL = 5;
10060+
kInvalidZone = 6;
10061+
kUnsupportedContainerFormat = 7;
10062+
kUnsupportedIngestMethod = 8;
10063+
kInvalidTriggerType = 9;
10064+
kInvalidTransportStatus = 16;
10065+
}
10066+
10067+
enum StreamMultiplexingEnum : enum8 {
10068+
kInterleaved = 0;
1005810069
}
1005910070

10060-
enum PushAVStreamTransportStreamMultiplexingEnum : enum8 {
10061-
kInterleaved = 0;
10071+
enum StreamTypeEnum : enum8 {
10072+
kInternal = 0;
10073+
kRecording = 1;
10074+
kAnalysis = 2;
10075+
kLiveView = 3;
1006210076
}
1006310077

10064-
enum PushAVStreamTransportTriggerActivationReasonEnum : enum8 {
10065-
kUserInitiated = 0;
10066-
kAutomation = 1;
10067-
kEmergency = 2;
10078+
enum TransportStatusEnum : enum8 {
10079+
kActive = 0;
10080+
kInactive = 1;
1006810081
}
1006910082

10070-
enum PushAVStreamTransportTriggerTypeEnum : enum8 {
10083+
enum TransportTriggerTypeEnum : enum8 {
1007110084
kCommand = 0;
1007210085
kMotion = 1;
1007310086
kContinuous = 2;
1007410087
}
1007510088

10076-
enum StatusCodeEnum : enum8 {
10077-
kALLOCATIONNOTPERMITTED = 2;
10078-
kINVALIDPARAMETERS = 3;
10079-
kINVALIDURL = 4;
10080-
kINVALIDTRIGGEROPTIONS = 5;
10081-
kUNSUPPORTEDCONTAINERFORMAT = 6;
10082-
kUNSUPPORTEDINGESTMETHOD = 7;
10083-
kPAVSTNOTINUSE = 8;
10084-
kINVALIDTRIGGERFORMAT = 9;
10085-
kINVALIDTRANSPORTSTATUS = 16;
10089+
enum TriggerActivationReasonEnum : enum8 {
10090+
kUserInitiated = 0;
10091+
kAutomation = 1;
10092+
kEmergency = 2;
1008610093
}
1008710094

10088-
enum StreamTypeEnum : enum8 {
10089-
kInternal = 0;
10090-
kRecording = 1;
10091-
kAnalysis = 2;
10092-
kLiveView = 3;
10095+
bitmap Feature : bitmap32 {
10096+
kPerZoneSensitivity = 0x1;
1009310097
}
1009410098

10095-
bitmap PushAVStreamTransportSupportedContainerFormatsBitmap : bitmap8 {
10099+
bitmap SupportedContainerFormatsBitmap : bitmap8 {
1009610100
kCMAF = 0x1;
1009710101
}
1009810102

10099-
bitmap PushAVStreamTransportSupportedIngestMethodsBitmap : bitmap8 {
10103+
bitmap SupportedIngestMethodsBitmap : bitmap8 {
1010010104
kCMAFIngest = 0x1;
1010110105
}
1010210106

10103-
struct PushAVStreamTransportMotionTriggerTimeControlStruct {
10107+
struct TransportMotionTriggerTimeControlStruct {
1010410108
int16u initialDuration = 0;
1010510109
int16u augmentationDuration = 1;
10106-
int32u maxDuration = 2;
10110+
elapsed_s maxDuration = 2;
1010710111
int16u blindDuration = 3;
1010810112
}
1010910113

10110-
struct PushAVStreamTransportMetadataOptionsStruct {
10111-
PushAVStreamTransportStreamMultiplexingEnum multiplexing = 0;
10114+
struct TransportZoneOptionsStruct {
10115+
nullable int16u zone = 1;
10116+
optional int8u sensitivity = 2;
10117+
}
10118+
10119+
struct MetadataOptionsStruct {
10120+
StreamMultiplexingEnum multiplexing = 0;
1011210121
boolean includeMotionZones = 1;
1011310122
boolean enableMetadataPrivacySensitive = 2;
1011410123
}
1011510124

10116-
struct PushAVStreamTransportTriggerOptionsStruct {
10117-
PushAVStreamTransportTriggerTypeEnum triggerType = 0;
10118-
optional nullable int16u motionZones[] = 1;
10125+
struct TransportTriggerOptionsStruct {
10126+
TransportTriggerTypeEnum triggerType = 0;
10127+
optional nullable TransportZoneOptionsStruct motionZones[] = 1;
1011910128
optional nullable int8u motionSensitivity = 2;
10120-
optional nullable PushAVStreamTransportMotionTriggerTimeControlStruct motionTimeControl = 3;
10121-
optional nullable PushAVStreamTransportTriggerActivationReasonEnum activationReason = 4;
10129+
optional TransportMotionTriggerTimeControlStruct motionTimeControl = 3;
10130+
optional int16u maxPreRollLen = 4;
1012210131
}
1012310132

10124-
struct PushAVStreamTransportCMAFContainerOptionsStruct {
10133+
struct CMAFContainerOptionsStruct {
1012510134
int16u chunkDuration = 0;
1012610135
optional nullable octet_string CENCKey = 1;
1012710136
}
1012810137

10129-
struct PushAVStreamTransportContainerOptionsStruct {
10130-
PushAVStreamTransportContainerFormatEnum containerType = 0;
10131-
optional nullable PushAVStreamTransportCMAFContainerOptionsStruct CMAFContainerOptions = 1;
10138+
struct ContainerOptionsStruct {
10139+
ContainerFormatEnum containerType = 0;
10140+
optional nullable CMAFContainerOptionsStruct CMAFContainerOptions = 1;
1013210141
}
1013310142

10134-
struct PushAVStreamTransportOptionsStruct {
10143+
struct TransportOptionsStruct {
1013510144
StreamTypeEnum streamType = 0;
10136-
optional nullable int16u videoStreamID = 1;
10137-
optional nullable int16u audioStreamID = 2;
10138-
int16u TLSEndpointID = 3;
10145+
optional int16u videoStreamID = 1;
10146+
optional int16u audioStreamID = 2;
10147+
int16u endpointID = 3;
1013910148
long_char_string<256> url = 4;
10140-
PushAVStreamTransportTriggerOptionsStruct triggerOptions = 5;
10141-
PushAVStreamTransportContainerFormatEnum containerFormat = 6;
10142-
PushAVStreamTransportIngestMethodEnum ingestMethod = 7;
10143-
PushAVStreamTransportContainerOptionsStruct containerOptions = 8;
10144-
optional nullable PushAVStreamTransportMetadataOptionsStruct metadataOptions = 9;
10145-
optional nullable int32u expiryTime = 10;
10149+
TransportTriggerOptionsStruct triggerOptions = 5;
10150+
IngestMethodsEnum ingestMethod = 6;
10151+
ContainerFormatEnum containerFormat = 7;
10152+
ContainerOptionsStruct containerOptions = 8;
10153+
optional nullable MetadataOptionsStruct metadataOptions = 9;
10154+
optional nullable epoch_s expiryTime = 10;
1014610155
}
1014710156

10148-
struct PushAVStreamConfigurationStruct {
10157+
struct TransportConfigurationStruct {
1014910158
int16u connectionID = 0;
10150-
PushAVStreamTransportStatusEnum streamTransportStatus = 1;
10151-
PushAVStreamTransportOptionsStruct streamTransportOptions = 2;
10159+
TransportStatusEnum transportStatus = 1;
10160+
TransportOptionsStruct transportOptions = 2;
1015210161
}
1015310162

1015410163
info event PushTransportBegin = 0 {
10164+
int16u connectionID = 0;
10165+
TransportTriggerTypeEnum triggerType = 1;
10166+
optional TriggerActivationReasonEnum activationReason = 2;
1015510167
}
1015610168

1015710169
info event PushTransportEnd = 1 {
1015810170
int16u connectionID = 0;
10159-
PushAVStreamTransportTriggerOptionsStruct triggerDetails = 1;
10171+
TransportTriggerTypeEnum triggerType = 1;
10172+
optional TriggerActivationReasonEnum activationReason = 2;
1016010173
}
1016110174

10162-
readonly attribute PushAVStreamTransportSupportedContainerFormatsBitmap supportedContainerFormats = 0;
10163-
readonly attribute PushAVStreamTransportSupportedIngestMethodsBitmap supportedIngestMethods = 1;
10175+
readonly attribute SupportedContainerFormatsBitmap supportedContainerFormats = 0;
10176+
readonly attribute SupportedIngestMethodsBitmap supportedIngestMethods = 1;
1016410177
readonly attribute int16u currentConnections[] = 2;
1016510178
readonly attribute command_id generatedCommandList[] = 65528;
1016610179
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -10170,13 +10183,13 @@ cluster PushAvStreamTransport = 1365 {
1017010183
readonly attribute int16u clusterRevision = 65533;
1017110184

1017210185
request struct AllocatePushTransportRequest {
10173-
PushAVStreamTransportOptionsStruct streamTransportOptions = 0;
10186+
TransportOptionsStruct transportOptions = 0;
1017410187
}
1017510188

1017610189
response struct AllocatePushTransportResponse = 1 {
1017710190
int16u connectionID = 0;
10178-
PushAVStreamTransportOptionsStruct streamTransportOptions = 1;
10179-
PushAVStreamTransportStatusEnum transportStatus = 2;
10191+
TransportOptionsStruct transportOptions = 1;
10192+
TransportStatusEnum transportStatus = 2;
1018010193
}
1018110194

1018210195
request struct DeallocatePushTransportRequest {
@@ -10185,40 +10198,40 @@ cluster PushAvStreamTransport = 1365 {
1018510198

1018610199
request struct ModifyPushTransportRequest {
1018710200
int16u connectionID = 0;
10188-
PushAVStreamTransportOptionsStruct streamTransportOptions = 1;
10201+
TransportOptionsStruct transportOptions = 1;
1018910202
}
1019010203

1019110204
request struct SetTransportStatusRequest {
1019210205
nullable int16u connectionID = 0;
10193-
PushAVStreamTransportStatusEnum streamTransportStatus = 1;
10206+
TransportStatusEnum transportStatus = 1;
1019410207
}
1019510208

1019610209
request struct ManuallyTriggerTransportRequest {
1019710210
int16u connectionID = 0;
10198-
nullable PushAVStreamTransportTriggerActivationReasonEnum activationReason = 1;
10199-
optional nullable PushAVStreamTransportMotionTriggerTimeControlStruct timeControl = 2;
10211+
nullable TriggerActivationReasonEnum activationReason = 1;
10212+
optional nullable TransportMotionTriggerTimeControlStruct timeControl = 2;
1020010213
}
1020110214

10202-
request struct FindStreamConfigurationRequest {
10215+
request struct FindTransportRequest {
1020310216
optional nullable int16u connectionID = 0;
1020410217
}
1020510218

10206-
response struct FindStreamConfigurationResponse = 7 {
10207-
PushAVStreamConfigurationStruct streamConfigurations[] = 0;
10219+
response struct FindTransportResponse = 7 {
10220+
TransportConfigurationStruct streamConfigurations[] = 0;
1020810221
}
1020910222

1021010223
/** This command SHALL allocate a transport and return a PushTransportConnectionID. */
10211-
command access(invoke: administer) AllocatePushTransport(AllocatePushTransportRequest): AllocatePushTransportResponse = 0;
10224+
command access(invoke: manage) AllocatePushTransport(AllocatePushTransportRequest): AllocatePushTransportResponse = 0;
1021210225
/** This command SHALL be generated to request the Node deallocates the specified transport. */
10213-
command access(invoke: administer) DeallocatePushTransport(DeallocatePushTransportRequest): DefaultSuccess = 2;
10226+
command access(invoke: manage) DeallocatePushTransport(DeallocatePushTransportRequest): DefaultSuccess = 2;
1021410227
/** This command is used to request the Node modifies the configuration of the specified push transport. */
10215-
command access(invoke: administer) ModifyPushTransport(ModifyPushTransportRequest): DefaultSuccess = 3;
10228+
command access(invoke: manage) ModifyPushTransport(ModifyPushTransportRequest): DefaultSuccess = 3;
1021610229
/** This command SHALL be generated to request the Node modifies the Transport Status of the transport. */
10217-
command access(invoke: administer) SetTransportStatus(SetTransportStatusRequest): DefaultSuccess = 4;
10230+
command access(invoke: manage) SetTransportStatus(SetTransportStatusRequest): DefaultSuccess = 4;
1021810231
/** This command SHALL be generated to request the Node to manually start the specified push transport. */
10219-
command access(invoke: administer) ManuallyTriggerTransport(ManuallyTriggerTransportRequest): DefaultSuccess = 5;
10232+
command ManuallyTriggerTransport(ManuallyTriggerTransportRequest): DefaultSuccess = 5;
1022010233
/** This command SHALL return the Stream Options Configuration for the specified push transport. */
10221-
command access(invoke: administer) FindStreamConfiguration(FindStreamConfigurationRequest): FindStreamConfigurationResponse = 6;
10234+
command FindTransport(FindTransportRequest): FindTransportResponse = 6;
1022210235
}
1022310236

1022410237
/** This cluster provides facilities to configure and play Chime sounds, such as those used in a doorbell. */

0 commit comments

Comments
 (0)