From 587967d4da78502823232c05960ef5d232f8b556 Mon Sep 17 00:00:00 2001 From: marcos <15697303+gmarcosb@users.noreply.github.com> Date: Wed, 18 Dec 2024 13:39:54 -0700 Subject: [PATCH] Generated with ./scripts/tools/zap_regen_all.py --- .../data_model/controller-clusters.matter | 161 +++-- .../chip/devicecontroller/ChipClusters.java | 66 +- .../devicecontroller/ChipEventStructs.java | 89 ++- .../chip/devicecontroller/ChipStructs.java | 317 +++++---- .../devicecontroller/ClusterIDMapping.java | 16 +- .../devicecontroller/ClusterInfoMapping.java | 42 +- ...TransportClusterPushTransportBeginEvent.kt | 80 +++ ...amTransportClusterPushTransportEndEvent.kt | 34 +- .../chip/devicecontroller/cluster/files.gni | 16 +- ...sportClusterCMAFContainerOptionsStruct.kt} | 11 +- ...TransportClusterContainerOptionsStruct.kt} | 16 +- ...mTransportClusterMetadataOptionsStruct.kt} | 8 +- ...ortClusterTransportConfigurationStruct.kt} | 36 +- ...ransportMotionTriggerTimeControlStruct.kt} | 8 +- ...TransportClusterTransportOptionsStruct.kt} | 93 +-- ...rtClusterTransportTriggerOptionsStruct.kt} | 81 +-- ...nsportClusterTransportZoneOptionsStruct.kt | 81 +++ .../clusters/PushAvStreamTransportCluster.kt | 56 +- ...TransportClusterPushTransportBeginEvent.kt | 80 +++ ...amTransportClusterPushTransportEndEvent.kt | 34 +- .../java/matter/controller/cluster/files.gni | 16 +- ...sportClusterCMAFContainerOptionsStruct.kt} | 11 +- ...TransportClusterContainerOptionsStruct.kt} | 16 +- ...mTransportClusterMetadataOptionsStruct.kt} | 8 +- ...ortClusterTransportConfigurationStruct.kt} | 37 +- ...ransportMotionTriggerTimeControlStruct.kt} | 8 +- ...TransportClusterTransportOptionsStruct.kt} | 93 +-- ...rtClusterTransportTriggerOptionsStruct.kt} | 81 +-- ...nsportClusterTransportZoneOptionsStruct.kt | 81 +++ .../CHIPEventTLVValueDecoder.cpp | 291 ++------ .../python/chip/clusters/CHIPClusters.py | 10 +- .../python/chip/clusters/Objects.py | 221 +++--- .../CHIP/zap-generated/MTRBaseClusters.h | 66 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 12 +- .../CHIP/zap-generated/MTRClusterConstants.h | 4 +- .../CHIP/zap-generated/MTRClusterNames.mm | 8 +- .../CHIP/zap-generated/MTRClusters.h | 4 +- .../CHIP/zap-generated/MTRClusters.mm | 12 +- .../zap-generated/MTRCommandPayloadsObjc.h | 16 +- .../zap-generated/MTRCommandPayloadsObjc.mm | 648 +++++++++--------- .../MTRCommandPayloads_Internal.h | 6 +- .../zap-generated/MTREventTLVValueDecoder.mm | 87 +-- .../CHIP/zap-generated/MTRStructsObjc.h | 46 +- .../CHIP/zap-generated/MTRStructsObjc.mm | 111 ++- .../zap-generated/attributes/Accessors.cpp | 39 +- .../zap-generated/attributes/Accessors.h | 26 +- .../app-common/zap-generated/callback.h | 6 +- .../zap-generated/cluster-enums-check.h | 57 +- .../app-common/zap-generated/cluster-enums.h | 78 ++- .../zap-generated/cluster-objects.cpp | 170 +++-- .../zap-generated/cluster-objects.h | 237 ++++--- .../app-common/zap-generated/ids/Commands.h | 8 +- .../zap-generated/cluster/Commands.h | 46 +- .../cluster/ComplexArgumentParser.cpp | 214 +++--- .../cluster/ComplexArgumentParser.h | 59 +- .../cluster/logging/DataModelLogger.cpp | 124 +++- .../cluster/logging/DataModelLogger.h | 37 +- .../cluster/logging/EntryToText.cpp | 8 +- .../zap-generated/cluster/Commands.h | 362 +++++----- 59 files changed, 2556 insertions(+), 2133 deletions(-) create mode 100644 src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt rename src/controller/java/generated/java/chip/devicecontroller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt => PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt} (84%) rename src/controller/java/generated/java/chip/devicecontroller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt => PushAvStreamTransportClusterContainerOptionsStruct.kt} (79%) rename src/controller/java/generated/java/chip/devicecontroller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt => PushAvStreamTransportClusterMetadataOptionsStruct.kt} (87%) rename src/controller/java/generated/java/chip/devicecontroller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt => PushAvStreamTransportClusterTransportConfigurationStruct.kt} (56%) rename src/controller/java/generated/java/chip/devicecontroller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt => PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt} (87%) rename src/controller/java/generated/java/chip/devicecontroller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt => PushAvStreamTransportClusterTransportOptionsStruct.kt} (65%) rename src/controller/java/generated/java/chip/devicecontroller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt => PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt} (62%) create mode 100644 src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt create mode 100644 src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt rename src/controller/java/generated/java/matter/controller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt => PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt} (84%) rename src/controller/java/generated/java/matter/controller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt => PushAvStreamTransportClusterContainerOptionsStruct.kt} (79%) rename src/controller/java/generated/java/matter/controller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt => PushAvStreamTransportClusterMetadataOptionsStruct.kt} (87%) rename src/controller/java/generated/java/matter/controller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt => PushAvStreamTransportClusterTransportConfigurationStruct.kt} (56%) rename src/controller/java/generated/java/matter/controller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt => PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt} (87%) rename src/controller/java/generated/java/matter/controller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt => PushAvStreamTransportClusterTransportOptionsStruct.kt} (65%) rename src/controller/java/generated/java/matter/controller/cluster/structs/{PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt => PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt} (62%) create mode 100644 src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 2df2b9abfcf3ef..55e0630089e405 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -10044,123 +10044,136 @@ cluster WebRTCTransportRequestor = 1364 { cluster PushAvStreamTransport = 1365 { revision 1; - enum PushAVStreamTransportContainerFormatEnum : enum8 { + enum ContainerFormatEnum : enum8 { kCMAF = 0; } - enum PushAVStreamTransportIngestMethodEnum : enum8 { + enum IngestMethodsEnum : enum8 { kCMAFIngest = 0; } - enum PushAVStreamTransportStatusEnum : enum8 { - kActive = 0; - kInactive = 1; + enum StatusCodeEnum : enum8 { + kAllocationNotPermitted = 2; + kInvalidTlsEndpoint = 3; + kInvalidStream = 4; + kInvalidURL = 5; + kInvalidZone = 6; + kUnsupportedContainerFormat = 7; + kUnsupportedIngestMethod = 8; + kInvalidTriggerType = 9; + kInvalidTransportStatus = 16; + } + + enum StreamMultiplexingEnum : enum8 { + kInterleaved = 0; } - enum PushAVStreamTransportStreamMultiplexingEnum : enum8 { - kInterleaved = 0; + enum StreamTypeEnum : enum8 { + kInternal = 0; + kRecording = 1; + kAnalysis = 2; + kLiveView = 3; } - enum PushAVStreamTransportTriggerActivationReasonEnum : enum8 { - kUserInitiated = 0; - kAutomation = 1; - kEmergency = 2; + enum TransportStatusEnum : enum8 { + kActive = 0; + kInactive = 1; } - enum PushAVStreamTransportTriggerTypeEnum : enum8 { + enum TransportTriggerTypeEnum : enum8 { kCommand = 0; kMotion = 1; kContinuous = 2; } - enum StatusCodeEnum : enum8 { - kALLOCATIONNOTPERMITTED = 2; - kINVALIDPARAMETERS = 3; - kINVALIDURL = 4; - kINVALIDTRIGGEROPTIONS = 5; - kUNSUPPORTEDCONTAINERFORMAT = 6; - kUNSUPPORTEDINGESTMETHOD = 7; - kPAVSTNOTINUSE = 8; - kINVALIDTRIGGERFORMAT = 9; - kINVALIDTRANSPORTSTATUS = 16; + enum TriggerActivationReasonEnum : enum8 { + kUserInitiated = 0; + kAutomation = 1; + kEmergency = 2; } - enum StreamTypeEnum : enum8 { - kInternal = 0; - kRecording = 1; - kAnalysis = 2; - kLiveView = 3; + bitmap Feature : bitmap32 { + kPerZoneSensitivity = 0x1; } - bitmap PushAVStreamTransportSupportedContainerFormatsBitmap : bitmap8 { + bitmap SupportedContainerFormatsBitmap : bitmap8 { kCMAF = 0x1; } - bitmap PushAVStreamTransportSupportedIngestMethodsBitmap : bitmap8 { + bitmap SupportedIngestMethodsBitmap : bitmap8 { kCMAFIngest = 0x1; } - struct PushAVStreamTransportMotionTriggerTimeControlStruct { + struct TransportMotionTriggerTimeControlStruct { int16u initialDuration = 0; int16u augmentationDuration = 1; - int32u maxDuration = 2; + elapsed_s maxDuration = 2; int16u blindDuration = 3; } - struct PushAVStreamTransportMetadataOptionsStruct { - PushAVStreamTransportStreamMultiplexingEnum multiplexing = 0; + struct TransportZoneOptionsStruct { + nullable int16u zone = 1; + optional int8u sensitivity = 2; + } + + struct MetadataOptionsStruct { + StreamMultiplexingEnum multiplexing = 0; boolean includeMotionZones = 1; boolean enableMetadataPrivacySensitive = 2; } - struct PushAVStreamTransportTriggerOptionsStruct { - PushAVStreamTransportTriggerTypeEnum triggerType = 0; - optional nullable int16u motionZones[] = 1; + struct TransportTriggerOptionsStruct { + TransportTriggerTypeEnum triggerType = 0; + optional nullable TransportZoneOptionsStruct motionZones[] = 1; optional nullable int8u motionSensitivity = 2; - optional nullable PushAVStreamTransportMotionTriggerTimeControlStruct motionTimeControl = 3; - optional nullable PushAVStreamTransportTriggerActivationReasonEnum activationReason = 4; + optional TransportMotionTriggerTimeControlStruct motionTimeControl = 3; + optional int16u maxPreRollLen = 4; } - struct PushAVStreamTransportCMAFContainerOptionsStruct { + struct CMAFContainerOptionsStruct { int16u chunkDuration = 0; optional nullable octet_string CENCKey = 1; } - struct PushAVStreamTransportContainerOptionsStruct { - PushAVStreamTransportContainerFormatEnum containerType = 0; - optional nullable PushAVStreamTransportCMAFContainerOptionsStruct CMAFContainerOptions = 1; + struct ContainerOptionsStruct { + ContainerFormatEnum containerType = 0; + optional nullable CMAFContainerOptionsStruct CMAFContainerOptions = 1; } - struct PushAVStreamTransportOptionsStruct { + struct TransportOptionsStruct { StreamTypeEnum streamType = 0; - optional nullable int16u videoStreamID = 1; - optional nullable int16u audioStreamID = 2; - int16u TLSEndpointID = 3; + optional int16u videoStreamID = 1; + optional int16u audioStreamID = 2; + int16u endpointID = 3; long_char_string<256> url = 4; - PushAVStreamTransportTriggerOptionsStruct triggerOptions = 5; - PushAVStreamTransportContainerFormatEnum containerFormat = 6; - PushAVStreamTransportIngestMethodEnum ingestMethod = 7; - PushAVStreamTransportContainerOptionsStruct containerOptions = 8; - optional nullable PushAVStreamTransportMetadataOptionsStruct metadataOptions = 9; - optional nullable int32u expiryTime = 10; + TransportTriggerOptionsStruct triggerOptions = 5; + IngestMethodsEnum ingestMethod = 6; + ContainerFormatEnum containerFormat = 7; + ContainerOptionsStruct containerOptions = 8; + optional nullable MetadataOptionsStruct metadataOptions = 9; + optional nullable epoch_s expiryTime = 10; } - struct PushAVStreamConfigurationStruct { + struct TransportConfigurationStruct { int16u connectionID = 0; - PushAVStreamTransportStatusEnum streamTransportStatus = 1; - PushAVStreamTransportOptionsStruct streamTransportOptions = 2; + TransportStatusEnum transportStatus = 1; + TransportOptionsStruct transportOptions = 2; } info event PushTransportBegin = 0 { + int16u connectionID = 0; + TransportTriggerTypeEnum triggerType = 1; + optional TriggerActivationReasonEnum activationReason = 2; } info event PushTransportEnd = 1 { int16u connectionID = 0; - PushAVStreamTransportTriggerOptionsStruct triggerDetails = 1; + TransportTriggerTypeEnum triggerType = 1; + optional TriggerActivationReasonEnum activationReason = 2; } - readonly attribute PushAVStreamTransportSupportedContainerFormatsBitmap supportedContainerFormats = 0; - readonly attribute PushAVStreamTransportSupportedIngestMethodsBitmap supportedIngestMethods = 1; + readonly attribute SupportedContainerFormatsBitmap supportedContainerFormats = 0; + readonly attribute SupportedIngestMethodsBitmap supportedIngestMethods = 1; readonly attribute int16u currentConnections[] = 2; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -10170,13 +10183,13 @@ cluster PushAvStreamTransport = 1365 { readonly attribute int16u clusterRevision = 65533; request struct AllocatePushTransportRequest { - PushAVStreamTransportOptionsStruct streamTransportOptions = 0; + TransportOptionsStruct transportOptions = 0; } response struct AllocatePushTransportResponse = 1 { int16u connectionID = 0; - PushAVStreamTransportOptionsStruct streamTransportOptions = 1; - PushAVStreamTransportStatusEnum transportStatus = 2; + TransportOptionsStruct transportOptions = 1; + TransportStatusEnum transportStatus = 2; } request struct DeallocatePushTransportRequest { @@ -10185,40 +10198,40 @@ cluster PushAvStreamTransport = 1365 { request struct ModifyPushTransportRequest { int16u connectionID = 0; - PushAVStreamTransportOptionsStruct streamTransportOptions = 1; + TransportOptionsStruct transportOptions = 1; } request struct SetTransportStatusRequest { nullable int16u connectionID = 0; - PushAVStreamTransportStatusEnum streamTransportStatus = 1; + TransportStatusEnum transportStatus = 1; } request struct ManuallyTriggerTransportRequest { int16u connectionID = 0; - nullable PushAVStreamTransportTriggerActivationReasonEnum activationReason = 1; - optional nullable PushAVStreamTransportMotionTriggerTimeControlStruct timeControl = 2; + nullable TriggerActivationReasonEnum activationReason = 1; + optional nullable TransportMotionTriggerTimeControlStruct timeControl = 2; } - request struct FindStreamConfigurationRequest { + request struct FindTransportRequest { optional nullable int16u connectionID = 0; } - response struct FindStreamConfigurationResponse = 7 { - PushAVStreamConfigurationStruct streamConfigurations[] = 0; + response struct FindTransportResponse = 7 { + TransportConfigurationStruct streamConfigurations[] = 0; } /** This command SHALL allocate a transport and return a PushTransportConnectionID. */ - command access(invoke: administer) AllocatePushTransport(AllocatePushTransportRequest): AllocatePushTransportResponse = 0; + command access(invoke: manage) AllocatePushTransport(AllocatePushTransportRequest): AllocatePushTransportResponse = 0; /** This command SHALL be generated to request the Node deallocates the specified transport. */ - command access(invoke: administer) DeallocatePushTransport(DeallocatePushTransportRequest): DefaultSuccess = 2; + command access(invoke: manage) DeallocatePushTransport(DeallocatePushTransportRequest): DefaultSuccess = 2; /** This command is used to request the Node modifies the configuration of the specified push transport. */ - command access(invoke: administer) ModifyPushTransport(ModifyPushTransportRequest): DefaultSuccess = 3; + command access(invoke: manage) ModifyPushTransport(ModifyPushTransportRequest): DefaultSuccess = 3; /** This command SHALL be generated to request the Node modifies the Transport Status of the transport. */ - command access(invoke: administer) SetTransportStatus(SetTransportStatusRequest): DefaultSuccess = 4; + command access(invoke: manage) SetTransportStatus(SetTransportStatusRequest): DefaultSuccess = 4; /** This command SHALL be generated to request the Node to manually start the specified push transport. */ - command access(invoke: administer) ManuallyTriggerTransport(ManuallyTriggerTransportRequest): DefaultSuccess = 5; + command ManuallyTriggerTransport(ManuallyTriggerTransportRequest): DefaultSuccess = 5; /** This command SHALL return the Stream Options Configuration for the specified push transport. */ - command access(invoke: administer) FindStreamConfiguration(FindStreamConfigurationRequest): FindStreamConfigurationResponse = 6; + command FindTransport(FindTransportRequest): FindTransportResponse = 6; } /** This cluster provides facilities to configure and play Chime sounds, such as those used in a doorbell. */ diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index bb17d9b3176f31..90e13d0817940b 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -62351,17 +62351,17 @@ public long initWithDevice(long devicePtr, int endpointId) { return 0L; } - public void allocatePushTransport(AllocatePushTransportResponseCallback callback, ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions) { - allocatePushTransport(callback, streamTransportOptions, 0); + public void allocatePushTransport(AllocatePushTransportResponseCallback callback, ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions) { + allocatePushTransport(callback, transportOptions, 0); } - public void allocatePushTransport(AllocatePushTransportResponseCallback callback, ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions, int timedInvokeTimeoutMs) { + public void allocatePushTransport(AllocatePushTransportResponseCallback callback, ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions, int timedInvokeTimeoutMs) { final long commandId = 0L; ArrayList elements = new ArrayList<>(); - final long streamTransportOptionsFieldID = 0L; - BaseTLVType streamTransportOptionstlvValue = streamTransportOptions.encodeTlv(); - elements.add(new StructElement(streamTransportOptionsFieldID, streamTransportOptionstlvValue)); + final long transportOptionsFieldID = 0L; + BaseTLVType transportOptionstlvValue = transportOptions.encodeTlv(); + elements.add(new StructElement(transportOptionsFieldID, transportOptionstlvValue)); StructType commandArgs = new StructType(elements); invoke(new InvokeCallbackImpl(callback) { @@ -62369,8 +62369,8 @@ public void allocatePushTransport(AllocatePushTransportResponseCallback callback public void onResponse(StructType invokeStructValue) { final long connectionIDFieldID = 0L; Integer connectionID = null; - final long streamTransportOptionsFieldID = 1L; - ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions = null; + final long transportOptionsFieldID = 1L; + ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions = null; final long transportStatusFieldID = 2L; Integer transportStatus = null; for (StructElement element: invokeStructValue.value()) { @@ -62379,10 +62379,10 @@ public void onResponse(StructType invokeStructValue) { UIntType castingValue = element.value(UIntType.class); connectionID = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == streamTransportOptionsFieldID) { + } else if (element.contextTagNum() == transportOptionsFieldID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - streamTransportOptions = ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.decodeTlv(castingValue); + transportOptions = ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct.decodeTlv(castingValue); } } else if (element.contextTagNum() == transportStatusFieldID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { @@ -62391,7 +62391,7 @@ public void onResponse(StructType invokeStructValue) { } } } - callback.onSuccess(connectionID, streamTransportOptions, transportStatus); + callback.onSuccess(connectionID, transportOptions, transportStatus); }}, commandId, commandArgs, timedInvokeTimeoutMs); } @@ -62415,11 +62415,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void modifyPushTransport(DefaultClusterCallback callback, Integer connectionID, ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions) { - modifyPushTransport(callback, connectionID, streamTransportOptions, 0); + public void modifyPushTransport(DefaultClusterCallback callback, Integer connectionID, ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions) { + modifyPushTransport(callback, connectionID, transportOptions, 0); } - public void modifyPushTransport(DefaultClusterCallback callback, Integer connectionID, ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions, int timedInvokeTimeoutMs) { + public void modifyPushTransport(DefaultClusterCallback callback, Integer connectionID, ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions, int timedInvokeTimeoutMs) { final long commandId = 3L; ArrayList elements = new ArrayList<>(); @@ -62427,9 +62427,9 @@ public void modifyPushTransport(DefaultClusterCallback callback, Integer connect BaseTLVType connectionIDtlvValue = new UIntType(connectionID); elements.add(new StructElement(connectionIDFieldID, connectionIDtlvValue)); - final long streamTransportOptionsFieldID = 1L; - BaseTLVType streamTransportOptionstlvValue = streamTransportOptions.encodeTlv(); - elements.add(new StructElement(streamTransportOptionsFieldID, streamTransportOptionstlvValue)); + final long transportOptionsFieldID = 1L; + BaseTLVType transportOptionstlvValue = transportOptions.encodeTlv(); + elements.add(new StructElement(transportOptionsFieldID, transportOptionstlvValue)); StructType commandArgs = new StructType(elements); invoke(new InvokeCallbackImpl(callback) { @@ -62439,11 +62439,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void setTransportStatus(DefaultClusterCallback callback, @Nullable Integer connectionID, Integer streamTransportStatus) { - setTransportStatus(callback, connectionID, streamTransportStatus, 0); + public void setTransportStatus(DefaultClusterCallback callback, @Nullable Integer connectionID, Integer transportStatus) { + setTransportStatus(callback, connectionID, transportStatus, 0); } - public void setTransportStatus(DefaultClusterCallback callback, @Nullable Integer connectionID, Integer streamTransportStatus, int timedInvokeTimeoutMs) { + public void setTransportStatus(DefaultClusterCallback callback, @Nullable Integer connectionID, Integer transportStatus, int timedInvokeTimeoutMs) { final long commandId = 4L; ArrayList elements = new ArrayList<>(); @@ -62451,9 +62451,9 @@ public void setTransportStatus(DefaultClusterCallback callback, @Nullable Intege BaseTLVType connectionIDtlvValue = connectionID != null ? new UIntType(connectionID) : new NullType(); elements.add(new StructElement(connectionIDFieldID, connectionIDtlvValue)); - final long streamTransportStatusFieldID = 1L; - BaseTLVType streamTransportStatustlvValue = new UIntType(streamTransportStatus); - elements.add(new StructElement(streamTransportStatusFieldID, streamTransportStatustlvValue)); + final long transportStatusFieldID = 1L; + BaseTLVType transportStatustlvValue = new UIntType(transportStatus); + elements.add(new StructElement(transportStatusFieldID, transportStatustlvValue)); StructType commandArgs = new StructType(elements); invoke(new InvokeCallbackImpl(callback) { @@ -62463,11 +62463,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void manuallyTriggerTransport(DefaultClusterCallback callback, Integer connectionID, @Nullable Integer activationReason, @Nullable Optional timeControl) { + public void manuallyTriggerTransport(DefaultClusterCallback callback, Integer connectionID, @Nullable Integer activationReason, @Nullable Optional timeControl) { manuallyTriggerTransport(callback, connectionID, activationReason, timeControl, 0); } - public void manuallyTriggerTransport(DefaultClusterCallback callback, Integer connectionID, @Nullable Integer activationReason, @Nullable Optional timeControl, int timedInvokeTimeoutMs) { + public void manuallyTriggerTransport(DefaultClusterCallback callback, Integer connectionID, @Nullable Integer activationReason, @Nullable Optional timeControl, int timedInvokeTimeoutMs) { final long commandId = 5L; ArrayList elements = new ArrayList<>(); @@ -62491,11 +62491,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void findStreamConfiguration(FindStreamConfigurationResponseCallback callback, @Nullable Optional connectionID) { - findStreamConfiguration(callback, connectionID, 0); + public void findTransport(FindTransportResponseCallback callback, @Nullable Optional connectionID) { + findTransport(callback, connectionID, 0); } - public void findStreamConfiguration(FindStreamConfigurationResponseCallback callback, @Nullable Optional connectionID, int timedInvokeTimeoutMs) { + public void findTransport(FindTransportResponseCallback callback, @Nullable Optional connectionID, int timedInvokeTimeoutMs) { final long commandId = 6L; ArrayList elements = new ArrayList<>(); @@ -62508,12 +62508,12 @@ public void findStreamConfiguration(FindStreamConfigurationResponseCallback call @Override public void onResponse(StructType invokeStructValue) { final long streamConfigurationsFieldID = 0L; - ArrayList streamConfigurations = null; + ArrayList streamConfigurations = null; for (StructElement element: invokeStructValue.value()) { if (element.contextTagNum() == streamConfigurationsFieldID) { if (element.value(BaseTLVType.class).type() == TLVType.Array) { ArrayType castingValue = element.value(ArrayType.class); - streamConfigurations = castingValue.map((elementcastingValue) -> ChipStructs.PushAvStreamTransportClusterPushAVStreamConfigurationStruct.decodeTlv(elementcastingValue)); + streamConfigurations = castingValue.map((elementcastingValue) -> ChipStructs.PushAvStreamTransportClusterTransportConfigurationStruct.decodeTlv(elementcastingValue)); } } } @@ -62522,11 +62522,11 @@ public void onResponse(StructType invokeStructValue) { } public interface AllocatePushTransportResponseCallback extends BaseClusterCallback { - void onSuccess(Integer connectionID, ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions, Integer transportStatus); + void onSuccess(Integer connectionID, ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions, Integer transportStatus); } - public interface FindStreamConfigurationResponseCallback extends BaseClusterCallback { - void onSuccess(ArrayList streamConfigurations); + public interface FindTransportResponseCallback extends BaseClusterCallback { + void onSuccess(ArrayList streamConfigurations); } public interface CurrentConnectionsAttributeCallback extends BaseAttributeCallback { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java index 942206e175929d..4f9e38dddf2c43 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java @@ -6778,13 +6778,28 @@ public String toString() { } } public static class PushAvStreamTransportClusterPushTransportBeginEvent { + public Integer connectionID; + public Integer triggerType; + public Optional activationReason; + private static final long CONNECTION_ID_ID = 0L; + private static final long TRIGGER_TYPE_ID = 1L; + private static final long ACTIVATION_REASON_ID = 2L; public PushAvStreamTransportClusterPushTransportBeginEvent( + Integer connectionID, + Integer triggerType, + Optional activationReason ) { + this.connectionID = connectionID; + this.triggerType = triggerType; + this.activationReason = activationReason; } public StructType encodeTlv() { ArrayList values = new ArrayList<>(); + values.add(new StructElement(CONNECTION_ID_ID, new UIntType(connectionID))); + values.add(new StructElement(TRIGGER_TYPE_ID, new UIntType(triggerType))); + values.add(new StructElement(ACTIVATION_REASON_ID, activationReason.map((nonOptionalactivationReason) -> new UIntType(nonOptionalactivationReason)).orElse(new EmptyType()))); return new StructType(values); } @@ -6793,7 +6808,31 @@ public static PushAvStreamTransportClusterPushTransportBeginEvent decodeTlv(Base if (tlvValue == null || tlvValue.type() != TLVType.Struct) { return null; } + Integer connectionID = null; + Integer triggerType = null; + Optional activationReason = Optional.empty(); + for (StructElement element: ((StructType)tlvValue).value()) { + if (element.contextTagNum() == CONNECTION_ID_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + connectionID = castingValue.value(Integer.class); + } + } else if (element.contextTagNum() == TRIGGER_TYPE_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + triggerType = castingValue.value(Integer.class); + } + } else if (element.contextTagNum() == ACTIVATION_REASON_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + activationReason = Optional.of(castingValue.value(Integer.class)); + } + } + } return new PushAvStreamTransportClusterPushTransportBeginEvent( + connectionID, + triggerType, + activationReason ); } @@ -6801,28 +6840,42 @@ public static PushAvStreamTransportClusterPushTransportBeginEvent decodeTlv(Base public String toString() { StringBuilder output = new StringBuilder(); output.append("PushAvStreamTransportClusterPushTransportBeginEvent {\n"); + output.append("\tconnectionID: "); + output.append(connectionID); + output.append("\n"); + output.append("\ttriggerType: "); + output.append(triggerType); + output.append("\n"); + output.append("\tactivationReason: "); + output.append(activationReason); + output.append("\n"); output.append("}\n"); return output.toString(); } } public static class PushAvStreamTransportClusterPushTransportEndEvent { public Integer connectionID; - public ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct triggerDetails; + public Integer triggerType; + public Optional activationReason; private static final long CONNECTION_ID_ID = 0L; - private static final long TRIGGER_DETAILS_ID = 1L; + private static final long TRIGGER_TYPE_ID = 1L; + private static final long ACTIVATION_REASON_ID = 2L; public PushAvStreamTransportClusterPushTransportEndEvent( Integer connectionID, - ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct triggerDetails + Integer triggerType, + Optional activationReason ) { this.connectionID = connectionID; - this.triggerDetails = triggerDetails; + this.triggerType = triggerType; + this.activationReason = activationReason; } public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(CONNECTION_ID_ID, new UIntType(connectionID))); - values.add(new StructElement(TRIGGER_DETAILS_ID, triggerDetails.encodeTlv())); + values.add(new StructElement(TRIGGER_TYPE_ID, new UIntType(triggerType))); + values.add(new StructElement(ACTIVATION_REASON_ID, activationReason.map((nonOptionalactivationReason) -> new UIntType(nonOptionalactivationReason)).orElse(new EmptyType()))); return new StructType(values); } @@ -6832,23 +6885,30 @@ public static PushAvStreamTransportClusterPushTransportEndEvent decodeTlv(BaseTL return null; } Integer connectionID = null; - ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct triggerDetails = null; + Integer triggerType = null; + Optional activationReason = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { if (element.contextTagNum() == CONNECTION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); connectionID = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == TRIGGER_DETAILS_ID) { - if (element.value(BaseTLVType.class).type() == TLVType.Struct) { - StructType castingValue = element.value(StructType.class); - triggerDetails = ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.decodeTlv(castingValue); + } else if (element.contextTagNum() == TRIGGER_TYPE_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + triggerType = castingValue.value(Integer.class); + } + } else if (element.contextTagNum() == ACTIVATION_REASON_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + activationReason = Optional.of(castingValue.value(Integer.class)); } } } return new PushAvStreamTransportClusterPushTransportEndEvent( connectionID, - triggerDetails + triggerType, + activationReason ); } @@ -6859,8 +6919,11 @@ public String toString() { output.append("\tconnectionID: "); output.append(connectionID); output.append("\n"); - output.append("\ttriggerDetails: "); - output.append(triggerDetails); + output.append("\ttriggerType: "); + output.append(triggerType); + output.append("\n"); + output.append("\tactivationReason: "); + output.append(activationReason); output.append("\n"); output.append("}\n"); return output.toString(); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java index b5491189e8f125..7a6838b59b0294 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java @@ -14556,7 +14556,7 @@ public String toString() { return output.toString(); } } -public static class PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct { +public static class PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct { public Integer initialDuration; public Integer augmentationDuration; public Long maxDuration; @@ -14566,7 +14566,7 @@ public static class PushAvStreamTransportClusterPushAVStreamTransportMotionTrigg private static final long MAX_DURATION_ID = 2L; private static final long BLIND_DURATION_ID = 3L; - public PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct( + public PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct( Integer initialDuration, Integer augmentationDuration, Long maxDuration, @@ -14588,7 +14588,7 @@ public StructType encodeTlv() { return new StructType(values); } - public static PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct decodeTlv(BaseTLVType tlvValue) { + public static PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct decodeTlv(BaseTLVType tlvValue) { if (tlvValue == null || tlvValue.type() != TLVType.Struct) { return null; } @@ -14619,7 +14619,7 @@ public static PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTime } } } - return new PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct( + return new PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct( initialDuration, augmentationDuration, maxDuration, @@ -14630,7 +14630,7 @@ public static PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTime @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct {\n"); + output.append("PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct {\n"); output.append("\tinitialDuration: "); output.append(initialDuration); output.append("\n"); @@ -14647,7 +14647,68 @@ public String toString() { return output.toString(); } } -public static class PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct { +public static class PushAvStreamTransportClusterTransportZoneOptionsStruct { + public @Nullable Integer zone; + public Optional sensitivity; + private static final long ZONE_ID = 1L; + private static final long SENSITIVITY_ID = 2L; + + public PushAvStreamTransportClusterTransportZoneOptionsStruct( + @Nullable Integer zone, + Optional sensitivity + ) { + this.zone = zone; + this.sensitivity = sensitivity; + } + + public StructType encodeTlv() { + ArrayList values = new ArrayList<>(); + values.add(new StructElement(ZONE_ID, zone != null ? new UIntType(zone) : new NullType())); + values.add(new StructElement(SENSITIVITY_ID, sensitivity.map((nonOptionalsensitivity) -> new UIntType(nonOptionalsensitivity)).orElse(new EmptyType()))); + + return new StructType(values); + } + + public static PushAvStreamTransportClusterTransportZoneOptionsStruct decodeTlv(BaseTLVType tlvValue) { + if (tlvValue == null || tlvValue.type() != TLVType.Struct) { + return null; + } + @Nullable Integer zone = null; + Optional sensitivity = Optional.empty(); + for (StructElement element: ((StructType)tlvValue).value()) { + if (element.contextTagNum() == ZONE_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + zone = castingValue.value(Integer.class); + } + } else if (element.contextTagNum() == SENSITIVITY_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + sensitivity = Optional.of(castingValue.value(Integer.class)); + } + } + } + return new PushAvStreamTransportClusterTransportZoneOptionsStruct( + zone, + sensitivity + ); + } + + @Override + public String toString() { + StringBuilder output = new StringBuilder(); + output.append("PushAvStreamTransportClusterTransportZoneOptionsStruct {\n"); + output.append("\tzone: "); + output.append(zone); + output.append("\n"); + output.append("\tsensitivity: "); + output.append(sensitivity); + output.append("\n"); + output.append("}\n"); + return output.toString(); + } +} +public static class PushAvStreamTransportClusterMetadataOptionsStruct { public Integer multiplexing; public Boolean includeMotionZones; public Boolean enableMetadataPrivacySensitive; @@ -14655,7 +14716,7 @@ public static class PushAvStreamTransportClusterPushAVStreamTransportMetadataOpt private static final long INCLUDE_MOTION_ZONES_ID = 1L; private static final long ENABLE_METADATA_PRIVACY_SENSITIVE_ID = 2L; - public PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( + public PushAvStreamTransportClusterMetadataOptionsStruct( Integer multiplexing, Boolean includeMotionZones, Boolean enableMetadataPrivacySensitive @@ -14674,7 +14735,7 @@ public StructType encodeTlv() { return new StructType(values); } - public static PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct decodeTlv(BaseTLVType tlvValue) { + public static PushAvStreamTransportClusterMetadataOptionsStruct decodeTlv(BaseTLVType tlvValue) { if (tlvValue == null || tlvValue.type() != TLVType.Struct) { return null; } @@ -14699,7 +14760,7 @@ public static PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsSt } } } - return new PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( + return new PushAvStreamTransportClusterMetadataOptionsStruct( multiplexing, includeMotionZones, enableMetadataPrivacySensitive @@ -14709,7 +14770,7 @@ public static PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsSt @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct {\n"); + output.append("PushAvStreamTransportClusterMetadataOptionsStruct {\n"); output.append("\tmultiplexing: "); output.append(multiplexing); output.append("\n"); @@ -14723,52 +14784,52 @@ public String toString() { return output.toString(); } } -public static class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct { +public static class PushAvStreamTransportClusterTransportTriggerOptionsStruct { public Integer triggerType; - public @Nullable Optional> motionZones; + public @Nullable Optional> motionZones; public @Nullable Optional motionSensitivity; - public @Nullable Optional motionTimeControl; - public @Nullable Optional activationReason; + public Optional motionTimeControl; + public Optional maxPreRollLen; private static final long TRIGGER_TYPE_ID = 0L; private static final long MOTION_ZONES_ID = 1L; private static final long MOTION_SENSITIVITY_ID = 2L; private static final long MOTION_TIME_CONTROL_ID = 3L; - private static final long ACTIVATION_REASON_ID = 4L; + private static final long MAX_PRE_ROLL_LEN_ID = 4L; - public PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( + public PushAvStreamTransportClusterTransportTriggerOptionsStruct( Integer triggerType, - @Nullable Optional> motionZones, + @Nullable Optional> motionZones, @Nullable Optional motionSensitivity, - @Nullable Optional motionTimeControl, - @Nullable Optional activationReason + Optional motionTimeControl, + Optional maxPreRollLen ) { this.triggerType = triggerType; this.motionZones = motionZones; this.motionSensitivity = motionSensitivity; this.motionTimeControl = motionTimeControl; - this.activationReason = activationReason; + this.maxPreRollLen = maxPreRollLen; } public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(TRIGGER_TYPE_ID, new UIntType(triggerType))); - values.add(new StructElement(MOTION_ZONES_ID, motionZones != null ? motionZones.map((nonOptionalmotionZones) -> ArrayType.generateArrayType(nonOptionalmotionZones, (elementnonOptionalmotionZones) -> new UIntType(elementnonOptionalmotionZones))).orElse(new EmptyType()) : new NullType())); + values.add(new StructElement(MOTION_ZONES_ID, motionZones != null ? motionZones.map((nonOptionalmotionZones) -> ArrayType.generateArrayType(nonOptionalmotionZones, (elementnonOptionalmotionZones) -> elementnonOptionalmotionZones.encodeTlv())).orElse(new EmptyType()) : new NullType())); values.add(new StructElement(MOTION_SENSITIVITY_ID, motionSensitivity != null ? motionSensitivity.map((nonOptionalmotionSensitivity) -> new UIntType(nonOptionalmotionSensitivity)).orElse(new EmptyType()) : new NullType())); - values.add(new StructElement(MOTION_TIME_CONTROL_ID, motionTimeControl != null ? motionTimeControl.map((nonOptionalmotionTimeControl) -> nonOptionalmotionTimeControl.encodeTlv()).orElse(new EmptyType()) : new NullType())); - values.add(new StructElement(ACTIVATION_REASON_ID, activationReason != null ? activationReason.map((nonOptionalactivationReason) -> new UIntType(nonOptionalactivationReason)).orElse(new EmptyType()) : new NullType())); + values.add(new StructElement(MOTION_TIME_CONTROL_ID, motionTimeControl.map((nonOptionalmotionTimeControl) -> nonOptionalmotionTimeControl.encodeTlv()).orElse(new EmptyType()))); + values.add(new StructElement(MAX_PRE_ROLL_LEN_ID, maxPreRollLen.map((nonOptionalmaxPreRollLen) -> new UIntType(nonOptionalmaxPreRollLen)).orElse(new EmptyType()))); return new StructType(values); } - public static PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct decodeTlv(BaseTLVType tlvValue) { + public static PushAvStreamTransportClusterTransportTriggerOptionsStruct decodeTlv(BaseTLVType tlvValue) { if (tlvValue == null || tlvValue.type() != TLVType.Struct) { return null; } Integer triggerType = null; - @Nullable Optional> motionZones = null; + @Nullable Optional> motionZones = null; @Nullable Optional motionSensitivity = null; - @Nullable Optional motionTimeControl = null; - @Nullable Optional activationReason = null; + Optional motionTimeControl = Optional.empty(); + Optional maxPreRollLen = Optional.empty(); for (StructElement element: ((StructType)tlvValue).value()) { if (element.contextTagNum() == TRIGGER_TYPE_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { @@ -14778,7 +14839,7 @@ public static PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStr } else if (element.contextTagNum() == MOTION_ZONES_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Array) { ArrayType castingValue = element.value(ArrayType.class); - motionZones = Optional.of(castingValue.map((elementcastingValue) -> elementcastingValue.value(Integer.class))); + motionZones = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.PushAvStreamTransportClusterTransportZoneOptionsStruct.decodeTlv(elementcastingValue))); } } else if (element.contextTagNum() == MOTION_SENSITIVITY_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { @@ -14788,28 +14849,28 @@ public static PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStr } else if (element.contextTagNum() == MOTION_TIME_CONTROL_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - motionTimeControl = Optional.of(ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.decodeTlv(castingValue)); + motionTimeControl = Optional.of(ChipStructs.PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.decodeTlv(castingValue)); } - } else if (element.contextTagNum() == ACTIVATION_REASON_ID) { + } else if (element.contextTagNum() == MAX_PRE_ROLL_LEN_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - activationReason = Optional.of(castingValue.value(Integer.class)); + maxPreRollLen = Optional.of(castingValue.value(Integer.class)); } } } - return new PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( + return new PushAvStreamTransportClusterTransportTriggerOptionsStruct( triggerType, motionZones, motionSensitivity, motionTimeControl, - activationReason + maxPreRollLen ); } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct {\n"); + output.append("PushAvStreamTransportClusterTransportTriggerOptionsStruct {\n"); output.append("\ttriggerType: "); output.append(triggerType); output.append("\n"); @@ -14822,20 +14883,20 @@ public String toString() { output.append("\tmotionTimeControl: "); output.append(motionTimeControl); output.append("\n"); - output.append("\tactivationReason: "); - output.append(activationReason); + output.append("\tmaxPreRollLen: "); + output.append(maxPreRollLen); output.append("\n"); output.append("}\n"); return output.toString(); } } -public static class PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct { +public static class PushAvStreamTransportClusterCMAFContainerOptionsStruct { public Integer chunkDuration; public @Nullable Optional CENCKey; private static final long CHUNK_DURATION_ID = 0L; private static final long CENC_KEY_ID = 1L; - public PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct( + public PushAvStreamTransportClusterCMAFContainerOptionsStruct( Integer chunkDuration, @Nullable Optional CENCKey ) { @@ -14851,7 +14912,7 @@ public StructType encodeTlv() { return new StructType(values); } - public static PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct decodeTlv(BaseTLVType tlvValue) { + public static PushAvStreamTransportClusterCMAFContainerOptionsStruct decodeTlv(BaseTLVType tlvValue) { if (tlvValue == null || tlvValue.type() != TLVType.Struct) { return null; } @@ -14870,7 +14931,7 @@ public static PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOpti } } } - return new PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct( + return new PushAvStreamTransportClusterCMAFContainerOptionsStruct( chunkDuration, CENCKey ); @@ -14879,7 +14940,7 @@ public static PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOpti @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct {\n"); + output.append("PushAvStreamTransportClusterCMAFContainerOptionsStruct {\n"); output.append("\tchunkDuration: "); output.append(chunkDuration); output.append("\n"); @@ -14890,15 +14951,15 @@ public String toString() { return output.toString(); } } -public static class PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct { +public static class PushAvStreamTransportClusterContainerOptionsStruct { public Integer containerType; - public @Nullable Optional CMAFContainerOptions; + public @Nullable Optional CMAFContainerOptions; private static final long CONTAINER_TYPE_ID = 0L; private static final long CMAF_CONTAINER_OPTIONS_ID = 1L; - public PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( + public PushAvStreamTransportClusterContainerOptionsStruct( Integer containerType, - @Nullable Optional CMAFContainerOptions + @Nullable Optional CMAFContainerOptions ) { this.containerType = containerType; this.CMAFContainerOptions = CMAFContainerOptions; @@ -14912,12 +14973,12 @@ public StructType encodeTlv() { return new StructType(values); } - public static PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct decodeTlv(BaseTLVType tlvValue) { + public static PushAvStreamTransportClusterContainerOptionsStruct decodeTlv(BaseTLVType tlvValue) { if (tlvValue == null || tlvValue.type() != TLVType.Struct) { return null; } Integer containerType = null; - @Nullable Optional CMAFContainerOptions = null; + @Nullable Optional CMAFContainerOptions = null; for (StructElement element: ((StructType)tlvValue).value()) { if (element.contextTagNum() == CONTAINER_TYPE_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { @@ -14927,11 +14988,11 @@ public static PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsS } else if (element.contextTagNum() == CMAF_CONTAINER_OPTIONS_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - CMAFContainerOptions = Optional.of(ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.decodeTlv(castingValue)); + CMAFContainerOptions = Optional.of(ChipStructs.PushAvStreamTransportClusterCMAFContainerOptionsStruct.decodeTlv(castingValue)); } } } - return new PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( + return new PushAvStreamTransportClusterContainerOptionsStruct( containerType, CMAFContainerOptions ); @@ -14940,7 +15001,7 @@ public static PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsS @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct {\n"); + output.append("PushAvStreamTransportClusterContainerOptionsStruct {\n"); output.append("\tcontainerType: "); output.append(containerType); output.append("\n"); @@ -14951,51 +15012,51 @@ public String toString() { return output.toString(); } } -public static class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct { +public static class PushAvStreamTransportClusterTransportOptionsStruct { public Integer streamType; - public @Nullable Optional videoStreamID; - public @Nullable Optional audioStreamID; - public Integer TLSEndpointID; + public Optional videoStreamID; + public Optional audioStreamID; + public Integer endpointID; public String url; - public ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct triggerOptions; - public Integer containerFormat; + public ChipStructs.PushAvStreamTransportClusterTransportTriggerOptionsStruct triggerOptions; public Integer ingestMethod; - public ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct containerOptions; - public @Nullable Optional metadataOptions; + public Integer containerFormat; + public ChipStructs.PushAvStreamTransportClusterContainerOptionsStruct containerOptions; + public @Nullable Optional metadataOptions; public @Nullable Optional expiryTime; private static final long STREAM_TYPE_ID = 0L; private static final long VIDEO_STREAM_ID_ID = 1L; private static final long AUDIO_STREAM_ID_ID = 2L; - private static final long TLS_ENDPOINT_ID_ID = 3L; + private static final long ENDPOINT_ID_ID = 3L; private static final long URL_ID = 4L; private static final long TRIGGER_OPTIONS_ID = 5L; - private static final long CONTAINER_FORMAT_ID = 6L; - private static final long INGEST_METHOD_ID = 7L; + private static final long INGEST_METHOD_ID = 6L; + private static final long CONTAINER_FORMAT_ID = 7L; private static final long CONTAINER_OPTIONS_ID = 8L; private static final long METADATA_OPTIONS_ID = 9L; private static final long EXPIRY_TIME_ID = 10L; - public PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( + public PushAvStreamTransportClusterTransportOptionsStruct( Integer streamType, - @Nullable Optional videoStreamID, - @Nullable Optional audioStreamID, - Integer TLSEndpointID, + Optional videoStreamID, + Optional audioStreamID, + Integer endpointID, String url, - ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct triggerOptions, - Integer containerFormat, + ChipStructs.PushAvStreamTransportClusterTransportTriggerOptionsStruct triggerOptions, Integer ingestMethod, - ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct containerOptions, - @Nullable Optional metadataOptions, + Integer containerFormat, + ChipStructs.PushAvStreamTransportClusterContainerOptionsStruct containerOptions, + @Nullable Optional metadataOptions, @Nullable Optional expiryTime ) { this.streamType = streamType; this.videoStreamID = videoStreamID; this.audioStreamID = audioStreamID; - this.TLSEndpointID = TLSEndpointID; + this.endpointID = endpointID; this.url = url; this.triggerOptions = triggerOptions; - this.containerFormat = containerFormat; this.ingestMethod = ingestMethod; + this.containerFormat = containerFormat; this.containerOptions = containerOptions; this.metadataOptions = metadataOptions; this.expiryTime = expiryTime; @@ -15004,13 +15065,13 @@ public PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(STREAM_TYPE_ID, new UIntType(streamType))); - values.add(new StructElement(VIDEO_STREAM_ID_ID, videoStreamID != null ? videoStreamID.map((nonOptionalvideoStreamID) -> new UIntType(nonOptionalvideoStreamID)).orElse(new EmptyType()) : new NullType())); - values.add(new StructElement(AUDIO_STREAM_ID_ID, audioStreamID != null ? audioStreamID.map((nonOptionalaudioStreamID) -> new UIntType(nonOptionalaudioStreamID)).orElse(new EmptyType()) : new NullType())); - values.add(new StructElement(TLS_ENDPOINT_ID_ID, new UIntType(TLSEndpointID))); + values.add(new StructElement(VIDEO_STREAM_ID_ID, videoStreamID.map((nonOptionalvideoStreamID) -> new UIntType(nonOptionalvideoStreamID)).orElse(new EmptyType()))); + values.add(new StructElement(AUDIO_STREAM_ID_ID, audioStreamID.map((nonOptionalaudioStreamID) -> new UIntType(nonOptionalaudioStreamID)).orElse(new EmptyType()))); + values.add(new StructElement(ENDPOINT_ID_ID, new UIntType(endpointID))); values.add(new StructElement(URL_ID, new StringType(url))); values.add(new StructElement(TRIGGER_OPTIONS_ID, triggerOptions.encodeTlv())); - values.add(new StructElement(CONTAINER_FORMAT_ID, new UIntType(containerFormat))); values.add(new StructElement(INGEST_METHOD_ID, new UIntType(ingestMethod))); + values.add(new StructElement(CONTAINER_FORMAT_ID, new UIntType(containerFormat))); values.add(new StructElement(CONTAINER_OPTIONS_ID, containerOptions.encodeTlv())); values.add(new StructElement(METADATA_OPTIONS_ID, metadataOptions != null ? metadataOptions.map((nonOptionalmetadataOptions) -> nonOptionalmetadataOptions.encodeTlv()).orElse(new EmptyType()) : new NullType())); values.add(new StructElement(EXPIRY_TIME_ID, expiryTime != null ? expiryTime.map((nonOptionalexpiryTime) -> new UIntType(nonOptionalexpiryTime)).orElse(new EmptyType()) : new NullType())); @@ -15018,20 +15079,20 @@ public StructType encodeTlv() { return new StructType(values); } - public static PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct decodeTlv(BaseTLVType tlvValue) { + public static PushAvStreamTransportClusterTransportOptionsStruct decodeTlv(BaseTLVType tlvValue) { if (tlvValue == null || tlvValue.type() != TLVType.Struct) { return null; } Integer streamType = null; - @Nullable Optional videoStreamID = null; - @Nullable Optional audioStreamID = null; - Integer TLSEndpointID = null; + Optional videoStreamID = Optional.empty(); + Optional audioStreamID = Optional.empty(); + Integer endpointID = null; String url = null; - ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct triggerOptions = null; - Integer containerFormat = null; + ChipStructs.PushAvStreamTransportClusterTransportTriggerOptionsStruct triggerOptions = null; Integer ingestMethod = null; - ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct containerOptions = null; - @Nullable Optional metadataOptions = null; + Integer containerFormat = null; + ChipStructs.PushAvStreamTransportClusterContainerOptionsStruct containerOptions = null; + @Nullable Optional metadataOptions = null; @Nullable Optional expiryTime = null; for (StructElement element: ((StructType)tlvValue).value()) { if (element.contextTagNum() == STREAM_TYPE_ID) { @@ -15049,10 +15110,10 @@ public static PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct dec UIntType castingValue = element.value(UIntType.class); audioStreamID = Optional.of(castingValue.value(Integer.class)); } - } else if (element.contextTagNum() == TLS_ENDPOINT_ID_ID) { + } else if (element.contextTagNum() == ENDPOINT_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - TLSEndpointID = castingValue.value(Integer.class); + endpointID = castingValue.value(Integer.class); } } else if (element.contextTagNum() == URL_ID) { if (element.value(BaseTLVType.class).type() == TLVType.String) { @@ -15062,27 +15123,27 @@ public static PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct dec } else if (element.contextTagNum() == TRIGGER_OPTIONS_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - triggerOptions = ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.decodeTlv(castingValue); + triggerOptions = ChipStructs.PushAvStreamTransportClusterTransportTriggerOptionsStruct.decodeTlv(castingValue); } - } else if (element.contextTagNum() == CONTAINER_FORMAT_ID) { + } else if (element.contextTagNum() == INGEST_METHOD_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - containerFormat = castingValue.value(Integer.class); + ingestMethod = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == INGEST_METHOD_ID) { + } else if (element.contextTagNum() == CONTAINER_FORMAT_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - ingestMethod = castingValue.value(Integer.class); + containerFormat = castingValue.value(Integer.class); } } else if (element.contextTagNum() == CONTAINER_OPTIONS_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - containerOptions = ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.decodeTlv(castingValue); + containerOptions = ChipStructs.PushAvStreamTransportClusterContainerOptionsStruct.decodeTlv(castingValue); } } else if (element.contextTagNum() == METADATA_OPTIONS_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - metadataOptions = Optional.of(ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.decodeTlv(castingValue)); + metadataOptions = Optional.of(ChipStructs.PushAvStreamTransportClusterMetadataOptionsStruct.decodeTlv(castingValue)); } } else if (element.contextTagNum() == EXPIRY_TIME_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { @@ -15091,15 +15152,15 @@ public static PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct dec } } } - return new PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( + return new PushAvStreamTransportClusterTransportOptionsStruct( streamType, videoStreamID, audioStreamID, - TLSEndpointID, + endpointID, url, triggerOptions, - containerFormat, ingestMethod, + containerFormat, containerOptions, metadataOptions, expiryTime @@ -15109,7 +15170,7 @@ public static PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct dec @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct {\n"); + output.append("PushAvStreamTransportClusterTransportOptionsStruct {\n"); output.append("\tstreamType: "); output.append(streamType); output.append("\n"); @@ -15119,8 +15180,8 @@ public String toString() { output.append("\taudioStreamID: "); output.append(audioStreamID); output.append("\n"); - output.append("\tTLSEndpointID: "); - output.append(TLSEndpointID); + output.append("\tendpointID: "); + output.append(endpointID); output.append("\n"); output.append("\turl: "); output.append(url); @@ -15128,12 +15189,12 @@ public String toString() { output.append("\ttriggerOptions: "); output.append(triggerOptions); output.append("\n"); - output.append("\tcontainerFormat: "); - output.append(containerFormat); - output.append("\n"); output.append("\tingestMethod: "); output.append(ingestMethod); output.append("\n"); + output.append("\tcontainerFormat: "); + output.append(containerFormat); + output.append("\n"); output.append("\tcontainerOptions: "); output.append(containerOptions); output.append("\n"); @@ -15147,77 +15208,77 @@ public String toString() { return output.toString(); } } -public static class PushAvStreamTransportClusterPushAVStreamConfigurationStruct { +public static class PushAvStreamTransportClusterTransportConfigurationStruct { public Integer connectionID; - public Integer streamTransportStatus; - public ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions; + public Integer transportStatus; + public ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions; private static final long CONNECTION_ID_ID = 0L; - private static final long STREAM_TRANSPORT_STATUS_ID = 1L; - private static final long STREAM_TRANSPORT_OPTIONS_ID = 2L; + private static final long TRANSPORT_STATUS_ID = 1L; + private static final long TRANSPORT_OPTIONS_ID = 2L; - public PushAvStreamTransportClusterPushAVStreamConfigurationStruct( + public PushAvStreamTransportClusterTransportConfigurationStruct( Integer connectionID, - Integer streamTransportStatus, - ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions + Integer transportStatus, + ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions ) { this.connectionID = connectionID; - this.streamTransportStatus = streamTransportStatus; - this.streamTransportOptions = streamTransportOptions; + this.transportStatus = transportStatus; + this.transportOptions = transportOptions; } public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(CONNECTION_ID_ID, new UIntType(connectionID))); - values.add(new StructElement(STREAM_TRANSPORT_STATUS_ID, new UIntType(streamTransportStatus))); - values.add(new StructElement(STREAM_TRANSPORT_OPTIONS_ID, streamTransportOptions.encodeTlv())); + values.add(new StructElement(TRANSPORT_STATUS_ID, new UIntType(transportStatus))); + values.add(new StructElement(TRANSPORT_OPTIONS_ID, transportOptions.encodeTlv())); return new StructType(values); } - public static PushAvStreamTransportClusterPushAVStreamConfigurationStruct decodeTlv(BaseTLVType tlvValue) { + public static PushAvStreamTransportClusterTransportConfigurationStruct decodeTlv(BaseTLVType tlvValue) { if (tlvValue == null || tlvValue.type() != TLVType.Struct) { return null; } Integer connectionID = null; - Integer streamTransportStatus = null; - ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions = null; + Integer transportStatus = null; + ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions = null; for (StructElement element: ((StructType)tlvValue).value()) { if (element.contextTagNum() == CONNECTION_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); connectionID = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == STREAM_TRANSPORT_STATUS_ID) { + } else if (element.contextTagNum() == TRANSPORT_STATUS_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - streamTransportStatus = castingValue.value(Integer.class); + transportStatus = castingValue.value(Integer.class); } - } else if (element.contextTagNum() == STREAM_TRANSPORT_OPTIONS_ID) { + } else if (element.contextTagNum() == TRANSPORT_OPTIONS_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - streamTransportOptions = ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.decodeTlv(castingValue); + transportOptions = ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct.decodeTlv(castingValue); } } } - return new PushAvStreamTransportClusterPushAVStreamConfigurationStruct( + return new PushAvStreamTransportClusterTransportConfigurationStruct( connectionID, - streamTransportStatus, - streamTransportOptions + transportStatus, + transportOptions ); } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("PushAvStreamTransportClusterPushAVStreamConfigurationStruct {\n"); + output.append("PushAvStreamTransportClusterTransportConfigurationStruct {\n"); output.append("\tconnectionID: "); output.append(connectionID); output.append("\n"); - output.append("\tstreamTransportStatus: "); - output.append(streamTransportStatus); + output.append("\ttransportStatus: "); + output.append(transportStatus); output.append("\n"); - output.append("\tstreamTransportOptions: "); - output.append(streamTransportOptions); + output.append("\ttransportOptions: "); + output.append(transportOptions); output.append("\n"); output.append("}\n"); return output.toString(); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index 854f4497ef4554..1b8069862c3aa5 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -17802,7 +17802,7 @@ public enum Command { ModifyPushTransport(3L), SetTransportStatus(4L), ManuallyTriggerTransport(5L), - FindStreamConfiguration(6L),; + FindTransport(6L),; private final long id; Command(long id) { this.id = id; @@ -17820,7 +17820,7 @@ public static Command value(long id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum AllocatePushTransportCommandField {StreamTransportOptions(0),; + }public enum AllocatePushTransportCommandField {TransportOptions(0),; private final int id; AllocatePushTransportCommandField(int id) { this.id = id; @@ -17854,7 +17854,7 @@ public static DeallocatePushTransportCommandField value(int id) throws NoSuchFie } throw new NoSuchFieldError(); } - }public enum ModifyPushTransportCommandField {ConnectionID(0),StreamTransportOptions(1),; + }public enum ModifyPushTransportCommandField {ConnectionID(0),TransportOptions(1),; private final int id; ModifyPushTransportCommandField(int id) { this.id = id; @@ -17871,7 +17871,7 @@ public static ModifyPushTransportCommandField value(int id) throws NoSuchFieldEr } throw new NoSuchFieldError(); } - }public enum SetTransportStatusCommandField {ConnectionID(0),StreamTransportStatus(1),; + }public enum SetTransportStatusCommandField {ConnectionID(0),TransportStatus(1),; private final int id; SetTransportStatusCommandField(int id) { this.id = id; @@ -17905,17 +17905,17 @@ public static ManuallyTriggerTransportCommandField value(int id) throws NoSuchFi } throw new NoSuchFieldError(); } - }public enum FindStreamConfigurationCommandField {ConnectionID(0),; + }public enum FindTransportCommandField {ConnectionID(0),; private final int id; - FindStreamConfigurationCommandField(int id) { + FindTransportCommandField(int id) { this.id = id; } public int getID() { return id; } - public static FindStreamConfigurationCommandField value(int id) throws NoSuchFieldError { - for (FindStreamConfigurationCommandField field : FindStreamConfigurationCommandField.values()) { + public static FindTransportCommandField value(int id) throws NoSuchFieldError { + for (FindTransportCommandField field : FindTransportCommandField.values()) { if (field.getID() == id) { return field; } diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java index b03b2a67dacd6b..78ea354adc9d7e 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java @@ -20735,12 +20735,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer connectionID, ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct streamTransportOptions, Integer transportStatus) { + public void onSuccess(Integer connectionID, ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct transportOptions, Integer transportStatus) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo connectionIDResponseValue = new CommandResponseInfo("connectionID", "Integer"); responseValues.put(connectionIDResponseValue, connectionID); - // streamTransportOptions: Struct PushAVStreamTransportOptionsStruct + // transportOptions: Struct TransportOptionsStruct // Conversion from this type to Java is not properly implemented yet CommandResponseInfo transportStatusResponseValue = new CommandResponseInfo("transportStatus", "Integer"); responseValues.put(transportStatusResponseValue, transportStatus); @@ -20753,7 +20753,7 @@ public void onError(Exception error) { } } - public static class DelegatedPushAvStreamTransportClusterFindStreamConfigurationResponseCallback implements ChipClusters.PushAvStreamTransportCluster.FindStreamConfigurationResponseCallback, DelegatedClusterCallback { + public static class DelegatedPushAvStreamTransportClusterFindTransportResponseCallback implements ChipClusters.PushAvStreamTransportCluster.FindTransportResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -20761,10 +20761,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(ArrayList streamConfigurations) { + public void onSuccess(ArrayList streamConfigurations) { Map responseValues = new LinkedHashMap<>(); - // streamConfigurations: PushAVStreamConfigurationStruct + // streamConfigurations: TransportConfigurationStruct // Conversion from this type to Java is not properly implemented yet callback.onSuccess(responseValues); @@ -30301,8 +30301,8 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.PushAvStreamTransportCluster) cluster) .allocatePushTransport((ChipClusters.PushAvStreamTransportCluster.AllocatePushTransportResponseCallback) callback - , (ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct) - commandArguments.get("streamTransportOptions") + , (ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct) + commandArguments.get("transportOptions") ); }, @@ -30339,8 +30339,8 @@ public Map> getCommandMap() { .modifyPushTransport((DefaultClusterCallback) callback , (Integer) commandArguments.get("connectionID") - , (ChipStructs.PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct) - commandArguments.get("streamTransportOptions") + , (ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct) + commandArguments.get("transportOptions") ); }, () -> new DelegatedDefaultClusterCallback(), @@ -30353,8 +30353,8 @@ public Map> getCommandMap() { CommandParameterInfo pushAvStreamTransportsetTransportStatusconnectionIDCommandParameterInfo = new CommandParameterInfo("connectionID", Integer.class, Integer.class); pushAvStreamTransportsetTransportStatusCommandParams.put("connectionID",pushAvStreamTransportsetTransportStatusconnectionIDCommandParameterInfo); - CommandParameterInfo pushAvStreamTransportsetTransportStatusstreamTransportStatusCommandParameterInfo = new CommandParameterInfo("streamTransportStatus", Integer.class, Integer.class); - pushAvStreamTransportsetTransportStatusCommandParams.put("streamTransportStatus",pushAvStreamTransportsetTransportStatusstreamTransportStatusCommandParameterInfo); + CommandParameterInfo pushAvStreamTransportsetTransportStatustransportStatusCommandParameterInfo = new CommandParameterInfo("transportStatus", Integer.class, Integer.class); + pushAvStreamTransportsetTransportStatusCommandParams.put("transportStatus",pushAvStreamTransportsetTransportStatustransportStatusCommandParameterInfo); InteractionInfo pushAvStreamTransportsetTransportStatusInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.PushAvStreamTransportCluster) cluster) @@ -30362,7 +30362,7 @@ public Map> getCommandMap() { , (Integer) commandArguments.get("connectionID") , (Integer) - commandArguments.get("streamTransportStatus") + commandArguments.get("transportStatus") ); }, () -> new DelegatedDefaultClusterCallback(), @@ -30386,7 +30386,7 @@ public Map> getCommandMap() { commandArguments.get("connectionID") , (Integer) commandArguments.get("activationReason") - , (Optional) + , (Optional) commandArguments.get("timeControl") ); }, @@ -30395,23 +30395,23 @@ public Map> getCommandMap() { ); pushAvStreamTransportClusterInteractionInfoMap.put("manuallyTriggerTransport", pushAvStreamTransportmanuallyTriggerTransportInteractionInfo); - Map pushAvStreamTransportfindStreamConfigurationCommandParams = new LinkedHashMap(); + Map pushAvStreamTransportfindTransportCommandParams = new LinkedHashMap(); - CommandParameterInfo pushAvStreamTransportfindStreamConfigurationconnectionIDCommandParameterInfo = new CommandParameterInfo("connectionID", Optional.class, Integer.class); - pushAvStreamTransportfindStreamConfigurationCommandParams.put("connectionID",pushAvStreamTransportfindStreamConfigurationconnectionIDCommandParameterInfo); - InteractionInfo pushAvStreamTransportfindStreamConfigurationInteractionInfo = new InteractionInfo( + CommandParameterInfo pushAvStreamTransportfindTransportconnectionIDCommandParameterInfo = new CommandParameterInfo("connectionID", Optional.class, Integer.class); + pushAvStreamTransportfindTransportCommandParams.put("connectionID",pushAvStreamTransportfindTransportconnectionIDCommandParameterInfo); + InteractionInfo pushAvStreamTransportfindTransportInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.PushAvStreamTransportCluster) cluster) - .findStreamConfiguration((ChipClusters.PushAvStreamTransportCluster.FindStreamConfigurationResponseCallback) callback + .findTransport((ChipClusters.PushAvStreamTransportCluster.FindTransportResponseCallback) callback , (Optional) commandArguments.get("connectionID") ); }, - () -> new DelegatedPushAvStreamTransportClusterFindStreamConfigurationResponseCallback(), - pushAvStreamTransportfindStreamConfigurationCommandParams + () -> new DelegatedPushAvStreamTransportClusterFindTransportResponseCallback(), + pushAvStreamTransportfindTransportCommandParams ); - pushAvStreamTransportClusterInteractionInfoMap.put("findStreamConfiguration", pushAvStreamTransportfindStreamConfigurationInteractionInfo); + pushAvStreamTransportClusterInteractionInfoMap.put("findTransport", pushAvStreamTransportfindTransportInteractionInfo); commandMap.put("pushAvStreamTransport", pushAvStreamTransportClusterInteractionInfoMap); diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt new file mode 100644 index 00000000000000..c95fd429ca29e8 --- /dev/null +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt @@ -0,0 +1,80 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package chip.devicecontroller.cluster.eventstructs + +import chip.devicecontroller.cluster.* +import java.util.Optional +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class PushAvStreamTransportClusterPushTransportBeginEvent( + val connectionID: UInt, + val triggerType: UInt, + val activationReason: Optional, +) { + override fun toString(): String = buildString { + append("PushAvStreamTransportClusterPushTransportBeginEvent {\n") + append("\tconnectionID : $connectionID\n") + append("\ttriggerType : $triggerType\n") + append("\tactivationReason : $activationReason\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + put(ContextSpecificTag(TAG_CONNECTION_ID), connectionID) + put(ContextSpecificTag(TAG_TRIGGER_TYPE), triggerType) + if (activationReason.isPresent) { + val optactivationReason = activationReason.get() + put(ContextSpecificTag(TAG_ACTIVATION_REASON), optactivationReason) + } + endStructure() + } + } + + companion object { + private const val TAG_CONNECTION_ID = 0 + private const val TAG_TRIGGER_TYPE = 1 + private const val TAG_ACTIVATION_REASON = 2 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): PushAvStreamTransportClusterPushTransportBeginEvent { + tlvReader.enterStructure(tlvTag) + val connectionID = tlvReader.getUInt(ContextSpecificTag(TAG_CONNECTION_ID)) + val triggerType = tlvReader.getUInt(ContextSpecificTag(TAG_TRIGGER_TYPE)) + val activationReason = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_ACTIVATION_REASON))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_ACTIVATION_REASON))) + } else { + Optional.empty() + } + + tlvReader.exitContainer() + + return PushAvStreamTransportClusterPushTransportBeginEvent( + connectionID, + triggerType, + activationReason, + ) + } + } +} diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt index d45dac5bfb61f6..641a39364a04df 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt @@ -17,6 +17,7 @@ package chip.devicecontroller.cluster.eventstructs import chip.devicecontroller.cluster.* +import java.util.Optional import matter.tlv.ContextSpecificTag import matter.tlv.Tag import matter.tlv.TlvReader @@ -24,13 +25,14 @@ import matter.tlv.TlvWriter class PushAvStreamTransportClusterPushTransportEndEvent( val connectionID: UInt, - val triggerDetails: - chip.devicecontroller.cluster.structs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct, + val triggerType: UInt, + val activationReason: Optional, ) { override fun toString(): String = buildString { append("PushAvStreamTransportClusterPushTransportEndEvent {\n") append("\tconnectionID : $connectionID\n") - append("\ttriggerDetails : $triggerDetails\n") + append("\ttriggerType : $triggerType\n") + append("\tactivationReason : $activationReason\n") append("}\n") } @@ -38,14 +40,19 @@ class PushAvStreamTransportClusterPushTransportEndEvent( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_CONNECTION_ID), connectionID) - triggerDetails.toTlv(ContextSpecificTag(TAG_TRIGGER_DETAILS), this) + put(ContextSpecificTag(TAG_TRIGGER_TYPE), triggerType) + if (activationReason.isPresent) { + val optactivationReason = activationReason.get() + put(ContextSpecificTag(TAG_ACTIVATION_REASON), optactivationReason) + } endStructure() } } companion object { private const val TAG_CONNECTION_ID = 0 - private const val TAG_TRIGGER_DETAILS = 1 + private const val TAG_TRIGGER_TYPE = 1 + private const val TAG_ACTIVATION_REASON = 2 fun fromTlv( tlvTag: Tag, @@ -53,14 +60,21 @@ class PushAvStreamTransportClusterPushTransportEndEvent( ): PushAvStreamTransportClusterPushTransportEndEvent { tlvReader.enterStructure(tlvTag) val connectionID = tlvReader.getUInt(ContextSpecificTag(TAG_CONNECTION_ID)) - val triggerDetails = - chip.devicecontroller.cluster.structs - .PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct - .fromTlv(ContextSpecificTag(TAG_TRIGGER_DETAILS), tlvReader) + val triggerType = tlvReader.getUInt(ContextSpecificTag(TAG_TRIGGER_TYPE)) + val activationReason = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_ACTIVATION_REASON))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_ACTIVATION_REASON))) + } else { + Optional.empty() + } tlvReader.exitContainer() - return PushAvStreamTransportClusterPushTransportEndEvent(connectionID, triggerDetails) + return PushAvStreamTransportClusterPushTransportEndEvent( + connectionID, + triggerType, + activationReason, + ) } } } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni index f7d2e33fa19eb0..b1b0a5cbd6acbe 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni @@ -122,13 +122,14 @@ structs_sources = [ "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt", - "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt", - "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt", - "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt", - "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt", - "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt", - "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt", - "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterContainerOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterMetadataOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt", @@ -243,6 +244,7 @@ eventstructs_sources = [ "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt", diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt similarity index 84% rename from src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt rename to src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt index 35618c8fe31db3..f391f94311d1af 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt @@ -23,12 +23,12 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct( +class PushAvStreamTransportClusterCMAFContainerOptionsStruct( val chunkDuration: UInt, val CENCKey: Optional?, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct {\n") + append("PushAvStreamTransportClusterCMAFContainerOptionsStruct {\n") append("\tchunkDuration : $chunkDuration\n") append("\tCENCKey : $CENCKey\n") append("}\n") @@ -57,7 +57,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruc fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct { + ): PushAvStreamTransportClusterCMAFContainerOptionsStruct { tlvReader.enterStructure(tlvTag) val chunkDuration = tlvReader.getUInt(ContextSpecificTag(TAG_CHUNK_DURATION)) val CENCKey = @@ -74,10 +74,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruc tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct( - chunkDuration, - CENCKey, - ) + return PushAvStreamTransportClusterCMAFContainerOptionsStruct(chunkDuration, CENCKey) } } } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterContainerOptionsStruct.kt similarity index 79% rename from src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt rename to src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterContainerOptionsStruct.kt index f0b335b9e7cf86..7654f816da0799 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterContainerOptionsStruct.kt @@ -23,13 +23,12 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( +class PushAvStreamTransportClusterContainerOptionsStruct( val containerType: UInt, - val CMAFContainerOptions: - Optional?, + val CMAFContainerOptions: Optional?, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct {\n") + append("PushAvStreamTransportClusterContainerOptionsStruct {\n") append("\tcontainerType : $containerType\n") append("\tCMAFContainerOptions : $CMAFContainerOptions\n") append("}\n") @@ -58,14 +57,14 @@ class PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct { + ): PushAvStreamTransportClusterContainerOptionsStruct { tlvReader.enterStructure(tlvTag) val containerType = tlvReader.getUInt(ContextSpecificTag(TAG_CONTAINER_TYPE)) val CMAFContainerOptions = if (!tlvReader.isNull()) { if (tlvReader.isNextTag(ContextSpecificTag(TAG_CMAF_CONTAINER_OPTIONS))) { Optional.of( - PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.fromTlv( + PushAvStreamTransportClusterCMAFContainerOptionsStruct.fromTlv( ContextSpecificTag(TAG_CMAF_CONTAINER_OPTIONS), tlvReader, ) @@ -80,10 +79,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( - containerType, - CMAFContainerOptions, - ) + return PushAvStreamTransportClusterContainerOptionsStruct(containerType, CMAFContainerOptions) } } } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterMetadataOptionsStruct.kt similarity index 87% rename from src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt rename to src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterMetadataOptionsStruct.kt index 26a8c8307715c1..46d1fd77f04778 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterMetadataOptionsStruct.kt @@ -22,13 +22,13 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( +class PushAvStreamTransportClusterMetadataOptionsStruct( val multiplexing: UInt, val includeMotionZones: Boolean, val enableMetadataPrivacySensitive: Boolean, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct {\n") + append("PushAvStreamTransportClusterMetadataOptionsStruct {\n") append("\tmultiplexing : $multiplexing\n") append("\tincludeMotionZones : $includeMotionZones\n") append("\tenableMetadataPrivacySensitive : $enableMetadataPrivacySensitive\n") @@ -53,7 +53,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct { + ): PushAvStreamTransportClusterMetadataOptionsStruct { tlvReader.enterStructure(tlvTag) val multiplexing = tlvReader.getUInt(ContextSpecificTag(TAG_MULTIPLEXING)) val includeMotionZones = tlvReader.getBoolean(ContextSpecificTag(TAG_INCLUDE_MOTION_ZONES)) @@ -62,7 +62,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( + return PushAvStreamTransportClusterMetadataOptionsStruct( multiplexing, includeMotionZones, enableMetadataPrivacySensitive, diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt similarity index 56% rename from src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt rename to src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt index 70c5d13d6225c5..ea6f9d8b132563 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt @@ -22,16 +22,16 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamConfigurationStruct( +class PushAvStreamTransportClusterTransportConfigurationStruct( val connectionID: UInt, - val streamTransportStatus: UInt, - val streamTransportOptions: PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct, + val transportStatus: UInt, + val transportOptions: PushAvStreamTransportClusterTransportOptionsStruct, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamConfigurationStruct {\n") + append("PushAvStreamTransportClusterTransportConfigurationStruct {\n") append("\tconnectionID : $connectionID\n") - append("\tstreamTransportStatus : $streamTransportStatus\n") - append("\tstreamTransportOptions : $streamTransportOptions\n") + append("\ttransportStatus : $transportStatus\n") + append("\ttransportOptions : $transportOptions\n") append("}\n") } @@ -39,36 +39,36 @@ class PushAvStreamTransportClusterPushAVStreamConfigurationStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_CONNECTION_ID), connectionID) - put(ContextSpecificTag(TAG_STREAM_TRANSPORT_STATUS), streamTransportStatus) - streamTransportOptions.toTlv(ContextSpecificTag(TAG_STREAM_TRANSPORT_OPTIONS), this) + put(ContextSpecificTag(TAG_TRANSPORT_STATUS), transportStatus) + transportOptions.toTlv(ContextSpecificTag(TAG_TRANSPORT_OPTIONS), this) endStructure() } } companion object { private const val TAG_CONNECTION_ID = 0 - private const val TAG_STREAM_TRANSPORT_STATUS = 1 - private const val TAG_STREAM_TRANSPORT_OPTIONS = 2 + private const val TAG_TRANSPORT_STATUS = 1 + private const val TAG_TRANSPORT_OPTIONS = 2 fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamConfigurationStruct { + ): PushAvStreamTransportClusterTransportConfigurationStruct { tlvReader.enterStructure(tlvTag) val connectionID = tlvReader.getUInt(ContextSpecificTag(TAG_CONNECTION_ID)) - val streamTransportStatus = tlvReader.getUInt(ContextSpecificTag(TAG_STREAM_TRANSPORT_STATUS)) - val streamTransportOptions = - PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.fromTlv( - ContextSpecificTag(TAG_STREAM_TRANSPORT_OPTIONS), + val transportStatus = tlvReader.getUInt(ContextSpecificTag(TAG_TRANSPORT_STATUS)) + val transportOptions = + PushAvStreamTransportClusterTransportOptionsStruct.fromTlv( + ContextSpecificTag(TAG_TRANSPORT_OPTIONS), tlvReader, ) tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamConfigurationStruct( + return PushAvStreamTransportClusterTransportConfigurationStruct( connectionID, - streamTransportStatus, - streamTransportOptions, + transportStatus, + transportOptions, ) } } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt similarity index 87% rename from src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt rename to src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt index ab55a596563cc9..bcbec51b37d88c 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt @@ -22,14 +22,14 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct( +class PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct( val initialDuration: UInt, val augmentationDuration: UInt, val maxDuration: ULong, val blindDuration: UInt, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct {\n") + append("PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct {\n") append("\tinitialDuration : $initialDuration\n") append("\taugmentationDuration : $augmentationDuration\n") append("\tmaxDuration : $maxDuration\n") @@ -57,7 +57,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlS fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct { + ): PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct { tlvReader.enterStructure(tlvTag) val initialDuration = tlvReader.getUInt(ContextSpecificTag(TAG_INITIAL_DURATION)) val augmentationDuration = tlvReader.getUInt(ContextSpecificTag(TAG_AUGMENTATION_DURATION)) @@ -66,7 +66,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlS tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct( + return PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct( initialDuration, augmentationDuration, maxDuration, diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt similarity index 65% rename from src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt rename to src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt index eece75a24acf2b..8e5eb6dfae5380 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt @@ -23,30 +23,29 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( +class PushAvStreamTransportClusterTransportOptionsStruct( val streamType: UInt, - val videoStreamID: Optional?, - val audioStreamID: Optional?, - val TLSEndpointID: UInt, + val videoStreamID: Optional, + val audioStreamID: Optional, + val endpointID: UInt, val url: String, - val triggerOptions: PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct, - val containerFormat: UInt, + val triggerOptions: PushAvStreamTransportClusterTransportTriggerOptionsStruct, val ingestMethod: UInt, - val containerOptions: PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct, - val metadataOptions: - Optional?, + val containerFormat: UInt, + val containerOptions: PushAvStreamTransportClusterContainerOptionsStruct, + val metadataOptions: Optional?, val expiryTime: Optional?, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct {\n") + append("PushAvStreamTransportClusterTransportOptionsStruct {\n") append("\tstreamType : $streamType\n") append("\tvideoStreamID : $videoStreamID\n") append("\taudioStreamID : $audioStreamID\n") - append("\tTLSEndpointID : $TLSEndpointID\n") + append("\tendpointID : $endpointID\n") append("\turl : $url\n") append("\ttriggerOptions : $triggerOptions\n") - append("\tcontainerFormat : $containerFormat\n") append("\tingestMethod : $ingestMethod\n") + append("\tcontainerFormat : $containerFormat\n") append("\tcontainerOptions : $containerOptions\n") append("\tmetadataOptions : $metadataOptions\n") append("\texpiryTime : $expiryTime\n") @@ -57,27 +56,19 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_STREAM_TYPE), streamType) - if (videoStreamID != null) { - if (videoStreamID.isPresent) { - val optvideoStreamID = videoStreamID.get() - put(ContextSpecificTag(TAG_VIDEO_STREAM_ID), optvideoStreamID) - } - } else { - putNull(ContextSpecificTag(TAG_VIDEO_STREAM_ID)) + if (videoStreamID.isPresent) { + val optvideoStreamID = videoStreamID.get() + put(ContextSpecificTag(TAG_VIDEO_STREAM_ID), optvideoStreamID) } - if (audioStreamID != null) { - if (audioStreamID.isPresent) { - val optaudioStreamID = audioStreamID.get() - put(ContextSpecificTag(TAG_AUDIO_STREAM_ID), optaudioStreamID) - } - } else { - putNull(ContextSpecificTag(TAG_AUDIO_STREAM_ID)) + if (audioStreamID.isPresent) { + val optaudioStreamID = audioStreamID.get() + put(ContextSpecificTag(TAG_AUDIO_STREAM_ID), optaudioStreamID) } - put(ContextSpecificTag(TAG_TLS_ENDPOINT_ID), TLSEndpointID) + put(ContextSpecificTag(TAG_ENDPOINT_ID), endpointID) put(ContextSpecificTag(TAG_URL), url) triggerOptions.toTlv(ContextSpecificTag(TAG_TRIGGER_OPTIONS), this) - put(ContextSpecificTag(TAG_CONTAINER_FORMAT), containerFormat) put(ContextSpecificTag(TAG_INGEST_METHOD), ingestMethod) + put(ContextSpecificTag(TAG_CONTAINER_FORMAT), containerFormat) containerOptions.toTlv(ContextSpecificTag(TAG_CONTAINER_OPTIONS), this) if (metadataOptions != null) { if (metadataOptions.isPresent) { @@ -103,11 +94,11 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( private const val TAG_STREAM_TYPE = 0 private const val TAG_VIDEO_STREAM_ID = 1 private const val TAG_AUDIO_STREAM_ID = 2 - private const val TAG_TLS_ENDPOINT_ID = 3 + private const val TAG_ENDPOINT_ID = 3 private const val TAG_URL = 4 private const val TAG_TRIGGER_OPTIONS = 5 - private const val TAG_CONTAINER_FORMAT = 6 - private const val TAG_INGEST_METHOD = 7 + private const val TAG_INGEST_METHOD = 6 + private const val TAG_CONTAINER_FORMAT = 7 private const val TAG_CONTAINER_OPTIONS = 8 private const val TAG_METADATA_OPTIONS = 9 private const val TAG_EXPIRY_TIME = 10 @@ -115,42 +106,32 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct { + ): PushAvStreamTransportClusterTransportOptionsStruct { tlvReader.enterStructure(tlvTag) val streamType = tlvReader.getUInt(ContextSpecificTag(TAG_STREAM_TYPE)) val videoStreamID = - if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) { - Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) - } else { - Optional.empty() - } + if (tlvReader.isNextTag(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) } else { - tlvReader.getNull(ContextSpecificTag(TAG_VIDEO_STREAM_ID)) - null + Optional.empty() } val audioStreamID = - if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_AUDIO_STREAM_ID))) { - Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_AUDIO_STREAM_ID))) - } else { - Optional.empty() - } + if (tlvReader.isNextTag(ContextSpecificTag(TAG_AUDIO_STREAM_ID))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_AUDIO_STREAM_ID))) } else { - tlvReader.getNull(ContextSpecificTag(TAG_AUDIO_STREAM_ID)) - null + Optional.empty() } - val TLSEndpointID = tlvReader.getUInt(ContextSpecificTag(TAG_TLS_ENDPOINT_ID)) + val endpointID = tlvReader.getUInt(ContextSpecificTag(TAG_ENDPOINT_ID)) val url = tlvReader.getString(ContextSpecificTag(TAG_URL)) val triggerOptions = - PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.fromTlv( + PushAvStreamTransportClusterTransportTriggerOptionsStruct.fromTlv( ContextSpecificTag(TAG_TRIGGER_OPTIONS), tlvReader, ) - val containerFormat = tlvReader.getUInt(ContextSpecificTag(TAG_CONTAINER_FORMAT)) val ingestMethod = tlvReader.getUInt(ContextSpecificTag(TAG_INGEST_METHOD)) + val containerFormat = tlvReader.getUInt(ContextSpecificTag(TAG_CONTAINER_FORMAT)) val containerOptions = - PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.fromTlv( + PushAvStreamTransportClusterContainerOptionsStruct.fromTlv( ContextSpecificTag(TAG_CONTAINER_OPTIONS), tlvReader, ) @@ -158,7 +139,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( if (!tlvReader.isNull()) { if (tlvReader.isNextTag(ContextSpecificTag(TAG_METADATA_OPTIONS))) { Optional.of( - PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.fromTlv( + PushAvStreamTransportClusterMetadataOptionsStruct.fromTlv( ContextSpecificTag(TAG_METADATA_OPTIONS), tlvReader, ) @@ -184,15 +165,15 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( + return PushAvStreamTransportClusterTransportOptionsStruct( streamType, videoStreamID, audioStreamID, - TLSEndpointID, + endpointID, url, triggerOptions, - containerFormat, ingestMethod, + containerFormat, containerOptions, metadataOptions, expiryTime, diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt similarity index 62% rename from src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt rename to src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt index 73e7ff2954a1c4..0c02a83ddf521b 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt @@ -24,21 +24,21 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( +class PushAvStreamTransportClusterTransportTriggerOptionsStruct( val triggerType: UInt, - val motionZones: Optional>?, + val motionZones: Optional>?, val motionSensitivity: Optional?, val motionTimeControl: - Optional?, - val activationReason: Optional?, + Optional, + val maxPreRollLen: Optional, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct {\n") + append("PushAvStreamTransportClusterTransportTriggerOptionsStruct {\n") append("\ttriggerType : $triggerType\n") append("\tmotionZones : $motionZones\n") append("\tmotionSensitivity : $motionSensitivity\n") append("\tmotionTimeControl : $motionTimeControl\n") - append("\tactivationReason : $activationReason\n") + append("\tmaxPreRollLen : $maxPreRollLen\n") append("}\n") } @@ -51,7 +51,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( val optmotionZones = motionZones.get() startArray(ContextSpecificTag(TAG_MOTION_ZONES)) for (item in optmotionZones.iterator()) { - put(AnonymousTag, item) + item.toTlv(AnonymousTag, this) } endArray() } @@ -66,21 +66,13 @@ class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( } else { putNull(ContextSpecificTag(TAG_MOTION_SENSITIVITY)) } - if (motionTimeControl != null) { - if (motionTimeControl.isPresent) { - val optmotionTimeControl = motionTimeControl.get() - optmotionTimeControl.toTlv(ContextSpecificTag(TAG_MOTION_TIME_CONTROL), this) - } - } else { - putNull(ContextSpecificTag(TAG_MOTION_TIME_CONTROL)) + if (motionTimeControl.isPresent) { + val optmotionTimeControl = motionTimeControl.get() + optmotionTimeControl.toTlv(ContextSpecificTag(TAG_MOTION_TIME_CONTROL), this) } - if (activationReason != null) { - if (activationReason.isPresent) { - val optactivationReason = activationReason.get() - put(ContextSpecificTag(TAG_ACTIVATION_REASON), optactivationReason) - } - } else { - putNull(ContextSpecificTag(TAG_ACTIVATION_REASON)) + if (maxPreRollLen.isPresent) { + val optmaxPreRollLen = maxPreRollLen.get() + put(ContextSpecificTag(TAG_MAX_PRE_ROLL_LEN), optmaxPreRollLen) } endStructure() } @@ -91,22 +83,27 @@ class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( private const val TAG_MOTION_ZONES = 1 private const val TAG_MOTION_SENSITIVITY = 2 private const val TAG_MOTION_TIME_CONTROL = 3 - private const val TAG_ACTIVATION_REASON = 4 + private const val TAG_MAX_PRE_ROLL_LEN = 4 fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct { + ): PushAvStreamTransportClusterTransportTriggerOptionsStruct { tlvReader.enterStructure(tlvTag) val triggerType = tlvReader.getUInt(ContextSpecificTag(TAG_TRIGGER_TYPE)) val motionZones = if (!tlvReader.isNull()) { if (tlvReader.isNextTag(ContextSpecificTag(TAG_MOTION_ZONES))) { Optional.of( - buildList { + buildList { tlvReader.enterArray(ContextSpecificTag(TAG_MOTION_ZONES)) while (!tlvReader.isEndOfContainer()) { - add(tlvReader.getUInt(AnonymousTag)) + add( + PushAvStreamTransportClusterTransportZoneOptionsStruct.fromTlv( + AnonymousTag, + tlvReader, + ) + ) } tlvReader.exitContainer() } @@ -130,39 +127,31 @@ class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( null } val motionTimeControl = - if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_MOTION_TIME_CONTROL))) { - Optional.of( - PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct - .fromTlv(ContextSpecificTag(TAG_MOTION_TIME_CONTROL), tlvReader) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_MOTION_TIME_CONTROL))) { + Optional.of( + PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.fromTlv( + ContextSpecificTag(TAG_MOTION_TIME_CONTROL), + tlvReader, ) - } else { - Optional.empty() - } + ) } else { - tlvReader.getNull(ContextSpecificTag(TAG_MOTION_TIME_CONTROL)) - null + Optional.empty() } - val activationReason = - if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_ACTIVATION_REASON))) { - Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_ACTIVATION_REASON))) - } else { - Optional.empty() - } + val maxPreRollLen = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_MAX_PRE_ROLL_LEN))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_MAX_PRE_ROLL_LEN))) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ACTIVATION_REASON)) - null + Optional.empty() } tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( + return PushAvStreamTransportClusterTransportTriggerOptionsStruct( triggerType, motionZones, motionSensitivity, motionTimeControl, - activationReason, + maxPreRollLen, ) } } diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt new file mode 100644 index 00000000000000..666e4d235fc4db --- /dev/null +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt @@ -0,0 +1,81 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package chip.devicecontroller.cluster.structs + +import chip.devicecontroller.cluster.* +import java.util.Optional +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class PushAvStreamTransportClusterTransportZoneOptionsStruct( + val zone: UInt?, + val sensitivity: Optional, +) { + override fun toString(): String = buildString { + append("PushAvStreamTransportClusterTransportZoneOptionsStruct {\n") + append("\tzone : $zone\n") + append("\tsensitivity : $sensitivity\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + if (zone != null) { + put(ContextSpecificTag(TAG_ZONE), zone) + } else { + putNull(ContextSpecificTag(TAG_ZONE)) + } + if (sensitivity.isPresent) { + val optsensitivity = sensitivity.get() + put(ContextSpecificTag(TAG_SENSITIVITY), optsensitivity) + } + endStructure() + } + } + + companion object { + private const val TAG_ZONE = 1 + private const val TAG_SENSITIVITY = 2 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): PushAvStreamTransportClusterTransportZoneOptionsStruct { + tlvReader.enterStructure(tlvTag) + val zone = + if (!tlvReader.isNull()) { + tlvReader.getUInt(ContextSpecificTag(TAG_ZONE)) + } else { + tlvReader.getNull(ContextSpecificTag(TAG_ZONE)) + null + } + val sensitivity = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_SENSITIVITY))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_SENSITIVITY))) + } else { + Optional.empty() + } + + tlvReader.exitContainer() + + return PushAvStreamTransportClusterTransportZoneOptionsStruct(zone, sensitivity) + } + } +} diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/PushAvStreamTransportCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/PushAvStreamTransportCluster.kt index ca521085de7b3a..38b5609b575666 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/PushAvStreamTransportCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/PushAvStreamTransportCluster.kt @@ -46,12 +46,12 @@ class PushAvStreamTransportCluster( ) { class AllocatePushTransportResponse( val connectionID: UShort, - val streamTransportOptions: PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct, + val transportOptions: PushAvStreamTransportClusterTransportOptionsStruct, val transportStatus: UByte, ) - class FindStreamConfigurationResponse( - val streamConfigurations: List + class FindTransportResponse( + val streamConfigurations: List ) class CurrentConnectionsAttribute(val value: List) @@ -105,7 +105,7 @@ class PushAvStreamTransportCluster( } suspend fun allocatePushTransport( - streamTransportOptions: PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct, + transportOptions: PushAvStreamTransportClusterTransportOptionsStruct, timedInvokeTimeout: Duration? = null, ): AllocatePushTransportResponse { val commandId: UInt = 0u @@ -113,8 +113,8 @@ class PushAvStreamTransportCluster( val tlvWriter = TlvWriter() tlvWriter.startStructure(AnonymousTag) - val TAG_STREAM_TRANSPORT_OPTIONS_REQ: Int = 0 - streamTransportOptions.toTlv(ContextSpecificTag(TAG_STREAM_TRANSPORT_OPTIONS_REQ), tlvWriter) + val TAG_TRANSPORT_OPTIONS_REQ: Int = 0 + transportOptions.toTlv(ContextSpecificTag(TAG_TRANSPORT_OPTIONS_REQ), tlvWriter) tlvWriter.endStructure() val request: InvokeRequest = @@ -132,10 +132,8 @@ class PushAvStreamTransportCluster( val TAG_CONNECTION_ID: Int = 0 var connectionID_decoded: UShort? = null - val TAG_STREAM_TRANSPORT_OPTIONS: Int = 1 - var streamTransportOptions_decoded: - PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct? = - null + val TAG_TRANSPORT_OPTIONS: Int = 1 + var transportOptions_decoded: PushAvStreamTransportClusterTransportOptionsStruct? = null val TAG_TRANSPORT_STATUS: Int = 2 var transportStatus_decoded: UByte? = null @@ -147,9 +145,9 @@ class PushAvStreamTransportCluster( connectionID_decoded = tlvReader.getUShort(tag) } - if (tag == ContextSpecificTag(TAG_STREAM_TRANSPORT_OPTIONS)) { - streamTransportOptions_decoded = - PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.fromTlv(tag, tlvReader) + if (tag == ContextSpecificTag(TAG_TRANSPORT_OPTIONS)) { + transportOptions_decoded = + PushAvStreamTransportClusterTransportOptionsStruct.fromTlv(tag, tlvReader) } if (tag == ContextSpecificTag(TAG_TRANSPORT_STATUS)) { @@ -163,8 +161,8 @@ class PushAvStreamTransportCluster( throw IllegalStateException("connectionID not found in TLV") } - if (streamTransportOptions_decoded == null) { - throw IllegalStateException("streamTransportOptions not found in TLV") + if (transportOptions_decoded == null) { + throw IllegalStateException("transportOptions not found in TLV") } if (transportStatus_decoded == null) { @@ -175,7 +173,7 @@ class PushAvStreamTransportCluster( return AllocatePushTransportResponse( connectionID_decoded, - streamTransportOptions_decoded, + transportOptions_decoded, transportStatus_decoded, ) } @@ -203,7 +201,7 @@ class PushAvStreamTransportCluster( suspend fun modifyPushTransport( connectionID: UShort, - streamTransportOptions: PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct, + transportOptions: PushAvStreamTransportClusterTransportOptionsStruct, timedInvokeTimeout: Duration? = null, ) { val commandId: UInt = 3u @@ -214,8 +212,8 @@ class PushAvStreamTransportCluster( val TAG_CONNECTION_ID_REQ: Int = 0 tlvWriter.put(ContextSpecificTag(TAG_CONNECTION_ID_REQ), connectionID) - val TAG_STREAM_TRANSPORT_OPTIONS_REQ: Int = 1 - streamTransportOptions.toTlv(ContextSpecificTag(TAG_STREAM_TRANSPORT_OPTIONS_REQ), tlvWriter) + val TAG_TRANSPORT_OPTIONS_REQ: Int = 1 + transportOptions.toTlv(ContextSpecificTag(TAG_TRANSPORT_OPTIONS_REQ), tlvWriter) tlvWriter.endStructure() val request: InvokeRequest = @@ -231,7 +229,7 @@ class PushAvStreamTransportCluster( suspend fun setTransportStatus( connectionID: UShort?, - streamTransportStatus: UByte, + transportStatus: UByte, timedInvokeTimeout: Duration? = null, ) { val commandId: UInt = 4u @@ -242,8 +240,8 @@ class PushAvStreamTransportCluster( val TAG_CONNECTION_ID_REQ: Int = 0 connectionID?.let { tlvWriter.put(ContextSpecificTag(TAG_CONNECTION_ID_REQ), connectionID) } - val TAG_STREAM_TRANSPORT_STATUS_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_STREAM_TRANSPORT_STATUS_REQ), streamTransportStatus) + val TAG_TRANSPORT_STATUS_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_TRANSPORT_STATUS_REQ), transportStatus) tlvWriter.endStructure() val request: InvokeRequest = @@ -260,7 +258,7 @@ class PushAvStreamTransportCluster( suspend fun manuallyTriggerTransport( connectionID: UShort, activationReason: UByte?, - timeControl: PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct?, + timeControl: PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct?, timedInvokeTimeout: Duration? = null, ) { val commandId: UInt = 5u @@ -291,10 +289,10 @@ class PushAvStreamTransportCluster( logger.log(Level.FINE, "Invoke command succeeded: ${response}") } - suspend fun findStreamConfiguration( + suspend fun findTransport( connectionID: UShort?, timedInvokeTimeout: Duration? = null, - ): FindStreamConfigurationResponse { + ): FindTransportResponse { val commandId: UInt = 6u val tlvWriter = TlvWriter() @@ -318,7 +316,7 @@ class PushAvStreamTransportCluster( tlvReader.enterStructure(AnonymousTag) val TAG_STREAM_CONFIGURATIONS: Int = 0 var streamConfigurations_decoded: - List? = + List? = null while (!tlvReader.isEndOfContainer()) { @@ -326,11 +324,11 @@ class PushAvStreamTransportCluster( if (tag == ContextSpecificTag(TAG_STREAM_CONFIGURATIONS)) { streamConfigurations_decoded = - buildList { + buildList { tlvReader.enterArray(tag) while (!tlvReader.isEndOfContainer()) { add( - PushAvStreamTransportClusterPushAVStreamConfigurationStruct.fromTlv( + PushAvStreamTransportClusterTransportConfigurationStruct.fromTlv( AnonymousTag, tlvReader, ) @@ -349,7 +347,7 @@ class PushAvStreamTransportCluster( tlvReader.exitContainer() - return FindStreamConfigurationResponse(streamConfigurations_decoded) + return FindTransportResponse(streamConfigurations_decoded) } suspend fun readSupportedContainerFormatsAttribute(): UByte { diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt new file mode 100644 index 00000000000000..0aeaf246b39378 --- /dev/null +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt @@ -0,0 +1,80 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package matter.controller.cluster.eventstructs + +import java.util.Optional +import matter.controller.cluster.* +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class PushAvStreamTransportClusterPushTransportBeginEvent( + val connectionID: UShort, + val triggerType: UByte, + val activationReason: Optional, +) { + override fun toString(): String = buildString { + append("PushAvStreamTransportClusterPushTransportBeginEvent {\n") + append("\tconnectionID : $connectionID\n") + append("\ttriggerType : $triggerType\n") + append("\tactivationReason : $activationReason\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + put(ContextSpecificTag(TAG_CONNECTION_ID), connectionID) + put(ContextSpecificTag(TAG_TRIGGER_TYPE), triggerType) + if (activationReason.isPresent) { + val optactivationReason = activationReason.get() + put(ContextSpecificTag(TAG_ACTIVATION_REASON), optactivationReason) + } + endStructure() + } + } + + companion object { + private const val TAG_CONNECTION_ID = 0 + private const val TAG_TRIGGER_TYPE = 1 + private const val TAG_ACTIVATION_REASON = 2 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): PushAvStreamTransportClusterPushTransportBeginEvent { + tlvReader.enterStructure(tlvTag) + val connectionID = tlvReader.getUShort(ContextSpecificTag(TAG_CONNECTION_ID)) + val triggerType = tlvReader.getUByte(ContextSpecificTag(TAG_TRIGGER_TYPE)) + val activationReason = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_ACTIVATION_REASON))) { + Optional.of(tlvReader.getUByte(ContextSpecificTag(TAG_ACTIVATION_REASON))) + } else { + Optional.empty() + } + + tlvReader.exitContainer() + + return PushAvStreamTransportClusterPushTransportBeginEvent( + connectionID, + triggerType, + activationReason, + ) + } + } +} diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt index ac52180b567e7f..adbda81d0386e1 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt @@ -16,6 +16,7 @@ */ package matter.controller.cluster.eventstructs +import java.util.Optional import matter.controller.cluster.* import matter.tlv.ContextSpecificTag import matter.tlv.Tag @@ -24,13 +25,14 @@ import matter.tlv.TlvWriter class PushAvStreamTransportClusterPushTransportEndEvent( val connectionID: UShort, - val triggerDetails: - matter.controller.cluster.structs.PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct, + val triggerType: UByte, + val activationReason: Optional, ) { override fun toString(): String = buildString { append("PushAvStreamTransportClusterPushTransportEndEvent {\n") append("\tconnectionID : $connectionID\n") - append("\ttriggerDetails : $triggerDetails\n") + append("\ttriggerType : $triggerType\n") + append("\tactivationReason : $activationReason\n") append("}\n") } @@ -38,14 +40,19 @@ class PushAvStreamTransportClusterPushTransportEndEvent( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_CONNECTION_ID), connectionID) - triggerDetails.toTlv(ContextSpecificTag(TAG_TRIGGER_DETAILS), this) + put(ContextSpecificTag(TAG_TRIGGER_TYPE), triggerType) + if (activationReason.isPresent) { + val optactivationReason = activationReason.get() + put(ContextSpecificTag(TAG_ACTIVATION_REASON), optactivationReason) + } endStructure() } } companion object { private const val TAG_CONNECTION_ID = 0 - private const val TAG_TRIGGER_DETAILS = 1 + private const val TAG_TRIGGER_TYPE = 1 + private const val TAG_ACTIVATION_REASON = 2 fun fromTlv( tlvTag: Tag, @@ -53,14 +60,21 @@ class PushAvStreamTransportClusterPushTransportEndEvent( ): PushAvStreamTransportClusterPushTransportEndEvent { tlvReader.enterStructure(tlvTag) val connectionID = tlvReader.getUShort(ContextSpecificTag(TAG_CONNECTION_ID)) - val triggerDetails = - matter.controller.cluster.structs - .PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct - .fromTlv(ContextSpecificTag(TAG_TRIGGER_DETAILS), tlvReader) + val triggerType = tlvReader.getUByte(ContextSpecificTag(TAG_TRIGGER_TYPE)) + val activationReason = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_ACTIVATION_REASON))) { + Optional.of(tlvReader.getUByte(ContextSpecificTag(TAG_ACTIVATION_REASON))) + } else { + Optional.empty() + } tlvReader.exitContainer() - return PushAvStreamTransportClusterPushTransportEndEvent(connectionID, triggerDetails) + return PushAvStreamTransportClusterPushTransportEndEvent( + connectionID, + triggerType, + activationReason, + ) } } } diff --git a/src/controller/java/generated/java/matter/controller/cluster/files.gni b/src/controller/java/generated/java/matter/controller/cluster/files.gni index cdbe2182f94534..3425c23dccfd4c 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/files.gni +++ b/src/controller/java/generated/java/matter/controller/cluster/files.gni @@ -122,13 +122,14 @@ matter_structs_sources = [ "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt", - "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt", - "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt", - "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt", - "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt", - "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt", - "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt", - "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterContainerOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterMetadataOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt", @@ -243,6 +244,7 @@ matter_eventstructs_sources = [ "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportBeginEvent.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PushAvStreamTransportClusterPushTransportEndEvent.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt", diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt similarity index 84% rename from src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt rename to src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt index 5b17f1e2b4c1a9..d655eef65aee31 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterCMAFContainerOptionsStruct.kt @@ -23,12 +23,12 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct( +class PushAvStreamTransportClusterCMAFContainerOptionsStruct( val chunkDuration: UShort, val CENCKey: Optional?, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct {\n") + append("PushAvStreamTransportClusterCMAFContainerOptionsStruct {\n") append("\tchunkDuration : $chunkDuration\n") append("\tCENCKey : $CENCKey\n") append("}\n") @@ -57,7 +57,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruc fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct { + ): PushAvStreamTransportClusterCMAFContainerOptionsStruct { tlvReader.enterStructure(tlvTag) val chunkDuration = tlvReader.getUShort(ContextSpecificTag(TAG_CHUNK_DURATION)) val CENCKey = @@ -74,10 +74,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruc tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct( - chunkDuration, - CENCKey, - ) + return PushAvStreamTransportClusterCMAFContainerOptionsStruct(chunkDuration, CENCKey) } } } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterContainerOptionsStruct.kt similarity index 79% rename from src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt rename to src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterContainerOptionsStruct.kt index 2ff39bedd407ae..ccdaf602e6f42d 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterContainerOptionsStruct.kt @@ -23,13 +23,12 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( +class PushAvStreamTransportClusterContainerOptionsStruct( val containerType: UByte, - val CMAFContainerOptions: - Optional?, + val CMAFContainerOptions: Optional?, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct {\n") + append("PushAvStreamTransportClusterContainerOptionsStruct {\n") append("\tcontainerType : $containerType\n") append("\tCMAFContainerOptions : $CMAFContainerOptions\n") append("}\n") @@ -58,14 +57,14 @@ class PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct { + ): PushAvStreamTransportClusterContainerOptionsStruct { tlvReader.enterStructure(tlvTag) val containerType = tlvReader.getUByte(ContextSpecificTag(TAG_CONTAINER_TYPE)) val CMAFContainerOptions = if (!tlvReader.isNull()) { if (tlvReader.isNextTag(ContextSpecificTag(TAG_CMAF_CONTAINER_OPTIONS))) { Optional.of( - PushAvStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct.fromTlv( + PushAvStreamTransportClusterCMAFContainerOptionsStruct.fromTlv( ContextSpecificTag(TAG_CMAF_CONTAINER_OPTIONS), tlvReader, ) @@ -80,10 +79,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct( - containerType, - CMAFContainerOptions, - ) + return PushAvStreamTransportClusterContainerOptionsStruct(containerType, CMAFContainerOptions) } } } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterMetadataOptionsStruct.kt similarity index 87% rename from src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt rename to src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterMetadataOptionsStruct.kt index a9f26e1accd581..e9d2004e72ce32 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterMetadataOptionsStruct.kt @@ -22,13 +22,13 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( +class PushAvStreamTransportClusterMetadataOptionsStruct( val multiplexing: UByte, val includeMotionZones: Boolean, val enableMetadataPrivacySensitive: Boolean, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct {\n") + append("PushAvStreamTransportClusterMetadataOptionsStruct {\n") append("\tmultiplexing : $multiplexing\n") append("\tincludeMotionZones : $includeMotionZones\n") append("\tenableMetadataPrivacySensitive : $enableMetadataPrivacySensitive\n") @@ -53,7 +53,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct { + ): PushAvStreamTransportClusterMetadataOptionsStruct { tlvReader.enterStructure(tlvTag) val multiplexing = tlvReader.getUByte(ContextSpecificTag(TAG_MULTIPLEXING)) val includeMotionZones = tlvReader.getBoolean(ContextSpecificTag(TAG_INCLUDE_MOTION_ZONES)) @@ -62,7 +62,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct( + return PushAvStreamTransportClusterMetadataOptionsStruct( multiplexing, includeMotionZones, enableMetadataPrivacySensitive, diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt similarity index 56% rename from src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt rename to src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt index 22c3c3b3f61064..0b353db8ce3e0a 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamConfigurationStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt @@ -22,16 +22,16 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamConfigurationStruct( +class PushAvStreamTransportClusterTransportConfigurationStruct( val connectionID: UShort, - val streamTransportStatus: UByte, - val streamTransportOptions: PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct, + val transportStatus: UByte, + val transportOptions: PushAvStreamTransportClusterTransportOptionsStruct, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamConfigurationStruct {\n") + append("PushAvStreamTransportClusterTransportConfigurationStruct {\n") append("\tconnectionID : $connectionID\n") - append("\tstreamTransportStatus : $streamTransportStatus\n") - append("\tstreamTransportOptions : $streamTransportOptions\n") + append("\ttransportStatus : $transportStatus\n") + append("\ttransportOptions : $transportOptions\n") append("}\n") } @@ -39,37 +39,36 @@ class PushAvStreamTransportClusterPushAVStreamConfigurationStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_CONNECTION_ID), connectionID) - put(ContextSpecificTag(TAG_STREAM_TRANSPORT_STATUS), streamTransportStatus) - streamTransportOptions.toTlv(ContextSpecificTag(TAG_STREAM_TRANSPORT_OPTIONS), this) + put(ContextSpecificTag(TAG_TRANSPORT_STATUS), transportStatus) + transportOptions.toTlv(ContextSpecificTag(TAG_TRANSPORT_OPTIONS), this) endStructure() } } companion object { private const val TAG_CONNECTION_ID = 0 - private const val TAG_STREAM_TRANSPORT_STATUS = 1 - private const val TAG_STREAM_TRANSPORT_OPTIONS = 2 + private const val TAG_TRANSPORT_STATUS = 1 + private const val TAG_TRANSPORT_OPTIONS = 2 fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamConfigurationStruct { + ): PushAvStreamTransportClusterTransportConfigurationStruct { tlvReader.enterStructure(tlvTag) val connectionID = tlvReader.getUShort(ContextSpecificTag(TAG_CONNECTION_ID)) - val streamTransportStatus = - tlvReader.getUByte(ContextSpecificTag(TAG_STREAM_TRANSPORT_STATUS)) - val streamTransportOptions = - PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.fromTlv( - ContextSpecificTag(TAG_STREAM_TRANSPORT_OPTIONS), + val transportStatus = tlvReader.getUByte(ContextSpecificTag(TAG_TRANSPORT_STATUS)) + val transportOptions = + PushAvStreamTransportClusterTransportOptionsStruct.fromTlv( + ContextSpecificTag(TAG_TRANSPORT_OPTIONS), tlvReader, ) tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamConfigurationStruct( + return PushAvStreamTransportClusterTransportConfigurationStruct( connectionID, - streamTransportStatus, - streamTransportOptions, + transportStatus, + transportOptions, ) } } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt similarity index 87% rename from src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt rename to src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt index 988becdb66a59f..d60d3525daec65 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.kt @@ -22,14 +22,14 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct( +class PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct( val initialDuration: UShort, val augmentationDuration: UShort, val maxDuration: UInt, val blindDuration: UShort, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct {\n") + append("PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct {\n") append("\tinitialDuration : $initialDuration\n") append("\taugmentationDuration : $augmentationDuration\n") append("\tmaxDuration : $maxDuration\n") @@ -57,7 +57,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlS fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct { + ): PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct { tlvReader.enterStructure(tlvTag) val initialDuration = tlvReader.getUShort(ContextSpecificTag(TAG_INITIAL_DURATION)) val augmentationDuration = tlvReader.getUShort(ContextSpecificTag(TAG_AUGMENTATION_DURATION)) @@ -66,7 +66,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlS tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct( + return PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct( initialDuration, augmentationDuration, maxDuration, diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt similarity index 65% rename from src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt rename to src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt index 49b3df53e29a7e..a83429d27a5938 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt @@ -23,30 +23,29 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( +class PushAvStreamTransportClusterTransportOptionsStruct( val streamType: UByte, - val videoStreamID: Optional?, - val audioStreamID: Optional?, - val TLSEndpointID: UShort, + val videoStreamID: Optional, + val audioStreamID: Optional, + val endpointID: UShort, val url: String, - val triggerOptions: PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct, - val containerFormat: UByte, + val triggerOptions: PushAvStreamTransportClusterTransportTriggerOptionsStruct, val ingestMethod: UByte, - val containerOptions: PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct, - val metadataOptions: - Optional?, + val containerFormat: UByte, + val containerOptions: PushAvStreamTransportClusterContainerOptionsStruct, + val metadataOptions: Optional?, val expiryTime: Optional?, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct {\n") + append("PushAvStreamTransportClusterTransportOptionsStruct {\n") append("\tstreamType : $streamType\n") append("\tvideoStreamID : $videoStreamID\n") append("\taudioStreamID : $audioStreamID\n") - append("\tTLSEndpointID : $TLSEndpointID\n") + append("\tendpointID : $endpointID\n") append("\turl : $url\n") append("\ttriggerOptions : $triggerOptions\n") - append("\tcontainerFormat : $containerFormat\n") append("\tingestMethod : $ingestMethod\n") + append("\tcontainerFormat : $containerFormat\n") append("\tcontainerOptions : $containerOptions\n") append("\tmetadataOptions : $metadataOptions\n") append("\texpiryTime : $expiryTime\n") @@ -57,27 +56,19 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( tlvWriter.apply { startStructure(tlvTag) put(ContextSpecificTag(TAG_STREAM_TYPE), streamType) - if (videoStreamID != null) { - if (videoStreamID.isPresent) { - val optvideoStreamID = videoStreamID.get() - put(ContextSpecificTag(TAG_VIDEO_STREAM_ID), optvideoStreamID) - } - } else { - putNull(ContextSpecificTag(TAG_VIDEO_STREAM_ID)) + if (videoStreamID.isPresent) { + val optvideoStreamID = videoStreamID.get() + put(ContextSpecificTag(TAG_VIDEO_STREAM_ID), optvideoStreamID) } - if (audioStreamID != null) { - if (audioStreamID.isPresent) { - val optaudioStreamID = audioStreamID.get() - put(ContextSpecificTag(TAG_AUDIO_STREAM_ID), optaudioStreamID) - } - } else { - putNull(ContextSpecificTag(TAG_AUDIO_STREAM_ID)) + if (audioStreamID.isPresent) { + val optaudioStreamID = audioStreamID.get() + put(ContextSpecificTag(TAG_AUDIO_STREAM_ID), optaudioStreamID) } - put(ContextSpecificTag(TAG_TLS_ENDPOINT_ID), TLSEndpointID) + put(ContextSpecificTag(TAG_ENDPOINT_ID), endpointID) put(ContextSpecificTag(TAG_URL), url) triggerOptions.toTlv(ContextSpecificTag(TAG_TRIGGER_OPTIONS), this) - put(ContextSpecificTag(TAG_CONTAINER_FORMAT), containerFormat) put(ContextSpecificTag(TAG_INGEST_METHOD), ingestMethod) + put(ContextSpecificTag(TAG_CONTAINER_FORMAT), containerFormat) containerOptions.toTlv(ContextSpecificTag(TAG_CONTAINER_OPTIONS), this) if (metadataOptions != null) { if (metadataOptions.isPresent) { @@ -103,11 +94,11 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( private const val TAG_STREAM_TYPE = 0 private const val TAG_VIDEO_STREAM_ID = 1 private const val TAG_AUDIO_STREAM_ID = 2 - private const val TAG_TLS_ENDPOINT_ID = 3 + private const val TAG_ENDPOINT_ID = 3 private const val TAG_URL = 4 private const val TAG_TRIGGER_OPTIONS = 5 - private const val TAG_CONTAINER_FORMAT = 6 - private const val TAG_INGEST_METHOD = 7 + private const val TAG_INGEST_METHOD = 6 + private const val TAG_CONTAINER_FORMAT = 7 private const val TAG_CONTAINER_OPTIONS = 8 private const val TAG_METADATA_OPTIONS = 9 private const val TAG_EXPIRY_TIME = 10 @@ -115,42 +106,32 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct { + ): PushAvStreamTransportClusterTransportOptionsStruct { tlvReader.enterStructure(tlvTag) val streamType = tlvReader.getUByte(ContextSpecificTag(TAG_STREAM_TYPE)) val videoStreamID = - if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) { - Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) - } else { - Optional.empty() - } + if (tlvReader.isNextTag(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) { + Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) } else { - tlvReader.getNull(ContextSpecificTag(TAG_VIDEO_STREAM_ID)) - null + Optional.empty() } val audioStreamID = - if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_AUDIO_STREAM_ID))) { - Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_AUDIO_STREAM_ID))) - } else { - Optional.empty() - } + if (tlvReader.isNextTag(ContextSpecificTag(TAG_AUDIO_STREAM_ID))) { + Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_AUDIO_STREAM_ID))) } else { - tlvReader.getNull(ContextSpecificTag(TAG_AUDIO_STREAM_ID)) - null + Optional.empty() } - val TLSEndpointID = tlvReader.getUShort(ContextSpecificTag(TAG_TLS_ENDPOINT_ID)) + val endpointID = tlvReader.getUShort(ContextSpecificTag(TAG_ENDPOINT_ID)) val url = tlvReader.getString(ContextSpecificTag(TAG_URL)) val triggerOptions = - PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.fromTlv( + PushAvStreamTransportClusterTransportTriggerOptionsStruct.fromTlv( ContextSpecificTag(TAG_TRIGGER_OPTIONS), tlvReader, ) - val containerFormat = tlvReader.getUByte(ContextSpecificTag(TAG_CONTAINER_FORMAT)) val ingestMethod = tlvReader.getUByte(ContextSpecificTag(TAG_INGEST_METHOD)) + val containerFormat = tlvReader.getUByte(ContextSpecificTag(TAG_CONTAINER_FORMAT)) val containerOptions = - PushAvStreamTransportClusterPushAVStreamTransportContainerOptionsStruct.fromTlv( + PushAvStreamTransportClusterContainerOptionsStruct.fromTlv( ContextSpecificTag(TAG_CONTAINER_OPTIONS), tlvReader, ) @@ -158,7 +139,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( if (!tlvReader.isNull()) { if (tlvReader.isNextTag(ContextSpecificTag(TAG_METADATA_OPTIONS))) { Optional.of( - PushAvStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct.fromTlv( + PushAvStreamTransportClusterMetadataOptionsStruct.fromTlv( ContextSpecificTag(TAG_METADATA_OPTIONS), tlvReader, ) @@ -184,15 +165,15 @@ class PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportOptionsStruct( + return PushAvStreamTransportClusterTransportOptionsStruct( streamType, videoStreamID, audioStreamID, - TLSEndpointID, + endpointID, url, triggerOptions, - containerFormat, ingestMethod, + containerFormat, containerOptions, metadataOptions, expiryTime, diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt similarity index 62% rename from src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt rename to src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt index 1af935a9906e5d..7bf4183adfc741 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportTriggerOptionsStruct.kt @@ -24,21 +24,21 @@ import matter.tlv.Tag import matter.tlv.TlvReader import matter.tlv.TlvWriter -class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( +class PushAvStreamTransportClusterTransportTriggerOptionsStruct( val triggerType: UByte, - val motionZones: Optional>?, + val motionZones: Optional>?, val motionSensitivity: Optional?, val motionTimeControl: - Optional?, - val activationReason: Optional?, + Optional, + val maxPreRollLen: Optional, ) { override fun toString(): String = buildString { - append("PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct {\n") + append("PushAvStreamTransportClusterTransportTriggerOptionsStruct {\n") append("\ttriggerType : $triggerType\n") append("\tmotionZones : $motionZones\n") append("\tmotionSensitivity : $motionSensitivity\n") append("\tmotionTimeControl : $motionTimeControl\n") - append("\tactivationReason : $activationReason\n") + append("\tmaxPreRollLen : $maxPreRollLen\n") append("}\n") } @@ -51,7 +51,7 @@ class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( val optmotionZones = motionZones.get() startArray(ContextSpecificTag(TAG_MOTION_ZONES)) for (item in optmotionZones.iterator()) { - put(AnonymousTag, item) + item.toTlv(AnonymousTag, this) } endArray() } @@ -66,21 +66,13 @@ class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( } else { putNull(ContextSpecificTag(TAG_MOTION_SENSITIVITY)) } - if (motionTimeControl != null) { - if (motionTimeControl.isPresent) { - val optmotionTimeControl = motionTimeControl.get() - optmotionTimeControl.toTlv(ContextSpecificTag(TAG_MOTION_TIME_CONTROL), this) - } - } else { - putNull(ContextSpecificTag(TAG_MOTION_TIME_CONTROL)) + if (motionTimeControl.isPresent) { + val optmotionTimeControl = motionTimeControl.get() + optmotionTimeControl.toTlv(ContextSpecificTag(TAG_MOTION_TIME_CONTROL), this) } - if (activationReason != null) { - if (activationReason.isPresent) { - val optactivationReason = activationReason.get() - put(ContextSpecificTag(TAG_ACTIVATION_REASON), optactivationReason) - } - } else { - putNull(ContextSpecificTag(TAG_ACTIVATION_REASON)) + if (maxPreRollLen.isPresent) { + val optmaxPreRollLen = maxPreRollLen.get() + put(ContextSpecificTag(TAG_MAX_PRE_ROLL_LEN), optmaxPreRollLen) } endStructure() } @@ -91,22 +83,27 @@ class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( private const val TAG_MOTION_ZONES = 1 private const val TAG_MOTION_SENSITIVITY = 2 private const val TAG_MOTION_TIME_CONTROL = 3 - private const val TAG_ACTIVATION_REASON = 4 + private const val TAG_MAX_PRE_ROLL_LEN = 4 fun fromTlv( tlvTag: Tag, tlvReader: TlvReader, - ): PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct { + ): PushAvStreamTransportClusterTransportTriggerOptionsStruct { tlvReader.enterStructure(tlvTag) val triggerType = tlvReader.getUByte(ContextSpecificTag(TAG_TRIGGER_TYPE)) val motionZones = if (!tlvReader.isNull()) { if (tlvReader.isNextTag(ContextSpecificTag(TAG_MOTION_ZONES))) { Optional.of( - buildList { + buildList { tlvReader.enterArray(ContextSpecificTag(TAG_MOTION_ZONES)) while (!tlvReader.isEndOfContainer()) { - add(tlvReader.getUShort(AnonymousTag)) + add( + PushAvStreamTransportClusterTransportZoneOptionsStruct.fromTlv( + AnonymousTag, + tlvReader, + ) + ) } tlvReader.exitContainer() } @@ -130,39 +127,31 @@ class PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( null } val motionTimeControl = - if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_MOTION_TIME_CONTROL))) { - Optional.of( - PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct - .fromTlv(ContextSpecificTag(TAG_MOTION_TIME_CONTROL), tlvReader) + if (tlvReader.isNextTag(ContextSpecificTag(TAG_MOTION_TIME_CONTROL))) { + Optional.of( + PushAvStreamTransportClusterTransportMotionTriggerTimeControlStruct.fromTlv( + ContextSpecificTag(TAG_MOTION_TIME_CONTROL), + tlvReader, ) - } else { - Optional.empty() - } + ) } else { - tlvReader.getNull(ContextSpecificTag(TAG_MOTION_TIME_CONTROL)) - null + Optional.empty() } - val activationReason = - if (!tlvReader.isNull()) { - if (tlvReader.isNextTag(ContextSpecificTag(TAG_ACTIVATION_REASON))) { - Optional.of(tlvReader.getUByte(ContextSpecificTag(TAG_ACTIVATION_REASON))) - } else { - Optional.empty() - } + val maxPreRollLen = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_MAX_PRE_ROLL_LEN))) { + Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_MAX_PRE_ROLL_LEN))) } else { - tlvReader.getNull(ContextSpecificTag(TAG_ACTIVATION_REASON)) - null + Optional.empty() } tlvReader.exitContainer() - return PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct( + return PushAvStreamTransportClusterTransportTriggerOptionsStruct( triggerType, motionZones, motionSensitivity, motionTimeControl, - activationReason, + maxPreRollLen, ) } } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt new file mode 100644 index 00000000000000..a14896415f0b4f --- /dev/null +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportZoneOptionsStruct.kt @@ -0,0 +1,81 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package matter.controller.cluster.structs + +import java.util.Optional +import matter.controller.cluster.* +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class PushAvStreamTransportClusterTransportZoneOptionsStruct( + val zone: UShort?, + val sensitivity: Optional, +) { + override fun toString(): String = buildString { + append("PushAvStreamTransportClusterTransportZoneOptionsStruct {\n") + append("\tzone : $zone\n") + append("\tsensitivity : $sensitivity\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + if (zone != null) { + put(ContextSpecificTag(TAG_ZONE), zone) + } else { + putNull(ContextSpecificTag(TAG_ZONE)) + } + if (sensitivity.isPresent) { + val optsensitivity = sensitivity.get() + put(ContextSpecificTag(TAG_SENSITIVITY), optsensitivity) + } + endStructure() + } + } + + companion object { + private const val TAG_ZONE = 1 + private const val TAG_SENSITIVITY = 2 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): PushAvStreamTransportClusterTransportZoneOptionsStruct { + tlvReader.enterStructure(tlvTag) + val zone = + if (!tlvReader.isNull()) { + tlvReader.getUShort(ContextSpecificTag(TAG_ZONE)) + } else { + tlvReader.getNull(ContextSpecificTag(TAG_ZONE)) + null + } + val sensitivity = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_SENSITIVITY))) { + Optional.of(tlvReader.getUByte(ContextSpecificTag(TAG_SENSITIVITY))) + } else { + Optional.empty() + } + + tlvReader.exitContainer() + + return PushAvStreamTransportClusterTransportZoneOptionsStruct(zone, sensitivity) + } + } +} diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp index 7dc45927415def..c67b8064f59aab 100644 --- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp @@ -9120,6 +9120,40 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & { return nullptr; } + jobject value_connectionID; + std::string value_connectionIDClassName = "java/lang/Integer"; + std::string value_connectionIDCtorSignature = "(I)V"; + jint jnivalue_connectionID = static_cast(cppValue.connectionID); + chip::JniReferences::GetInstance().CreateBoxedObject(value_connectionIDClassName.c_str(), + value_connectionIDCtorSignature.c_str(), + jnivalue_connectionID, value_connectionID); + + jobject value_triggerType; + std::string value_triggerTypeClassName = "java/lang/Integer"; + std::string value_triggerTypeCtorSignature = "(I)V"; + jint jnivalue_triggerType = static_cast(cppValue.triggerType); + chip::JniReferences::GetInstance().CreateBoxedObject(value_triggerTypeClassName.c_str(), + value_triggerTypeCtorSignature.c_str(), jnivalue_triggerType, + value_triggerType); + + jobject value_activationReason; + if (!cppValue.activationReason.HasValue()) + { + chip::JniReferences::GetInstance().CreateOptional(nullptr, value_activationReason); + } + else + { + jobject value_activationReasonInsideOptional; + std::string value_activationReasonInsideOptionalClassName = "java/lang/Integer"; + std::string value_activationReasonInsideOptionalCtorSignature = "(I)V"; + jint jnivalue_activationReasonInsideOptional = static_cast(cppValue.activationReason.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject( + value_activationReasonInsideOptionalClassName.c_str(), + value_activationReasonInsideOptionalCtorSignature.c_str(), jnivalue_activationReasonInsideOptional, + value_activationReasonInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(value_activationReasonInsideOptional, value_activationReason); + } + jclass pushTransportBeginStructClass; err = chip::JniReferences::GetInstance().GetLocalClassRef( env, "chip/devicecontroller/ChipEventStructs$PushAvStreamTransportClusterPushTransportBeginEvent", @@ -9131,7 +9165,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } jmethodID pushTransportBeginStructCtor; - err = chip::JniReferences::GetInstance().FindMethod(env, pushTransportBeginStructClass, "", "()V", + err = chip::JniReferences::GetInstance().FindMethod(env, pushTransportBeginStructClass, "", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;)V", &pushTransportBeginStructCtor); if (err != CHIP_NO_ERROR || pushTransportBeginStructCtor == nullptr) { @@ -9140,7 +9175,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & return nullptr; } - jobject value = env->NewObject(pushTransportBeginStructClass, pushTransportBeginStructCtor); + jobject value = env->NewObject(pushTransportBeginStructClass, pushTransportBeginStructCtor, value_connectionID, + value_triggerType, value_activationReason); return value; } @@ -9159,231 +9195,30 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & value_connectionIDCtorSignature.c_str(), jnivalue_connectionID, value_connectionID); - jobject value_triggerDetails; - jobject value_triggerDetails_triggerType; - std::string value_triggerDetails_triggerTypeClassName = "java/lang/Integer"; - std::string value_triggerDetails_triggerTypeCtorSignature = "(I)V"; - jint jnivalue_triggerDetails_triggerType = static_cast(cppValue.triggerDetails.triggerType); - chip::JniReferences::GetInstance().CreateBoxedObject( - value_triggerDetails_triggerTypeClassName.c_str(), value_triggerDetails_triggerTypeCtorSignature.c_str(), - jnivalue_triggerDetails_triggerType, value_triggerDetails_triggerType); - jobject value_triggerDetails_motionZones; - if (!cppValue.triggerDetails.motionZones.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, value_triggerDetails_motionZones); - } - else - { - jobject value_triggerDetails_motionZonesInsideOptional; - if (cppValue.triggerDetails.motionZones.Value().IsNull()) - { - value_triggerDetails_motionZonesInsideOptional = nullptr; - } - else - { - chip::JniReferences::GetInstance().CreateArrayList(value_triggerDetails_motionZonesInsideOptional); + jobject value_triggerType; + std::string value_triggerTypeClassName = "java/lang/Integer"; + std::string value_triggerTypeCtorSignature = "(I)V"; + jint jnivalue_triggerType = static_cast(cppValue.triggerType); + chip::JniReferences::GetInstance().CreateBoxedObject(value_triggerTypeClassName.c_str(), + value_triggerTypeCtorSignature.c_str(), jnivalue_triggerType, + value_triggerType); - auto iter_value_triggerDetails_motionZonesInsideOptional_3 = - cppValue.triggerDetails.motionZones.Value().Value().begin(); - while (iter_value_triggerDetails_motionZonesInsideOptional_3.Next()) - { - auto & entry_3 = iter_value_triggerDetails_motionZonesInsideOptional_3.GetValue(); - jobject newElement_3; - std::string newElement_3ClassName = "java/lang/Integer"; - std::string newElement_3CtorSignature = "(I)V"; - jint jninewElement_3 = static_cast(entry_3); - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_3ClassName.c_str(), newElement_3CtorSignature.c_str(), jninewElement_3, newElement_3); - chip::JniReferences::GetInstance().AddToList(value_triggerDetails_motionZonesInsideOptional, newElement_3); - } - } - chip::JniReferences::GetInstance().CreateOptional(value_triggerDetails_motionZonesInsideOptional, - value_triggerDetails_motionZones); - } - jobject value_triggerDetails_motionSensitivity; - if (!cppValue.triggerDetails.motionSensitivity.HasValue()) + jobject value_activationReason; + if (!cppValue.activationReason.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, value_triggerDetails_motionSensitivity); + chip::JniReferences::GetInstance().CreateOptional(nullptr, value_activationReason); } else { - jobject value_triggerDetails_motionSensitivityInsideOptional; - if (cppValue.triggerDetails.motionSensitivity.Value().IsNull()) - { - value_triggerDetails_motionSensitivityInsideOptional = nullptr; - } - else - { - std::string value_triggerDetails_motionSensitivityInsideOptionalClassName = "java/lang/Integer"; - std::string value_triggerDetails_motionSensitivityInsideOptionalCtorSignature = "(I)V"; - jint jnivalue_triggerDetails_motionSensitivityInsideOptional = - static_cast(cppValue.triggerDetails.motionSensitivity.Value().Value()); - chip::JniReferences::GetInstance().CreateBoxedObject( - value_triggerDetails_motionSensitivityInsideOptionalClassName.c_str(), - value_triggerDetails_motionSensitivityInsideOptionalCtorSignature.c_str(), - jnivalue_triggerDetails_motionSensitivityInsideOptional, - value_triggerDetails_motionSensitivityInsideOptional); - } - chip::JniReferences::GetInstance().CreateOptional(value_triggerDetails_motionSensitivityInsideOptional, - value_triggerDetails_motionSensitivity); - } - jobject value_triggerDetails_motionTimeControl; - if (!cppValue.triggerDetails.motionTimeControl.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, value_triggerDetails_motionTimeControl); - } - else - { - jobject value_triggerDetails_motionTimeControlInsideOptional; - if (cppValue.triggerDetails.motionTimeControl.Value().IsNull()) - { - value_triggerDetails_motionTimeControlInsideOptional = nullptr; - } - else - { - jobject value_triggerDetails_motionTimeControlInsideOptional_initialDuration; - std::string value_triggerDetails_motionTimeControlInsideOptional_initialDurationClassName = "java/lang/Integer"; - std::string value_triggerDetails_motionTimeControlInsideOptional_initialDurationCtorSignature = "(I)V"; - jint jnivalue_triggerDetails_motionTimeControlInsideOptional_initialDuration = - static_cast(cppValue.triggerDetails.motionTimeControl.Value().Value().initialDuration); - chip::JniReferences::GetInstance().CreateBoxedObject( - value_triggerDetails_motionTimeControlInsideOptional_initialDurationClassName.c_str(), - value_triggerDetails_motionTimeControlInsideOptional_initialDurationCtorSignature.c_str(), - jnivalue_triggerDetails_motionTimeControlInsideOptional_initialDuration, - value_triggerDetails_motionTimeControlInsideOptional_initialDuration); - jobject value_triggerDetails_motionTimeControlInsideOptional_augmentationDuration; - std::string value_triggerDetails_motionTimeControlInsideOptional_augmentationDurationClassName = - "java/lang/Integer"; - std::string value_triggerDetails_motionTimeControlInsideOptional_augmentationDurationCtorSignature = "(I)V"; - jint jnivalue_triggerDetails_motionTimeControlInsideOptional_augmentationDuration = - static_cast(cppValue.triggerDetails.motionTimeControl.Value().Value().augmentationDuration); - chip::JniReferences::GetInstance().CreateBoxedObject( - value_triggerDetails_motionTimeControlInsideOptional_augmentationDurationClassName.c_str(), - value_triggerDetails_motionTimeControlInsideOptional_augmentationDurationCtorSignature.c_str(), - jnivalue_triggerDetails_motionTimeControlInsideOptional_augmentationDuration, - value_triggerDetails_motionTimeControlInsideOptional_augmentationDuration); - jobject value_triggerDetails_motionTimeControlInsideOptional_maxDuration; - std::string value_triggerDetails_motionTimeControlInsideOptional_maxDurationClassName = "java/lang/Long"; - std::string value_triggerDetails_motionTimeControlInsideOptional_maxDurationCtorSignature = "(J)V"; - jlong jnivalue_triggerDetails_motionTimeControlInsideOptional_maxDuration = - static_cast(cppValue.triggerDetails.motionTimeControl.Value().Value().maxDuration); - chip::JniReferences::GetInstance().CreateBoxedObject( - value_triggerDetails_motionTimeControlInsideOptional_maxDurationClassName.c_str(), - value_triggerDetails_motionTimeControlInsideOptional_maxDurationCtorSignature.c_str(), - jnivalue_triggerDetails_motionTimeControlInsideOptional_maxDuration, - value_triggerDetails_motionTimeControlInsideOptional_maxDuration); - jobject value_triggerDetails_motionTimeControlInsideOptional_blindDuration; - std::string value_triggerDetails_motionTimeControlInsideOptional_blindDurationClassName = "java/lang/Integer"; - std::string value_triggerDetails_motionTimeControlInsideOptional_blindDurationCtorSignature = "(I)V"; - jint jnivalue_triggerDetails_motionTimeControlInsideOptional_blindDuration = - static_cast(cppValue.triggerDetails.motionTimeControl.Value().Value().blindDuration); - chip::JniReferences::GetInstance().CreateBoxedObject( - value_triggerDetails_motionTimeControlInsideOptional_blindDurationClassName.c_str(), - value_triggerDetails_motionTimeControlInsideOptional_blindDurationCtorSignature.c_str(), - jnivalue_triggerDetails_motionTimeControlInsideOptional_blindDuration, - value_triggerDetails_motionTimeControlInsideOptional_blindDuration); - - { - jclass pushAVStreamTransportMotionTriggerTimeControlStructStructClass_3; - err = chip::JniReferences::GetInstance().GetLocalClassRef( - env, - "chip/devicecontroller/" - "ChipStructs$PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct", - pushAVStreamTransportMotionTriggerTimeControlStructStructClass_3); - if (err != CHIP_NO_ERROR) - { - ChipLogError( - Zcl, - "Could not find class " - "ChipStructs$PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct"); - return nullptr; - } - - jmethodID pushAVStreamTransportMotionTriggerTimeControlStructStructCtor_3; - err = chip::JniReferences::GetInstance().FindMethod( - env, pushAVStreamTransportMotionTriggerTimeControlStructStructClass_3, "", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Integer;)V", - &pushAVStreamTransportMotionTriggerTimeControlStructStructCtor_3); - if (err != CHIP_NO_ERROR || pushAVStreamTransportMotionTriggerTimeControlStructStructCtor_3 == nullptr) - { - ChipLogError( - Zcl, - "Could not find " - "ChipStructs$PushAvStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct " - "constructor"); - return nullptr; - } - - value_triggerDetails_motionTimeControlInsideOptional = - env->NewObject(pushAVStreamTransportMotionTriggerTimeControlStructStructClass_3, - pushAVStreamTransportMotionTriggerTimeControlStructStructCtor_3, - value_triggerDetails_motionTimeControlInsideOptional_initialDuration, - value_triggerDetails_motionTimeControlInsideOptional_augmentationDuration, - value_triggerDetails_motionTimeControlInsideOptional_maxDuration, - value_triggerDetails_motionTimeControlInsideOptional_blindDuration); - } - } - chip::JniReferences::GetInstance().CreateOptional(value_triggerDetails_motionTimeControlInsideOptional, - value_triggerDetails_motionTimeControl); - } - jobject value_triggerDetails_activationReason; - if (!cppValue.triggerDetails.activationReason.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, value_triggerDetails_activationReason); - } - else - { - jobject value_triggerDetails_activationReasonInsideOptional; - if (cppValue.triggerDetails.activationReason.Value().IsNull()) - { - value_triggerDetails_activationReasonInsideOptional = nullptr; - } - else - { - std::string value_triggerDetails_activationReasonInsideOptionalClassName = "java/lang/Integer"; - std::string value_triggerDetails_activationReasonInsideOptionalCtorSignature = "(I)V"; - jint jnivalue_triggerDetails_activationReasonInsideOptional = - static_cast(cppValue.triggerDetails.activationReason.Value().Value()); - chip::JniReferences::GetInstance().CreateBoxedObject( - value_triggerDetails_activationReasonInsideOptionalClassName.c_str(), - value_triggerDetails_activationReasonInsideOptionalCtorSignature.c_str(), - jnivalue_triggerDetails_activationReasonInsideOptional, - value_triggerDetails_activationReasonInsideOptional); - } - chip::JniReferences::GetInstance().CreateOptional(value_triggerDetails_activationReasonInsideOptional, - value_triggerDetails_activationReason); - } - - { - jclass pushAVStreamTransportTriggerOptionsStructStructClass_0; - err = chip::JniReferences::GetInstance().GetLocalClassRef( - env, "chip/devicecontroller/ChipStructs$PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct", - pushAVStreamTransportTriggerOptionsStructStructClass_0); - if (err != CHIP_NO_ERROR) - { - ChipLogError( - Zcl, - "Could not find class ChipStructs$PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct"); - return nullptr; - } - - jmethodID pushAVStreamTransportTriggerOptionsStructStructCtor_0; - err = chip::JniReferences::GetInstance().FindMethod( - env, pushAVStreamTransportTriggerOptionsStructStructClass_0, "", - "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V", - &pushAVStreamTransportTriggerOptionsStructStructCtor_0); - if (err != CHIP_NO_ERROR || pushAVStreamTransportTriggerOptionsStructStructCtor_0 == nullptr) - { - ChipLogError(Zcl, - "Could not find ChipStructs$PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct " - "constructor"); - return nullptr; - } - - value_triggerDetails = env->NewObject( - pushAVStreamTransportTriggerOptionsStructStructClass_0, pushAVStreamTransportTriggerOptionsStructStructCtor_0, - value_triggerDetails_triggerType, value_triggerDetails_motionZones, value_triggerDetails_motionSensitivity, - value_triggerDetails_motionTimeControl, value_triggerDetails_activationReason); + jobject value_activationReasonInsideOptional; + std::string value_activationReasonInsideOptionalClassName = "java/lang/Integer"; + std::string value_activationReasonInsideOptionalCtorSignature = "(I)V"; + jint jnivalue_activationReasonInsideOptional = static_cast(cppValue.activationReason.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject( + value_activationReasonInsideOptionalClassName.c_str(), + value_activationReasonInsideOptionalCtorSignature.c_str(), jnivalue_activationReasonInsideOptional, + value_activationReasonInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(value_activationReasonInsideOptional, value_activationReason); } jclass pushTransportEndStructClass; @@ -9397,19 +9232,17 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } jmethodID pushTransportEndStructCtor; - err = chip::JniReferences::GetInstance().FindMethod( - env, pushTransportEndStructClass, "", - "(Ljava/lang/Integer;Lchip/devicecontroller/" - "ChipStructs$PushAvStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct;)V", - &pushTransportEndStructCtor); + err = chip::JniReferences::GetInstance().FindMethod(env, pushTransportEndStructClass, "", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;)V", + &pushTransportEndStructCtor); if (err != CHIP_NO_ERROR || pushTransportEndStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipEventStructs$PushAvStreamTransportClusterPushTransportEndEvent constructor"); return nullptr; } - jobject value = - env->NewObject(pushTransportEndStructClass, pushTransportEndStructCtor, value_connectionID, value_triggerDetails); + jobject value = env->NewObject(pushTransportEndStructClass, pushTransportEndStructCtor, value_connectionID, + value_triggerType, value_activationReason); return value; } diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 2b93b908ed3c25..9d40e000b3dabb 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -12954,7 +12954,7 @@ class ChipClusters: "commandId": 0x00000000, "commandName": "AllocatePushTransport", "args": { - "streamTransportOptions": "PushAVStreamTransportOptionsStruct", + "transportOptions": "TransportOptionsStruct", }, }, 0x00000002: { @@ -12969,7 +12969,7 @@ class ChipClusters: "commandName": "ModifyPushTransport", "args": { "connectionID": "int", - "streamTransportOptions": "PushAVStreamTransportOptionsStruct", + "transportOptions": "TransportOptionsStruct", }, }, 0x00000004: { @@ -12977,7 +12977,7 @@ class ChipClusters: "commandName": "SetTransportStatus", "args": { "connectionID": "int", - "streamTransportStatus": "int", + "transportStatus": "int", }, }, 0x00000005: { @@ -12986,12 +12986,12 @@ class ChipClusters: "args": { "connectionID": "int", "activationReason": "int", - "timeControl": "PushAVStreamTransportMotionTriggerTimeControlStruct", + "timeControl": "TransportMotionTriggerTimeControlStruct", }, }, 0x00000006: { "commandId": 0x00000006, - "commandName": "FindStreamConfiguration", + "commandName": "FindTransport", "args": { "connectionID": "int", }, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 5aaf6739c2224d..a88bceb857a1f1 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -46883,7 +46883,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: uint = 0 class Enums: - class PushAVStreamTransportContainerFormatEnum(MatterIntEnum): + class ContainerFormatEnum(MatterIntEnum): kCmaf = 0x00 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -46891,7 +46891,7 @@ class PushAVStreamTransportContainerFormatEnum(MatterIntEnum): # enum value. This specific value should never be transmitted. kUnknownEnumValue = 1 - class PushAVStreamTransportIngestMethodEnum(MatterIntEnum): + class IngestMethodsEnum(MatterIntEnum): kCMAFIngest = 0x00 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -46899,16 +46899,23 @@ class PushAVStreamTransportIngestMethodEnum(MatterIntEnum): # enum value. This specific value should never be transmitted. kUnknownEnumValue = 1 - class PushAVStreamTransportStatusEnum(MatterIntEnum): - kActive = 0x00 - kInactive = 0x01 + class StatusCodeEnum(MatterIntEnum): + kAllocationNotPermitted = 0x02 + kInvalidTlsEndpoint = 0x03 + kInvalidStream = 0x04 + kInvalidURL = 0x05 + kInvalidZone = 0x06 + kUnsupportedContainerFormat = 0x07 + kUnsupportedIngestMethod = 0x08 + kInvalidTriggerType = 0x09 + kInvalidTransportStatus = 0x10 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving an unknown # enum value. This specific value should never be transmitted. - kUnknownEnumValue = 2 + kUnknownEnumValue = 0 - class PushAVStreamTransportStreamMultiplexingEnum(MatterIntEnum): + class StreamMultiplexingEnum(MatterIntEnum): kInterleaved = 0x00 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -46916,63 +46923,59 @@ class PushAVStreamTransportStreamMultiplexingEnum(MatterIntEnum): # enum value. This specific value should never be transmitted. kUnknownEnumValue = 1 - class PushAVStreamTransportTriggerActivationReasonEnum(MatterIntEnum): - kUserInitiated = 0x00 - kAutomation = 0x01 - kEmergency = 0x02 + class StreamTypeEnum(MatterIntEnum): + kInternal = 0x00 + kRecording = 0x01 + kAnalysis = 0x02 + kLiveView = 0x03 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving an unknown # enum value. This specific value should never be transmitted. - kUnknownEnumValue = 3 + kUnknownEnumValue = 4 - class PushAVStreamTransportTriggerTypeEnum(MatterIntEnum): - kCommand = 0x00 - kMotion = 0x01 - kContinuous = 0x02 + class TransportStatusEnum(MatterIntEnum): + kActive = 0x00 + kInactive = 0x01 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving an unknown # enum value. This specific value should never be transmitted. - kUnknownEnumValue = 3 + kUnknownEnumValue = 2 - class StatusCodeEnum(MatterIntEnum): - kAllocationNotPermitted = 0x02 - kInvalidParameters = 0x03 - kInvalidUrl = 0x04 - kInvalidTriggerOptions = 0x05 - kUnsupportedContainerFormat = 0x06 - kUnsupportedIngestMethod = 0x07 - kPavstNotInUse = 0x08 - kInvalidTriggerFormat = 0x09 - kInvalidTransportStatus = 0x10 + class TransportTriggerTypeEnum(MatterIntEnum): + kCommand = 0x00 + kMotion = 0x01 + kContinuous = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving an unknown # enum value. This specific value should never be transmitted. - kUnknownEnumValue = 0 + kUnknownEnumValue = 3 - class StreamTypeEnum(MatterIntEnum): - kInternal = 0x00 - kRecording = 0x01 - kAnalysis = 0x02 - kLiveView = 0x03 + class TriggerActivationReasonEnum(MatterIntEnum): + kUserInitiated = 0x00 + kAutomation = 0x01 + kEmergency = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving an unknown # enum value. This specific value should never be transmitted. - kUnknownEnumValue = 4 + kUnknownEnumValue = 3 class Bitmaps: - class PushAVStreamTransportSupportedContainerFormatsBitmap(IntFlag): + class Feature(IntFlag): + kPerZoneSensitivity = 0x1 + + class SupportedContainerFormatsBitmap(IntFlag): kCmaf = 0x1 - class PushAVStreamTransportSupportedIngestMethodsBitmap(IntFlag): + class SupportedIngestMethodsBitmap(IntFlag): kCMAFIngest = 0x1 class Structs: @dataclass - class PushAVStreamTransportMotionTriggerTimeControlStruct(ClusterObject): + class TransportMotionTriggerTimeControlStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -46989,41 +46992,54 @@ def descriptor(cls) -> ClusterObjectDescriptor: blindDuration: 'uint' = 0 @dataclass - class PushAVStreamTransportMetadataOptionsStruct(ClusterObject): + class TransportZoneOptionsStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="multiplexing", Tag=0, Type=PushAvStreamTransport.Enums.PushAVStreamTransportStreamMultiplexingEnum), + ClusterObjectFieldDescriptor(Label="zone", Tag=1, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="sensitivity", Tag=2, Type=typing.Optional[uint]), + ]) + + zone: 'typing.Union[Nullable, uint]' = NullValue + sensitivity: 'typing.Optional[uint]' = None + + @dataclass + class MetadataOptionsStruct(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="multiplexing", Tag=0, Type=PushAvStreamTransport.Enums.StreamMultiplexingEnum), ClusterObjectFieldDescriptor(Label="includeMotionZones", Tag=1, Type=bool), ClusterObjectFieldDescriptor(Label="enableMetadataPrivacySensitive", Tag=2, Type=bool), ]) - multiplexing: 'PushAvStreamTransport.Enums.PushAVStreamTransportStreamMultiplexingEnum' = 0 + multiplexing: 'PushAvStreamTransport.Enums.StreamMultiplexingEnum' = 0 includeMotionZones: 'bool' = False enableMetadataPrivacySensitive: 'bool' = False @dataclass - class PushAVStreamTransportTriggerOptionsStruct(ClusterObject): + class TransportTriggerOptionsStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="triggerType", Tag=0, Type=PushAvStreamTransport.Enums.PushAVStreamTransportTriggerTypeEnum), - ClusterObjectFieldDescriptor(Label="motionZones", Tag=1, Type=typing.Union[None, Nullable, typing.List[uint]]), + ClusterObjectFieldDescriptor(Label="triggerType", Tag=0, Type=PushAvStreamTransport.Enums.TransportTriggerTypeEnum), + ClusterObjectFieldDescriptor(Label="motionZones", Tag=1, Type=typing.Union[None, Nullable, typing.List[PushAvStreamTransport.Structs.TransportZoneOptionsStruct]]), ClusterObjectFieldDescriptor(Label="motionSensitivity", Tag=2, Type=typing.Union[None, Nullable, uint]), - ClusterObjectFieldDescriptor(Label="motionTimeControl", Tag=3, Type=typing.Union[None, Nullable, PushAvStreamTransport.Structs.PushAVStreamTransportMotionTriggerTimeControlStruct]), - ClusterObjectFieldDescriptor(Label="activationReason", Tag=4, Type=typing.Union[None, Nullable, PushAvStreamTransport.Enums.PushAVStreamTransportTriggerActivationReasonEnum]), + ClusterObjectFieldDescriptor(Label="motionTimeControl", Tag=3, Type=typing.Optional[PushAvStreamTransport.Structs.TransportMotionTriggerTimeControlStruct]), + ClusterObjectFieldDescriptor(Label="maxPreRollLen", Tag=4, Type=typing.Optional[uint]), ]) - triggerType: 'PushAvStreamTransport.Enums.PushAVStreamTransportTriggerTypeEnum' = 0 - motionZones: 'typing.Union[None, Nullable, typing.List[uint]]' = None + triggerType: 'PushAvStreamTransport.Enums.TransportTriggerTypeEnum' = 0 + motionZones: 'typing.Union[None, Nullable, typing.List[PushAvStreamTransport.Structs.TransportZoneOptionsStruct]]' = None motionSensitivity: 'typing.Union[None, Nullable, uint]' = None - motionTimeControl: 'typing.Union[None, Nullable, PushAvStreamTransport.Structs.PushAVStreamTransportMotionTriggerTimeControlStruct]' = None - activationReason: 'typing.Union[None, Nullable, PushAvStreamTransport.Enums.PushAVStreamTransportTriggerActivationReasonEnum]' = None + motionTimeControl: 'typing.Optional[PushAvStreamTransport.Structs.TransportMotionTriggerTimeControlStruct]' = None + maxPreRollLen: 'typing.Optional[uint]' = None @dataclass - class PushAVStreamTransportCMAFContainerOptionsStruct(ClusterObject): + class CMAFContainerOptionsStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -47036,63 +47052,63 @@ def descriptor(cls) -> ClusterObjectDescriptor: CENCKey: 'typing.Union[None, Nullable, bytes]' = None @dataclass - class PushAVStreamTransportContainerOptionsStruct(ClusterObject): + class ContainerOptionsStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="containerType", Tag=0, Type=PushAvStreamTransport.Enums.PushAVStreamTransportContainerFormatEnum), - ClusterObjectFieldDescriptor(Label="CMAFContainerOptions", Tag=1, Type=typing.Union[None, Nullable, PushAvStreamTransport.Structs.PushAVStreamTransportCMAFContainerOptionsStruct]), + ClusterObjectFieldDescriptor(Label="containerType", Tag=0, Type=PushAvStreamTransport.Enums.ContainerFormatEnum), + ClusterObjectFieldDescriptor(Label="CMAFContainerOptions", Tag=1, Type=typing.Union[None, Nullable, PushAvStreamTransport.Structs.CMAFContainerOptionsStruct]), ]) - containerType: 'PushAvStreamTransport.Enums.PushAVStreamTransportContainerFormatEnum' = 0 - CMAFContainerOptions: 'typing.Union[None, Nullable, PushAvStreamTransport.Structs.PushAVStreamTransportCMAFContainerOptionsStruct]' = None + containerType: 'PushAvStreamTransport.Enums.ContainerFormatEnum' = 0 + CMAFContainerOptions: 'typing.Union[None, Nullable, PushAvStreamTransport.Structs.CMAFContainerOptionsStruct]' = None @dataclass - class PushAVStreamTransportOptionsStruct(ClusterObject): + class TransportOptionsStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="streamType", Tag=0, Type=PushAvStreamTransport.Enums.StreamTypeEnum), - ClusterObjectFieldDescriptor(Label="videoStreamID", Tag=1, Type=typing.Union[None, Nullable, uint]), - ClusterObjectFieldDescriptor(Label="audioStreamID", Tag=2, Type=typing.Union[None, Nullable, uint]), - ClusterObjectFieldDescriptor(Label="TLSEndpointID", Tag=3, Type=uint), + ClusterObjectFieldDescriptor(Label="videoStreamID", Tag=1, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="audioStreamID", Tag=2, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="endpointID", Tag=3, Type=uint), ClusterObjectFieldDescriptor(Label="url", Tag=4, Type=str), - ClusterObjectFieldDescriptor(Label="triggerOptions", Tag=5, Type=PushAvStreamTransport.Structs.PushAVStreamTransportTriggerOptionsStruct), - ClusterObjectFieldDescriptor(Label="containerFormat", Tag=6, Type=PushAvStreamTransport.Enums.PushAVStreamTransportContainerFormatEnum), - ClusterObjectFieldDescriptor(Label="ingestMethod", Tag=7, Type=PushAvStreamTransport.Enums.PushAVStreamTransportIngestMethodEnum), - ClusterObjectFieldDescriptor(Label="containerOptions", Tag=8, Type=PushAvStreamTransport.Structs.PushAVStreamTransportContainerOptionsStruct), - ClusterObjectFieldDescriptor(Label="metadataOptions", Tag=9, Type=typing.Union[None, Nullable, PushAvStreamTransport.Structs.PushAVStreamTransportMetadataOptionsStruct]), + ClusterObjectFieldDescriptor(Label="triggerOptions", Tag=5, Type=PushAvStreamTransport.Structs.TransportTriggerOptionsStruct), + ClusterObjectFieldDescriptor(Label="ingestMethod", Tag=6, Type=PushAvStreamTransport.Enums.IngestMethodsEnum), + ClusterObjectFieldDescriptor(Label="containerFormat", Tag=7, Type=PushAvStreamTransport.Enums.ContainerFormatEnum), + ClusterObjectFieldDescriptor(Label="containerOptions", Tag=8, Type=PushAvStreamTransport.Structs.ContainerOptionsStruct), + ClusterObjectFieldDescriptor(Label="metadataOptions", Tag=9, Type=typing.Union[None, Nullable, PushAvStreamTransport.Structs.MetadataOptionsStruct]), ClusterObjectFieldDescriptor(Label="expiryTime", Tag=10, Type=typing.Union[None, Nullable, uint]), ]) streamType: 'PushAvStreamTransport.Enums.StreamTypeEnum' = 0 - videoStreamID: 'typing.Union[None, Nullable, uint]' = None - audioStreamID: 'typing.Union[None, Nullable, uint]' = None - TLSEndpointID: 'uint' = 0 + videoStreamID: 'typing.Optional[uint]' = None + audioStreamID: 'typing.Optional[uint]' = None + endpointID: 'uint' = 0 url: 'str' = "" - triggerOptions: 'PushAvStreamTransport.Structs.PushAVStreamTransportTriggerOptionsStruct' = field(default_factory=lambda: PushAvStreamTransport.Structs.PushAVStreamTransportTriggerOptionsStruct()) - containerFormat: 'PushAvStreamTransport.Enums.PushAVStreamTransportContainerFormatEnum' = 0 - ingestMethod: 'PushAvStreamTransport.Enums.PushAVStreamTransportIngestMethodEnum' = 0 - containerOptions: 'PushAvStreamTransport.Structs.PushAVStreamTransportContainerOptionsStruct' = field(default_factory=lambda: PushAvStreamTransport.Structs.PushAVStreamTransportContainerOptionsStruct()) - metadataOptions: 'typing.Union[None, Nullable, PushAvStreamTransport.Structs.PushAVStreamTransportMetadataOptionsStruct]' = None + triggerOptions: 'PushAvStreamTransport.Structs.TransportTriggerOptionsStruct' = field(default_factory=lambda: PushAvStreamTransport.Structs.TransportTriggerOptionsStruct()) + ingestMethod: 'PushAvStreamTransport.Enums.IngestMethodsEnum' = 0 + containerFormat: 'PushAvStreamTransport.Enums.ContainerFormatEnum' = 0 + containerOptions: 'PushAvStreamTransport.Structs.ContainerOptionsStruct' = field(default_factory=lambda: PushAvStreamTransport.Structs.ContainerOptionsStruct()) + metadataOptions: 'typing.Union[None, Nullable, PushAvStreamTransport.Structs.MetadataOptionsStruct]' = None expiryTime: 'typing.Union[None, Nullable, uint]' = None @dataclass - class PushAVStreamConfigurationStruct(ClusterObject): + class TransportConfigurationStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="connectionID", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="streamTransportStatus", Tag=1, Type=PushAvStreamTransport.Enums.PushAVStreamTransportStatusEnum), - ClusterObjectFieldDescriptor(Label="streamTransportOptions", Tag=2, Type=PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct), + ClusterObjectFieldDescriptor(Label="transportStatus", Tag=1, Type=PushAvStreamTransport.Enums.TransportStatusEnum), + ClusterObjectFieldDescriptor(Label="transportOptions", Tag=2, Type=PushAvStreamTransport.Structs.TransportOptionsStruct), ]) connectionID: 'uint' = 0 - streamTransportStatus: 'PushAvStreamTransport.Enums.PushAVStreamTransportStatusEnum' = 0 - streamTransportOptions: 'PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct' = field(default_factory=lambda: PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct()) + transportStatus: 'PushAvStreamTransport.Enums.TransportStatusEnum' = 0 + transportOptions: 'PushAvStreamTransport.Structs.TransportOptionsStruct' = field(default_factory=lambda: PushAvStreamTransport.Structs.TransportOptionsStruct()) class Commands: @dataclass @@ -47106,10 +47122,10 @@ class AllocatePushTransport(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="streamTransportOptions", Tag=0, Type=PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct), + ClusterObjectFieldDescriptor(Label="transportOptions", Tag=0, Type=PushAvStreamTransport.Structs.TransportOptionsStruct), ]) - streamTransportOptions: PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct = field(default_factory=lambda: PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct()) + transportOptions: PushAvStreamTransport.Structs.TransportOptionsStruct = field(default_factory=lambda: PushAvStreamTransport.Structs.TransportOptionsStruct()) @dataclass class AllocatePushTransportResponse(ClusterCommand): @@ -47123,13 +47139,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="connectionID", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="streamTransportOptions", Tag=1, Type=PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct), - ClusterObjectFieldDescriptor(Label="transportStatus", Tag=2, Type=PushAvStreamTransport.Enums.PushAVStreamTransportStatusEnum), + ClusterObjectFieldDescriptor(Label="transportOptions", Tag=1, Type=PushAvStreamTransport.Structs.TransportOptionsStruct), + ClusterObjectFieldDescriptor(Label="transportStatus", Tag=2, Type=PushAvStreamTransport.Enums.TransportStatusEnum), ]) connectionID: uint = 0 - streamTransportOptions: PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct = field(default_factory=lambda: PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct()) - transportStatus: PushAvStreamTransport.Enums.PushAVStreamTransportStatusEnum = 0 + transportOptions: PushAvStreamTransport.Structs.TransportOptionsStruct = field(default_factory=lambda: PushAvStreamTransport.Structs.TransportOptionsStruct()) + transportStatus: PushAvStreamTransport.Enums.TransportStatusEnum = 0 @dataclass class DeallocatePushTransport(ClusterCommand): @@ -47159,11 +47175,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="connectionID", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="streamTransportOptions", Tag=1, Type=PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct), + ClusterObjectFieldDescriptor(Label="transportOptions", Tag=1, Type=PushAvStreamTransport.Structs.TransportOptionsStruct), ]) connectionID: uint = 0 - streamTransportOptions: PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct = field(default_factory=lambda: PushAvStreamTransport.Structs.PushAVStreamTransportOptionsStruct()) + transportOptions: PushAvStreamTransport.Structs.TransportOptionsStruct = field(default_factory=lambda: PushAvStreamTransport.Structs.TransportOptionsStruct()) @dataclass class SetTransportStatus(ClusterCommand): @@ -47177,11 +47193,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="connectionID", Tag=0, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="streamTransportStatus", Tag=1, Type=PushAvStreamTransport.Enums.PushAVStreamTransportStatusEnum), + ClusterObjectFieldDescriptor(Label="transportStatus", Tag=1, Type=PushAvStreamTransport.Enums.TransportStatusEnum), ]) connectionID: typing.Union[Nullable, uint] = NullValue - streamTransportStatus: PushAvStreamTransport.Enums.PushAVStreamTransportStatusEnum = 0 + transportStatus: PushAvStreamTransport.Enums.TransportStatusEnum = 0 @dataclass class ManuallyTriggerTransport(ClusterCommand): @@ -47195,20 +47211,20 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="connectionID", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="activationReason", Tag=1, Type=typing.Union[Nullable, PushAvStreamTransport.Enums.PushAVStreamTransportTriggerActivationReasonEnum]), - ClusterObjectFieldDescriptor(Label="timeControl", Tag=2, Type=typing.Union[None, Nullable, PushAvStreamTransport.Structs.PushAVStreamTransportMotionTriggerTimeControlStruct]), + ClusterObjectFieldDescriptor(Label="activationReason", Tag=1, Type=typing.Union[Nullable, PushAvStreamTransport.Enums.TriggerActivationReasonEnum]), + ClusterObjectFieldDescriptor(Label="timeControl", Tag=2, Type=typing.Union[None, Nullable, PushAvStreamTransport.Structs.TransportMotionTriggerTimeControlStruct]), ]) connectionID: uint = 0 - activationReason: typing.Union[Nullable, PushAvStreamTransport.Enums.PushAVStreamTransportTriggerActivationReasonEnum] = NullValue - timeControl: typing.Union[None, Nullable, PushAvStreamTransport.Structs.PushAVStreamTransportMotionTriggerTimeControlStruct] = None + activationReason: typing.Union[Nullable, PushAvStreamTransport.Enums.TriggerActivationReasonEnum] = NullValue + timeControl: typing.Union[None, Nullable, PushAvStreamTransport.Structs.TransportMotionTriggerTimeControlStruct] = None @dataclass - class FindStreamConfiguration(ClusterCommand): + class FindTransport(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x00000555 command_id: typing.ClassVar[int] = 0x00000006 is_client: typing.ClassVar[bool] = True - response_type: typing.ClassVar[str] = 'FindStreamConfigurationResponse' + response_type: typing.ClassVar[str] = 'FindTransportResponse' @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: @@ -47220,7 +47236,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: connectionID: typing.Union[None, Nullable, uint] = None @dataclass - class FindStreamConfigurationResponse(ClusterCommand): + class FindTransportResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x00000555 command_id: typing.ClassVar[int] = 0x00000007 is_client: typing.ClassVar[bool] = False @@ -47230,10 +47246,10 @@ class FindStreamConfigurationResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="streamConfigurations", Tag=0, Type=typing.List[PushAvStreamTransport.Structs.PushAVStreamConfigurationStruct]), + ClusterObjectFieldDescriptor(Label="streamConfigurations", Tag=0, Type=typing.List[PushAvStreamTransport.Structs.TransportConfigurationStruct]), ]) - streamConfigurations: typing.List[PushAvStreamTransport.Structs.PushAVStreamConfigurationStruct] = field(default_factory=lambda: []) + streamConfigurations: typing.List[PushAvStreamTransport.Structs.TransportConfigurationStruct] = field(default_factory=lambda: []) class Attributes: @dataclass @@ -47379,8 +47395,15 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ + ClusterObjectFieldDescriptor(Label="connectionID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="triggerType", Tag=1, Type=PushAvStreamTransport.Enums.TransportTriggerTypeEnum), + ClusterObjectFieldDescriptor(Label="activationReason", Tag=2, Type=typing.Optional[PushAvStreamTransport.Enums.TriggerActivationReasonEnum]), ]) + connectionID: uint = 0 + triggerType: PushAvStreamTransport.Enums.TransportTriggerTypeEnum = 0 + activationReason: typing.Optional[PushAvStreamTransport.Enums.TriggerActivationReasonEnum] = None + @dataclass class PushTransportEnd(ClusterEvent): @ChipUtility.classproperty @@ -47396,11 +47419,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="connectionID", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="triggerDetails", Tag=1, Type=PushAvStreamTransport.Structs.PushAVStreamTransportTriggerOptionsStruct), + ClusterObjectFieldDescriptor(Label="triggerType", Tag=1, Type=PushAvStreamTransport.Enums.TransportTriggerTypeEnum), + ClusterObjectFieldDescriptor(Label="activationReason", Tag=2, Type=typing.Optional[PushAvStreamTransport.Enums.TriggerActivationReasonEnum]), ]) connectionID: uint = 0 - triggerDetails: PushAvStreamTransport.Structs.PushAVStreamTransportTriggerOptionsStruct = field(default_factory=lambda: PushAvStreamTransport.Structs.PushAVStreamTransportTriggerOptionsStruct()) + triggerType: PushAvStreamTransport.Enums.TransportTriggerTypeEnum = 0 + activationReason: typing.Optional[PushAvStreamTransport.Enums.TriggerActivationReasonEnum] = None @dataclass diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 1047e3c9a91474..aa813185113260 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -14666,12 +14666,12 @@ MTR_PROVISIONALLY_AVAILABLE */ - (void)manuallyTriggerTransportWithParams:(MTRPushAVStreamTransportClusterManuallyTriggerTransportParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; /** - * Command FindStreamConfiguration + * Command FindTransport * * This command SHALL return the Stream Options Configuration for the specified push transport. */ -- (void)findStreamConfigurationWithParams:(MTRPushAVStreamTransportClusterFindStreamConfigurationParams * _Nullable)params completion:(void (^)(MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)findStreamConfigurationWithCompletion:(void (^)(MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams * _Nullable data, NSError * _Nullable error))completion +- (void)findTransportWithParams:(MTRPushAVStreamTransportClusterFindTransportParams * _Nullable)params completion:(void (^)(MTRPushAVStreamTransportClusterFindTransportResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)findTransportWithCompletion:(void (^)(MTRPushAVStreamTransportClusterFindTransportResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)readAttributeSupportedContainerFormatsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; @@ -20198,48 +20198,52 @@ typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportContainerFormat) { MTRPushAVStreamTransportContainerFormatCMAF MTR_PROVISIONALLY_AVAILABLE = 0x00, } MTR_PROVISIONALLY_AVAILABLE; -typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportIngestMethod) { - MTRPushAVStreamTransportIngestMethodCMAFIngest MTR_PROVISIONALLY_AVAILABLE = 0x00, +typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportIngestMethods) { + MTRPushAVStreamTransportIngestMethodsCMAFIngest MTR_PROVISIONALLY_AVAILABLE = 0x00, } MTR_PROVISIONALLY_AVAILABLE; -typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportStatus) { - MTRPushAVStreamTransportStatusActive MTR_PROVISIONALLY_AVAILABLE = 0x00, - MTRPushAVStreamTransportStatusInactive MTR_PROVISIONALLY_AVAILABLE = 0x01, +typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportStatusCode) { + MTRPushAVStreamTransportStatusCodeAllocationNotPermitted MTR_PROVISIONALLY_AVAILABLE = 0x02, + MTRPushAVStreamTransportStatusCodeInvalidTlsEndpoint MTR_PROVISIONALLY_AVAILABLE = 0x03, + MTRPushAVStreamTransportStatusCodeInvalidStream MTR_PROVISIONALLY_AVAILABLE = 0x04, + MTRPushAVStreamTransportStatusCodeInvalidURL MTR_PROVISIONALLY_AVAILABLE = 0x05, + MTRPushAVStreamTransportStatusCodeInvalidZone MTR_PROVISIONALLY_AVAILABLE = 0x06, + MTRPushAVStreamTransportStatusCodeUnsupportedContainerFormat MTR_PROVISIONALLY_AVAILABLE = 0x07, + MTRPushAVStreamTransportStatusCodeUnsupportedIngestMethod MTR_PROVISIONALLY_AVAILABLE = 0x08, + MTRPushAVStreamTransportStatusCodeInvalidTriggerType MTR_PROVISIONALLY_AVAILABLE = 0x09, + MTRPushAVStreamTransportStatusCodeInvalidTransportStatus MTR_PROVISIONALLY_AVAILABLE = 0x10, } MTR_PROVISIONALLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportStreamMultiplexing) { MTRPushAVStreamTransportStreamMultiplexingInterleaved MTR_PROVISIONALLY_AVAILABLE = 0x00, } MTR_PROVISIONALLY_AVAILABLE; -typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportTriggerActivationReason) { - MTRPushAVStreamTransportTriggerActivationReasonUserInitiated MTR_PROVISIONALLY_AVAILABLE = 0x00, - MTRPushAVStreamTransportTriggerActivationReasonAutomation MTR_PROVISIONALLY_AVAILABLE = 0x01, - MTRPushAVStreamTransportTriggerActivationReasonEmergency MTR_PROVISIONALLY_AVAILABLE = 0x02, +typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportStreamType) { + MTRPushAVStreamTransportStreamTypeInternal MTR_PROVISIONALLY_AVAILABLE = 0x00, + MTRPushAVStreamTransportStreamTypeRecording MTR_PROVISIONALLY_AVAILABLE = 0x01, + MTRPushAVStreamTransportStreamTypeAnalysis MTR_PROVISIONALLY_AVAILABLE = 0x02, + MTRPushAVStreamTransportStreamTypeLiveView MTR_PROVISIONALLY_AVAILABLE = 0x03, } MTR_PROVISIONALLY_AVAILABLE; -typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportTriggerType) { - MTRPushAVStreamTransportTriggerTypeCommand MTR_PROVISIONALLY_AVAILABLE = 0x00, - MTRPushAVStreamTransportTriggerTypeMotion MTR_PROVISIONALLY_AVAILABLE = 0x01, - MTRPushAVStreamTransportTriggerTypeContinuous MTR_PROVISIONALLY_AVAILABLE = 0x02, +typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportTransportStatus) { + MTRPushAVStreamTransportTransportStatusActive MTR_PROVISIONALLY_AVAILABLE = 0x00, + MTRPushAVStreamTransportTransportStatusInactive MTR_PROVISIONALLY_AVAILABLE = 0x01, } MTR_PROVISIONALLY_AVAILABLE; -typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportStatusCode) { - MTRPushAVStreamTransportStatusCodeALLOCATIONNOTPERMITTED MTR_PROVISIONALLY_AVAILABLE = 0x02, - MTRPushAVStreamTransportStatusCodeINVALIDPARAMETERS MTR_PROVISIONALLY_AVAILABLE = 0x03, - MTRPushAVStreamTransportStatusCodeINVALIDURL MTR_PROVISIONALLY_AVAILABLE = 0x04, - MTRPushAVStreamTransportStatusCodeINVALIDTRIGGEROPTIONS MTR_PROVISIONALLY_AVAILABLE = 0x05, - MTRPushAVStreamTransportStatusCodeUNSUPPORTEDCONTAINERFORMAT MTR_PROVISIONALLY_AVAILABLE = 0x06, - MTRPushAVStreamTransportStatusCodeUNSUPPORTEDINGESTMETHOD MTR_PROVISIONALLY_AVAILABLE = 0x07, - MTRPushAVStreamTransportStatusCodePAVSTNOTINUSE MTR_PROVISIONALLY_AVAILABLE = 0x08, - MTRPushAVStreamTransportStatusCodeINVALIDTRIGGERFORMAT MTR_PROVISIONALLY_AVAILABLE = 0x09, - MTRPushAVStreamTransportStatusCodeINVALIDTRANSPORTSTATUS MTR_PROVISIONALLY_AVAILABLE = 0x10, +typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportTransportTriggerType) { + MTRPushAVStreamTransportTransportTriggerTypeCommand MTR_PROVISIONALLY_AVAILABLE = 0x00, + MTRPushAVStreamTransportTransportTriggerTypeMotion MTR_PROVISIONALLY_AVAILABLE = 0x01, + MTRPushAVStreamTransportTransportTriggerTypeContinuous MTR_PROVISIONALLY_AVAILABLE = 0x02, } MTR_PROVISIONALLY_AVAILABLE; -typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportStreamType) { - MTRPushAVStreamTransportStreamTypeInternal MTR_PROVISIONALLY_AVAILABLE = 0x00, - MTRPushAVStreamTransportStreamTypeRecording MTR_PROVISIONALLY_AVAILABLE = 0x01, - MTRPushAVStreamTransportStreamTypeAnalysis MTR_PROVISIONALLY_AVAILABLE = 0x02, - MTRPushAVStreamTransportStreamTypeLiveView MTR_PROVISIONALLY_AVAILABLE = 0x03, +typedef NS_ENUM(uint8_t, MTRPushAVStreamTransportTriggerActivationReason) { + MTRPushAVStreamTransportTriggerActivationReasonUserInitiated MTR_PROVISIONALLY_AVAILABLE = 0x00, + MTRPushAVStreamTransportTriggerActivationReasonAutomation MTR_PROVISIONALLY_AVAILABLE = 0x01, + MTRPushAVStreamTransportTriggerActivationReasonEmergency MTR_PROVISIONALLY_AVAILABLE = 0x02, +} MTR_PROVISIONALLY_AVAILABLE; + +typedef NS_OPTIONS(uint32_t, MTRPushAVStreamTransportFeature) { + MTRPushAVStreamTransportFeaturePerZoneSensitivity MTR_PROVISIONALLY_AVAILABLE = 0x1, } MTR_PROVISIONALLY_AVAILABLE; typedef NS_OPTIONS(uint8_t, MTRPushAVStreamTransportSupportedContainerFormatsBitmap) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index f5aa617cc5940c..136e3c8dd39b1c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -100685,14 +100685,14 @@ - (void)manuallyTriggerTransportWithParams:(MTRPushAVStreamTransportClusterManua queue:self.callbackQueue completion:responseHandler]; } -- (void)findStreamConfigurationWithCompletion:(void (^)(MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams * _Nullable data, NSError * _Nullable error))completion +- (void)findTransportWithCompletion:(void (^)(MTRPushAVStreamTransportClusterFindTransportResponseParams * _Nullable data, NSError * _Nullable error))completion { - [self findStreamConfigurationWithParams:nil completion:completion]; + [self findTransportWithParams:nil completion:completion]; } -- (void)findStreamConfigurationWithParams:(MTRPushAVStreamTransportClusterFindStreamConfigurationParams * _Nullable)params completion:(void (^)(MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams * _Nullable data, NSError * _Nullable error))completion +- (void)findTransportWithParams:(MTRPushAVStreamTransportClusterFindTransportParams * _Nullable)params completion:(void (^)(MTRPushAVStreamTransportClusterFindTransportResponseParams * _Nullable data, NSError * _Nullable error))completion { if (params == nil) { - params = [[MTRPushAVStreamTransportClusterFindStreamConfigurationParams + params = [[MTRPushAVStreamTransportClusterFindTransportParams alloc] init]; } @@ -100702,14 +100702,14 @@ - (void)findStreamConfigurationWithParams:(MTRPushAVStreamTransportClusterFindSt auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = PushAvStreamTransport::Commands::FindStreamConfiguration::Type; + using RequestType = PushAvStreamTransport::Commands::FindTransport::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) commandPayload:params timedInvokeTimeout:timedInvokeTimeoutMs serverSideProcessingTimeout:params.serverSideProcessingTimeout - responseClass:MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams.class + responseClass:MTRPushAVStreamTransportClusterFindTransportResponseParams.class queue:self.callbackQueue completion:responseHandler]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index dfff553544126d..ef575b184d928e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -6943,8 +6943,8 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) { MTRCommandIDTypeClusterPushAVStreamTransportCommandModifyPushTransportID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, MTRCommandIDTypeClusterPushAVStreamTransportCommandSetTransportStatusID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, MTRCommandIDTypeClusterPushAVStreamTransportCommandManuallyTriggerTransportID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, - MTRCommandIDTypeClusterPushAVStreamTransportCommandFindStreamConfigurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, - MTRCommandIDTypeClusterPushAVStreamTransportCommandFindStreamConfigurationResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000007, + MTRCommandIDTypeClusterPushAVStreamTransportCommandFindTransportID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, + MTRCommandIDTypeClusterPushAVStreamTransportCommandFindTransportResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000007, // Cluster Chime commands MTRCommandIDTypeClusterChimeCommandPlayChimeSoundID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm index 0699df7e5623b3..93231198f84058 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm @@ -10900,8 +10900,8 @@ result = @"ManuallyTriggerTransport"; break; - case MTRCommandIDTypeClusterPushAVStreamTransportCommandFindStreamConfigurationID: - result = @"FindStreamConfiguration"; + case MTRCommandIDTypeClusterPushAVStreamTransportCommandFindTransportID: + result = @"FindTransport"; break; default: @@ -12602,8 +12602,8 @@ result = @"AllocatePushTransportResponse"; break; - case MTRCommandIDTypeClusterPushAVStreamTransportCommandFindStreamConfigurationResponseID: - result = @"FindStreamConfigurationResponse"; + case MTRCommandIDTypeClusterPushAVStreamTransportCommandFindTransportResponseID: + result = @"FindTransportResponse"; break; default: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index bc0fdc9d03fe00..67afd2788f7217 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -6846,8 +6846,8 @@ MTR_PROVISIONALLY_AVAILABLE - (void)modifyPushTransportWithParams:(MTRPushAVStreamTransportClusterModifyPushTransportParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; - (void)setTransportStatusWithParams:(MTRPushAVStreamTransportClusterSetTransportStatusParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; - (void)manuallyTriggerTransportWithParams:(MTRPushAVStreamTransportClusterManuallyTriggerTransportParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)findStreamConfigurationWithParams:(MTRPushAVStreamTransportClusterFindStreamConfigurationParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)findStreamConfigurationWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams * _Nullable data, NSError * _Nullable error))completion +- (void)findTransportWithParams:(MTRPushAVStreamTransportClusterFindTransportParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRPushAVStreamTransportClusterFindTransportResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)findTransportWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRPushAVStreamTransportClusterFindTransportResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeSupportedContainerFormatsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 7da4c9a4e40ab3..79881ca98cefb2 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -20004,14 +20004,14 @@ - (void)manuallyTriggerTransportWithParams:(MTRPushAVStreamTransportClusterManua completion:responseHandler]; } -- (void)findStreamConfigurationWithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams * _Nullable data, NSError * _Nullable error))completion +- (void)findTransportWithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRPushAVStreamTransportClusterFindTransportResponseParams * _Nullable data, NSError * _Nullable error))completion { - [self findStreamConfigurationWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion]; + [self findTransportWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion]; } -- (void)findStreamConfigurationWithParams:(MTRPushAVStreamTransportClusterFindStreamConfigurationParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams * _Nullable data, NSError * _Nullable error))completion +- (void)findTransportWithParams:(MTRPushAVStreamTransportClusterFindTransportParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRPushAVStreamTransportClusterFindTransportResponseParams * _Nullable data, NSError * _Nullable error))completion { if (params == nil) { - params = [[MTRPushAVStreamTransportClusterFindStreamConfigurationParams + params = [[MTRPushAVStreamTransportClusterFindTransportParams alloc] init]; } @@ -20021,7 +20021,7 @@ - (void)findStreamConfigurationWithParams:(MTRPushAVStreamTransportClusterFindSt auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = PushAvStreamTransport::Commands::FindStreamConfiguration::Type; + using RequestType = PushAvStreamTransport::Commands::FindTransport::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -20030,7 +20030,7 @@ - (void)findStreamConfigurationWithParams:(MTRPushAVStreamTransportClusterFindSt expectedValueInterval:expectedValueIntervalMs timedInvokeTimeout:timedInvokeTimeoutMs serverSideProcessingTimeout:params.serverSideProcessingTimeout - responseClass:MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams.class + responseClass:MTRPushAVStreamTransportClusterFindTransportResponseParams.class queue:self.callbackQueue completion:responseHandler]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 94be2f90393d25..1c2fd47dd4d8c0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -11702,7 +11702,7 @@ MTR_PROVISIONALLY_AVAILABLE MTR_PROVISIONALLY_AVAILABLE @interface MTRPushAVStreamTransportClusterAllocatePushTransportParams : NSObject -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct * _Nonnull streamTransportOptions MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterTransportOptionsStruct * _Nonnull transportOptions MTR_PROVISIONALLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -11734,7 +11734,7 @@ MTR_PROVISIONALLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nonnull connectionID MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct * _Nonnull streamTransportOptions MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterTransportOptionsStruct * _Nonnull transportOptions MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull transportStatus MTR_PROVISIONALLY_AVAILABLE; @@ -11787,7 +11787,7 @@ MTR_PROVISIONALLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nonnull connectionID MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct * _Nonnull streamTransportOptions MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterTransportOptionsStruct * _Nonnull transportOptions MTR_PROVISIONALLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -11819,7 +11819,7 @@ MTR_PROVISIONALLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nullable connectionID MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull streamTransportStatus MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull transportStatus MTR_PROVISIONALLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -11853,7 +11853,7 @@ MTR_PROVISIONALLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nullable activationReason MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct * _Nullable timeControl MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct * _Nullable timeControl MTR_PROVISIONALLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -11881,7 +11881,7 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRPushAVStreamTransportClusterFindStreamConfigurationParams : NSObject +@interface MTRPushAVStreamTransportClusterFindTransportParams : NSObject @property (nonatomic, copy) NSNumber * _Nullable connectionID MTR_PROVISIONALLY_AVAILABLE; /** @@ -11911,12 +11911,12 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams : NSObject +@interface MTRPushAVStreamTransportClusterFindTransportResponseParams : NSObject @property (nonatomic, copy) NSArray * _Nonnull streamConfigurations MTR_PROVISIONALLY_AVAILABLE; /** - * Initialize an MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams with a response-value dictionary + * Initialize an MTRPushAVStreamTransportClusterFindTransportResponseParams with a response-value dictionary * of the sort that MTRDeviceResponseHandler would receive. * * Will return nil and hand out an error if the response-value dictionary is not diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 0f33074816a1cd..1552eee8e6e07e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -34320,7 +34320,7 @@ - (instancetype)init { if (self = [super init]) { - _streamTransportOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct new]; + _transportOptions = [MTRPushAVStreamTransportClusterTransportOptionsStruct new]; _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -34331,7 +34331,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRPushAVStreamTransportClusterAllocatePushTransportParams alloc] init]; - other.streamTransportOptions = self.streamTransportOptions; + other.transportOptions = self.transportOptions; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -34340,7 +34340,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: streamTransportOptions:%@; >", NSStringFromClass([self class]), _streamTransportOptions]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: transportOptions:%@; >", NSStringFromClass([self class]), _transportOptions]; return descriptionString; } @@ -34353,128 +34353,117 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader chip::app::Clusters::PushAvStreamTransport::Commands::AllocatePushTransport::Type encodableStruct; ListFreer listFreer; { - encodableStruct.streamTransportOptions.streamType = static_cast>(self.streamTransportOptions.streamType.unsignedCharValue); - if (self.streamTransportOptions.videoStreamID != nil) { - auto & definedValue_1 = encodableStruct.streamTransportOptions.videoStreamID.Emplace(); - if (self.streamTransportOptions.videoStreamID == nil) { - definedValue_1.SetNull(); - } else { - auto & nonNullValue_2 = definedValue_1.SetNonNull(); - nonNullValue_2 = self.streamTransportOptions.videoStreamID.unsignedShortValue; - } + encodableStruct.transportOptions.streamType = static_cast>(self.transportOptions.streamType.unsignedCharValue); + if (self.transportOptions.videoStreamID != nil) { + auto & definedValue_1 = encodableStruct.transportOptions.videoStreamID.Emplace(); + definedValue_1 = self.transportOptions.videoStreamID.unsignedShortValue; } - if (self.streamTransportOptions.audioStreamID != nil) { - auto & definedValue_1 = encodableStruct.streamTransportOptions.audioStreamID.Emplace(); - if (self.streamTransportOptions.audioStreamID == nil) { - definedValue_1.SetNull(); - } else { - auto & nonNullValue_2 = definedValue_1.SetNonNull(); - nonNullValue_2 = self.streamTransportOptions.audioStreamID.unsignedShortValue; - } + if (self.transportOptions.audioStreamID != nil) { + auto & definedValue_1 = encodableStruct.transportOptions.audioStreamID.Emplace(); + definedValue_1 = self.transportOptions.audioStreamID.unsignedShortValue; } - encodableStruct.streamTransportOptions.TLSEndpointID = self.streamTransportOptions.tlsEndpointID.unsignedShortValue; - encodableStruct.streamTransportOptions.url = AsCharSpan(self.streamTransportOptions.url); - encodableStruct.streamTransportOptions.triggerOptions.triggerType = static_cast>(self.streamTransportOptions.triggerOptions.triggerType.unsignedCharValue); - if (self.streamTransportOptions.triggerOptions.motionZones != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.triggerOptions.motionZones.Emplace(); - if (self.streamTransportOptions.triggerOptions.motionZones == nil) { + encodableStruct.transportOptions.endpointID = self.transportOptions.endpointID.unsignedShortValue; + encodableStruct.transportOptions.url = AsCharSpan(self.transportOptions.url); + encodableStruct.transportOptions.triggerOptions.triggerType = static_cast>(self.transportOptions.triggerOptions.triggerType.unsignedCharValue); + if (self.transportOptions.triggerOptions.motionZones != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.triggerOptions.motionZones.Emplace(); + if (self.transportOptions.triggerOptions.motionZones == nil) { definedValue_2.SetNull(); } else { auto & nonNullValue_3 = definedValue_2.SetNonNull(); { using ListType_4 = std::remove_reference_t; using ListMemberType_4 = ListMemberTypeGetter::Type; - if (self.streamTransportOptions.triggerOptions.motionZones.count != 0) { - auto * listHolder_4 = new ListHolder(self.streamTransportOptions.triggerOptions.motionZones.count); + if (self.transportOptions.triggerOptions.motionZones.count != 0) { + auto * listHolder_4 = new ListHolder(self.transportOptions.triggerOptions.motionZones.count); if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) { return CHIP_ERROR_INVALID_ARGUMENT; } listFreer.add(listHolder_4); - for (size_t i_4 = 0; i_4 < self.streamTransportOptions.triggerOptions.motionZones.count; ++i_4) { - auto element_4 = MTR_SAFE_CAST(self.streamTransportOptions.triggerOptions.motionZones[i_4], NSNumber); + for (size_t i_4 = 0; i_4 < self.transportOptions.triggerOptions.motionZones.count; ++i_4) { + auto element_4 = MTR_SAFE_CAST(self.transportOptions.triggerOptions.motionZones[i_4], MTRPushAVStreamTransportClusterTransportZoneOptionsStruct); if (!element_4) { // Wrong kind of value. - MTR_LOG_ERROR("%@ incorrectly present in list of %@", self.streamTransportOptions.triggerOptions.motionZones[i_4], NSStringFromClass(NSNumber.class)); + MTR_LOG_ERROR("%@ incorrectly present in list of %@", self.transportOptions.triggerOptions.motionZones[i_4], NSStringFromClass(MTRPushAVStreamTransportClusterTransportZoneOptionsStruct.class)); return CHIP_ERROR_INVALID_ARGUMENT; } - listHolder_4->mList[i_4] = element_4.unsignedShortValue; + if (element_4.zone == nil) { + listHolder_4->mList[i_4].zone.SetNull(); + } else { + auto & nonNullValue_6 = listHolder_4->mList[i_4].zone.SetNonNull(); + nonNullValue_6 = element_4.zone.unsignedShortValue; + } + if (element_4.sensitivity != nil) { + auto & definedValue_6 = listHolder_4->mList[i_4].sensitivity.Emplace(); + definedValue_6 = element_4.sensitivity.unsignedCharValue; + } } - nonNullValue_3 = ListType_4(listHolder_4->mList, self.streamTransportOptions.triggerOptions.motionZones.count); + nonNullValue_3 = ListType_4(listHolder_4->mList, self.transportOptions.triggerOptions.motionZones.count); } else { nonNullValue_3 = ListType_4(); } } } } - if (self.streamTransportOptions.triggerOptions.motionSensitivity != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.triggerOptions.motionSensitivity.Emplace(); - if (self.streamTransportOptions.triggerOptions.motionSensitivity == nil) { + if (self.transportOptions.triggerOptions.motionSensitivity != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.triggerOptions.motionSensitivity.Emplace(); + if (self.transportOptions.triggerOptions.motionSensitivity == nil) { definedValue_2.SetNull(); } else { auto & nonNullValue_3 = definedValue_2.SetNonNull(); - nonNullValue_3 = self.streamTransportOptions.triggerOptions.motionSensitivity.unsignedCharValue; - } - } - if (self.streamTransportOptions.triggerOptions.motionTimeControl != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.triggerOptions.motionTimeControl.Emplace(); - if (self.streamTransportOptions.triggerOptions.motionTimeControl == nil) { + nonNullValue_3 = self.transportOptions.triggerOptions.motionSensitivity.unsignedCharValue; + } + } + if (self.transportOptions.triggerOptions.motionTimeControl != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.triggerOptions.motionTimeControl.Emplace(); + definedValue_2.initialDuration = self.transportOptions.triggerOptions.motionTimeControl.initialDuration.unsignedShortValue; + definedValue_2.augmentationDuration = self.transportOptions.triggerOptions.motionTimeControl.augmentationDuration.unsignedShortValue; + definedValue_2.maxDuration = self.transportOptions.triggerOptions.motionTimeControl.maxDuration.unsignedIntValue; + definedValue_2.blindDuration = self.transportOptions.triggerOptions.motionTimeControl.blindDuration.unsignedShortValue; + } + if (self.transportOptions.triggerOptions.maxPreRollLen != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.triggerOptions.maxPreRollLen.Emplace(); + definedValue_2 = self.transportOptions.triggerOptions.maxPreRollLen.unsignedShortValue; + } + encodableStruct.transportOptions.ingestMethod = static_cast>(self.transportOptions.ingestMethod.unsignedCharValue); + encodableStruct.transportOptions.containerFormat = static_cast>(self.transportOptions.containerFormat.unsignedCharValue); + encodableStruct.transportOptions.containerOptions.containerType = static_cast>(self.transportOptions.containerOptions.containerType.unsignedCharValue); + if (self.transportOptions.containerOptions.cmafContainerOptions != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.containerOptions.CMAFContainerOptions.Emplace(); + if (self.transportOptions.containerOptions.cmafContainerOptions == nil) { definedValue_2.SetNull(); } else { auto & nonNullValue_3 = definedValue_2.SetNonNull(); - nonNullValue_3.initialDuration = self.streamTransportOptions.triggerOptions.motionTimeControl.initialDuration.unsignedShortValue; - nonNullValue_3.augmentationDuration = self.streamTransportOptions.triggerOptions.motionTimeControl.augmentationDuration.unsignedShortValue; - nonNullValue_3.maxDuration = self.streamTransportOptions.triggerOptions.motionTimeControl.maxDuration.unsignedIntValue; - nonNullValue_3.blindDuration = self.streamTransportOptions.triggerOptions.motionTimeControl.blindDuration.unsignedShortValue; - } - } - if (self.streamTransportOptions.triggerOptions.activationReason != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.triggerOptions.activationReason.Emplace(); - if (self.streamTransportOptions.triggerOptions.activationReason == nil) { - definedValue_2.SetNull(); - } else { - auto & nonNullValue_3 = definedValue_2.SetNonNull(); - nonNullValue_3 = static_cast>(self.streamTransportOptions.triggerOptions.activationReason.unsignedCharValue); - } - } - encodableStruct.streamTransportOptions.containerFormat = static_cast>(self.streamTransportOptions.containerFormat.unsignedCharValue); - encodableStruct.streamTransportOptions.ingestMethod = static_cast>(self.streamTransportOptions.ingestMethod.unsignedCharValue); - encodableStruct.streamTransportOptions.containerOptions.containerType = static_cast>(self.streamTransportOptions.containerOptions.containerType.unsignedCharValue); - if (self.streamTransportOptions.containerOptions.cmafContainerOptions != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.containerOptions.CMAFContainerOptions.Emplace(); - if (self.streamTransportOptions.containerOptions.cmafContainerOptions == nil) { - definedValue_2.SetNull(); - } else { - auto & nonNullValue_3 = definedValue_2.SetNonNull(); - nonNullValue_3.chunkDuration = self.streamTransportOptions.containerOptions.cmafContainerOptions.chunkDuration.unsignedShortValue; - if (self.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey != nil) { + nonNullValue_3.chunkDuration = self.transportOptions.containerOptions.cmafContainerOptions.chunkDuration.unsignedShortValue; + if (self.transportOptions.containerOptions.cmafContainerOptions.cencKey != nil) { auto & definedValue_5 = nonNullValue_3.CENCKey.Emplace(); - if (self.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey == nil) { + if (self.transportOptions.containerOptions.cmafContainerOptions.cencKey == nil) { definedValue_5.SetNull(); } else { auto & nonNullValue_6 = definedValue_5.SetNonNull(); - nonNullValue_6 = AsByteSpan(self.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey); + nonNullValue_6 = AsByteSpan(self.transportOptions.containerOptions.cmafContainerOptions.cencKey); } } } } - if (self.streamTransportOptions.metadataOptions != nil) { - auto & definedValue_1 = encodableStruct.streamTransportOptions.metadataOptions.Emplace(); - if (self.streamTransportOptions.metadataOptions == nil) { + if (self.transportOptions.metadataOptions != nil) { + auto & definedValue_1 = encodableStruct.transportOptions.metadataOptions.Emplace(); + if (self.transportOptions.metadataOptions == nil) { definedValue_1.SetNull(); } else { auto & nonNullValue_2 = definedValue_1.SetNonNull(); - nonNullValue_2.multiplexing = static_cast>(self.streamTransportOptions.metadataOptions.multiplexing.unsignedCharValue); - nonNullValue_2.includeMotionZones = self.streamTransportOptions.metadataOptions.includeMotionZones.boolValue; - nonNullValue_2.enableMetadataPrivacySensitive = self.streamTransportOptions.metadataOptions.enableMetadataPrivacySensitive.boolValue; + nonNullValue_2.multiplexing = static_cast>(self.transportOptions.metadataOptions.multiplexing.unsignedCharValue); + nonNullValue_2.includeMotionZones = self.transportOptions.metadataOptions.includeMotionZones.boolValue; + nonNullValue_2.enableMetadataPrivacySensitive = self.transportOptions.metadataOptions.enableMetadataPrivacySensitive.boolValue; } } - if (self.streamTransportOptions.expiryTime != nil) { - auto & definedValue_1 = encodableStruct.streamTransportOptions.expiryTime.Emplace(); - if (self.streamTransportOptions.expiryTime == nil) { + if (self.transportOptions.expiryTime != nil) { + auto & definedValue_1 = encodableStruct.transportOptions.expiryTime.Emplace(); + if (self.transportOptions.expiryTime == nil) { definedValue_1.SetNull(); } else { auto & nonNullValue_2 = definedValue_1.SetNonNull(); - nonNullValue_2 = self.streamTransportOptions.expiryTime.unsignedIntValue; + nonNullValue_2 = self.transportOptions.expiryTime.unsignedIntValue; } } } @@ -34524,7 +34513,7 @@ - (instancetype)init _connectionID = @(0); - _streamTransportOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct new]; + _transportOptions = [MTRPushAVStreamTransportClusterTransportOptionsStruct new]; _transportStatus = @(0); } @@ -34536,7 +34525,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRPushAVStreamTransportClusterAllocatePushTransportResponseParams alloc] init]; other.connectionID = self.connectionID; - other.streamTransportOptions = self.streamTransportOptions; + other.transportOptions = self.transportOptions; other.transportStatus = self.transportStatus; return other; @@ -34544,7 +34533,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; streamTransportOptions:%@; transportStatus:%@; >", NSStringFromClass([self class]), _connectionID, _streamTransportOptions, _transportStatus]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; transportOptions:%@; transportStatus:%@; >", NSStringFromClass([self class]), _connectionID, _transportOptions, _transportStatus]; return descriptionString; } @@ -34598,131 +34587,125 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::PushAvSt self.connectionID = [NSNumber numberWithUnsignedShort:decodableStruct.connectionID]; } { - self.streamTransportOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct new]; - self.streamTransportOptions.streamType = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.streamTransportOptions.streamType)]; - if (decodableStruct.streamTransportOptions.videoStreamID.HasValue()) { - if (decodableStruct.streamTransportOptions.videoStreamID.Value().IsNull()) { - self.streamTransportOptions.videoStreamID = nil; - } else { - self.streamTransportOptions.videoStreamID = [NSNumber numberWithUnsignedShort:decodableStruct.streamTransportOptions.videoStreamID.Value().Value()]; - } + self.transportOptions = [MTRPushAVStreamTransportClusterTransportOptionsStruct new]; + self.transportOptions.streamType = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.transportOptions.streamType)]; + if (decodableStruct.transportOptions.videoStreamID.HasValue()) { + self.transportOptions.videoStreamID = [NSNumber numberWithUnsignedShort:decodableStruct.transportOptions.videoStreamID.Value()]; } else { - self.streamTransportOptions.videoStreamID = nil; + self.transportOptions.videoStreamID = nil; } - if (decodableStruct.streamTransportOptions.audioStreamID.HasValue()) { - if (decodableStruct.streamTransportOptions.audioStreamID.Value().IsNull()) { - self.streamTransportOptions.audioStreamID = nil; - } else { - self.streamTransportOptions.audioStreamID = [NSNumber numberWithUnsignedShort:decodableStruct.streamTransportOptions.audioStreamID.Value().Value()]; - } + if (decodableStruct.transportOptions.audioStreamID.HasValue()) { + self.transportOptions.audioStreamID = [NSNumber numberWithUnsignedShort:decodableStruct.transportOptions.audioStreamID.Value()]; } else { - self.streamTransportOptions.audioStreamID = nil; + self.transportOptions.audioStreamID = nil; } - self.streamTransportOptions.tlsEndpointID = [NSNumber numberWithUnsignedShort:decodableStruct.streamTransportOptions.TLSEndpointID]; - self.streamTransportOptions.url = AsString(decodableStruct.streamTransportOptions.url); - if (self.streamTransportOptions.url == nil) { + self.transportOptions.endpointID = [NSNumber numberWithUnsignedShort:decodableStruct.transportOptions.endpointID]; + self.transportOptions.url = AsString(decodableStruct.transportOptions.url); + if (self.transportOptions.url == nil) { CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT; return err; } - self.streamTransportOptions.triggerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct new]; - self.streamTransportOptions.triggerOptions.triggerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.streamTransportOptions.triggerOptions.triggerType)]; - if (decodableStruct.streamTransportOptions.triggerOptions.motionZones.HasValue()) { - if (decodableStruct.streamTransportOptions.triggerOptions.motionZones.Value().IsNull()) { - self.streamTransportOptions.triggerOptions.motionZones = nil; + self.transportOptions.triggerOptions = [MTRPushAVStreamTransportClusterTransportTriggerOptionsStruct new]; + self.transportOptions.triggerOptions.triggerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.transportOptions.triggerOptions.triggerType)]; + if (decodableStruct.transportOptions.triggerOptions.motionZones.HasValue()) { + if (decodableStruct.transportOptions.triggerOptions.motionZones.Value().IsNull()) { + self.transportOptions.triggerOptions.motionZones = nil; } else { { // Scope for our temporary variables auto * array_4 = [NSMutableArray new]; - auto iter_4 = decodableStruct.streamTransportOptions.triggerOptions.motionZones.Value().Value().begin(); + auto iter_4 = decodableStruct.transportOptions.triggerOptions.motionZones.Value().Value().begin(); while (iter_4.Next()) { auto & entry_4 = iter_4.GetValue(); - NSNumber * newElement_4; - newElement_4 = [NSNumber numberWithUnsignedShort:entry_4]; + MTRPushAVStreamTransportClusterTransportZoneOptionsStruct * newElement_4; + newElement_4 = [MTRPushAVStreamTransportClusterTransportZoneOptionsStruct new]; + if (entry_4.zone.IsNull()) { + newElement_4.zone = nil; + } else { + newElement_4.zone = [NSNumber numberWithUnsignedShort:entry_4.zone.Value()]; + } + if (entry_4.sensitivity.HasValue()) { + newElement_4.sensitivity = [NSNumber numberWithUnsignedChar:entry_4.sensitivity.Value()]; + } else { + newElement_4.sensitivity = nil; + } [array_4 addObject:newElement_4]; } CHIP_ERROR err = iter_4.GetStatus(); if (err != CHIP_NO_ERROR) { return err; } - self.streamTransportOptions.triggerOptions.motionZones = array_4; + self.transportOptions.triggerOptions.motionZones = array_4; } } } else { - self.streamTransportOptions.triggerOptions.motionZones = nil; + self.transportOptions.triggerOptions.motionZones = nil; } - if (decodableStruct.streamTransportOptions.triggerOptions.motionSensitivity.HasValue()) { - if (decodableStruct.streamTransportOptions.triggerOptions.motionSensitivity.Value().IsNull()) { - self.streamTransportOptions.triggerOptions.motionSensitivity = nil; + if (decodableStruct.transportOptions.triggerOptions.motionSensitivity.HasValue()) { + if (decodableStruct.transportOptions.triggerOptions.motionSensitivity.Value().IsNull()) { + self.transportOptions.triggerOptions.motionSensitivity = nil; } else { - self.streamTransportOptions.triggerOptions.motionSensitivity = [NSNumber numberWithUnsignedChar:decodableStruct.streamTransportOptions.triggerOptions.motionSensitivity.Value().Value()]; + self.transportOptions.triggerOptions.motionSensitivity = [NSNumber numberWithUnsignedChar:decodableStruct.transportOptions.triggerOptions.motionSensitivity.Value().Value()]; } } else { - self.streamTransportOptions.triggerOptions.motionSensitivity = nil; - } - if (decodableStruct.streamTransportOptions.triggerOptions.motionTimeControl.HasValue()) { - if (decodableStruct.streamTransportOptions.triggerOptions.motionTimeControl.Value().IsNull()) { - self.streamTransportOptions.triggerOptions.motionTimeControl = nil; - } else { - self.streamTransportOptions.triggerOptions.motionTimeControl = [MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct new]; - self.streamTransportOptions.triggerOptions.motionTimeControl.initialDuration = [NSNumber numberWithUnsignedShort:decodableStruct.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().initialDuration]; - self.streamTransportOptions.triggerOptions.motionTimeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:decodableStruct.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().augmentationDuration]; - self.streamTransportOptions.triggerOptions.motionTimeControl.maxDuration = [NSNumber numberWithUnsignedInt:decodableStruct.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().maxDuration]; - self.streamTransportOptions.triggerOptions.motionTimeControl.blindDuration = [NSNumber numberWithUnsignedShort:decodableStruct.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().blindDuration]; - } + self.transportOptions.triggerOptions.motionSensitivity = nil; + } + if (decodableStruct.transportOptions.triggerOptions.motionTimeControl.HasValue()) { + self.transportOptions.triggerOptions.motionTimeControl = [MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct new]; + self.transportOptions.triggerOptions.motionTimeControl.initialDuration = [NSNumber numberWithUnsignedShort:decodableStruct.transportOptions.triggerOptions.motionTimeControl.Value().initialDuration]; + self.transportOptions.triggerOptions.motionTimeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:decodableStruct.transportOptions.triggerOptions.motionTimeControl.Value().augmentationDuration]; + self.transportOptions.triggerOptions.motionTimeControl.maxDuration = [NSNumber numberWithUnsignedInt:decodableStruct.transportOptions.triggerOptions.motionTimeControl.Value().maxDuration]; + self.transportOptions.triggerOptions.motionTimeControl.blindDuration = [NSNumber numberWithUnsignedShort:decodableStruct.transportOptions.triggerOptions.motionTimeControl.Value().blindDuration]; } else { - self.streamTransportOptions.triggerOptions.motionTimeControl = nil; + self.transportOptions.triggerOptions.motionTimeControl = nil; } - if (decodableStruct.streamTransportOptions.triggerOptions.activationReason.HasValue()) { - if (decodableStruct.streamTransportOptions.triggerOptions.activationReason.Value().IsNull()) { - self.streamTransportOptions.triggerOptions.activationReason = nil; - } else { - self.streamTransportOptions.triggerOptions.activationReason = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.streamTransportOptions.triggerOptions.activationReason.Value().Value())]; - } + if (decodableStruct.transportOptions.triggerOptions.maxPreRollLen.HasValue()) { + self.transportOptions.triggerOptions.maxPreRollLen = [NSNumber numberWithUnsignedShort:decodableStruct.transportOptions.triggerOptions.maxPreRollLen.Value()]; } else { - self.streamTransportOptions.triggerOptions.activationReason = nil; - } - self.streamTransportOptions.containerFormat = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.streamTransportOptions.containerFormat)]; - self.streamTransportOptions.ingestMethod = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.streamTransportOptions.ingestMethod)]; - self.streamTransportOptions.containerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportContainerOptionsStruct new]; - self.streamTransportOptions.containerOptions.containerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.streamTransportOptions.containerOptions.containerType)]; - if (decodableStruct.streamTransportOptions.containerOptions.CMAFContainerOptions.HasValue()) { - if (decodableStruct.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().IsNull()) { - self.streamTransportOptions.containerOptions.cmafContainerOptions = nil; + self.transportOptions.triggerOptions.maxPreRollLen = nil; + } + self.transportOptions.ingestMethod = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.transportOptions.ingestMethod)]; + self.transportOptions.containerFormat = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.transportOptions.containerFormat)]; + self.transportOptions.containerOptions = [MTRPushAVStreamTransportClusterContainerOptionsStruct new]; + self.transportOptions.containerOptions.containerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.transportOptions.containerOptions.containerType)]; + if (decodableStruct.transportOptions.containerOptions.CMAFContainerOptions.HasValue()) { + if (decodableStruct.transportOptions.containerOptions.CMAFContainerOptions.Value().IsNull()) { + self.transportOptions.containerOptions.cmafContainerOptions = nil; } else { - self.streamTransportOptions.containerOptions.cmafContainerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct new]; - self.streamTransportOptions.containerOptions.cmafContainerOptions.chunkDuration = [NSNumber numberWithUnsignedShort:decodableStruct.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().chunkDuration]; - if (decodableStruct.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.HasValue()) { - if (decodableStruct.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().IsNull()) { - self.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = nil; + self.transportOptions.containerOptions.cmafContainerOptions = [MTRPushAVStreamTransportClusterCMAFContainerOptionsStruct new]; + self.transportOptions.containerOptions.cmafContainerOptions.chunkDuration = [NSNumber numberWithUnsignedShort:decodableStruct.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().chunkDuration]; + if (decodableStruct.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.HasValue()) { + if (decodableStruct.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().IsNull()) { + self.transportOptions.containerOptions.cmafContainerOptions.cencKey = nil; } else { - self.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = AsData(decodableStruct.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value()); + self.transportOptions.containerOptions.cmafContainerOptions.cencKey = AsData(decodableStruct.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value()); } } else { - self.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = nil; + self.transportOptions.containerOptions.cmafContainerOptions.cencKey = nil; } } } else { - self.streamTransportOptions.containerOptions.cmafContainerOptions = nil; + self.transportOptions.containerOptions.cmafContainerOptions = nil; } - if (decodableStruct.streamTransportOptions.metadataOptions.HasValue()) { - if (decodableStruct.streamTransportOptions.metadataOptions.Value().IsNull()) { - self.streamTransportOptions.metadataOptions = nil; + if (decodableStruct.transportOptions.metadataOptions.HasValue()) { + if (decodableStruct.transportOptions.metadataOptions.Value().IsNull()) { + self.transportOptions.metadataOptions = nil; } else { - self.streamTransportOptions.metadataOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct new]; - self.streamTransportOptions.metadataOptions.multiplexing = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.streamTransportOptions.metadataOptions.Value().Value().multiplexing)]; - self.streamTransportOptions.metadataOptions.includeMotionZones = [NSNumber numberWithBool:decodableStruct.streamTransportOptions.metadataOptions.Value().Value().includeMotionZones]; - self.streamTransportOptions.metadataOptions.enableMetadataPrivacySensitive = [NSNumber numberWithBool:decodableStruct.streamTransportOptions.metadataOptions.Value().Value().enableMetadataPrivacySensitive]; + self.transportOptions.metadataOptions = [MTRPushAVStreamTransportClusterMetadataOptionsStruct new]; + self.transportOptions.metadataOptions.multiplexing = [NSNumber numberWithUnsignedChar:chip::to_underlying(decodableStruct.transportOptions.metadataOptions.Value().Value().multiplexing)]; + self.transportOptions.metadataOptions.includeMotionZones = [NSNumber numberWithBool:decodableStruct.transportOptions.metadataOptions.Value().Value().includeMotionZones]; + self.transportOptions.metadataOptions.enableMetadataPrivacySensitive = [NSNumber numberWithBool:decodableStruct.transportOptions.metadataOptions.Value().Value().enableMetadataPrivacySensitive]; } } else { - self.streamTransportOptions.metadataOptions = nil; + self.transportOptions.metadataOptions = nil; } - if (decodableStruct.streamTransportOptions.expiryTime.HasValue()) { - if (decodableStruct.streamTransportOptions.expiryTime.Value().IsNull()) { - self.streamTransportOptions.expiryTime = nil; + if (decodableStruct.transportOptions.expiryTime.HasValue()) { + if (decodableStruct.transportOptions.expiryTime.Value().IsNull()) { + self.transportOptions.expiryTime = nil; } else { - self.streamTransportOptions.expiryTime = [NSNumber numberWithUnsignedInt:decodableStruct.streamTransportOptions.expiryTime.Value().Value()]; + self.transportOptions.expiryTime = [NSNumber numberWithUnsignedInt:decodableStruct.transportOptions.expiryTime.Value().Value()]; } } else { - self.streamTransportOptions.expiryTime = nil; + self.transportOptions.expiryTime = nil; } } { @@ -34819,7 +34802,7 @@ - (instancetype)init _connectionID = @(0); - _streamTransportOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct new]; + _transportOptions = [MTRPushAVStreamTransportClusterTransportOptionsStruct new]; _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -34831,7 +34814,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRPushAVStreamTransportClusterModifyPushTransportParams alloc] init]; other.connectionID = self.connectionID; - other.streamTransportOptions = self.streamTransportOptions; + other.transportOptions = self.transportOptions; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -34840,7 +34823,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; streamTransportOptions:%@; >", NSStringFromClass([self class]), _connectionID, _streamTransportOptions]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; transportOptions:%@; >", NSStringFromClass([self class]), _connectionID, _transportOptions]; return descriptionString; } @@ -34856,128 +34839,117 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader encodableStruct.connectionID = self.connectionID.unsignedShortValue; } { - encodableStruct.streamTransportOptions.streamType = static_cast>(self.streamTransportOptions.streamType.unsignedCharValue); - if (self.streamTransportOptions.videoStreamID != nil) { - auto & definedValue_1 = encodableStruct.streamTransportOptions.videoStreamID.Emplace(); - if (self.streamTransportOptions.videoStreamID == nil) { - definedValue_1.SetNull(); - } else { - auto & nonNullValue_2 = definedValue_1.SetNonNull(); - nonNullValue_2 = self.streamTransportOptions.videoStreamID.unsignedShortValue; - } + encodableStruct.transportOptions.streamType = static_cast>(self.transportOptions.streamType.unsignedCharValue); + if (self.transportOptions.videoStreamID != nil) { + auto & definedValue_1 = encodableStruct.transportOptions.videoStreamID.Emplace(); + definedValue_1 = self.transportOptions.videoStreamID.unsignedShortValue; } - if (self.streamTransportOptions.audioStreamID != nil) { - auto & definedValue_1 = encodableStruct.streamTransportOptions.audioStreamID.Emplace(); - if (self.streamTransportOptions.audioStreamID == nil) { - definedValue_1.SetNull(); - } else { - auto & nonNullValue_2 = definedValue_1.SetNonNull(); - nonNullValue_2 = self.streamTransportOptions.audioStreamID.unsignedShortValue; - } + if (self.transportOptions.audioStreamID != nil) { + auto & definedValue_1 = encodableStruct.transportOptions.audioStreamID.Emplace(); + definedValue_1 = self.transportOptions.audioStreamID.unsignedShortValue; } - encodableStruct.streamTransportOptions.TLSEndpointID = self.streamTransportOptions.tlsEndpointID.unsignedShortValue; - encodableStruct.streamTransportOptions.url = AsCharSpan(self.streamTransportOptions.url); - encodableStruct.streamTransportOptions.triggerOptions.triggerType = static_cast>(self.streamTransportOptions.triggerOptions.triggerType.unsignedCharValue); - if (self.streamTransportOptions.triggerOptions.motionZones != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.triggerOptions.motionZones.Emplace(); - if (self.streamTransportOptions.triggerOptions.motionZones == nil) { + encodableStruct.transportOptions.endpointID = self.transportOptions.endpointID.unsignedShortValue; + encodableStruct.transportOptions.url = AsCharSpan(self.transportOptions.url); + encodableStruct.transportOptions.triggerOptions.triggerType = static_cast>(self.transportOptions.triggerOptions.triggerType.unsignedCharValue); + if (self.transportOptions.triggerOptions.motionZones != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.triggerOptions.motionZones.Emplace(); + if (self.transportOptions.triggerOptions.motionZones == nil) { definedValue_2.SetNull(); } else { auto & nonNullValue_3 = definedValue_2.SetNonNull(); { using ListType_4 = std::remove_reference_t; using ListMemberType_4 = ListMemberTypeGetter::Type; - if (self.streamTransportOptions.triggerOptions.motionZones.count != 0) { - auto * listHolder_4 = new ListHolder(self.streamTransportOptions.triggerOptions.motionZones.count); + if (self.transportOptions.triggerOptions.motionZones.count != 0) { + auto * listHolder_4 = new ListHolder(self.transportOptions.triggerOptions.motionZones.count); if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) { return CHIP_ERROR_INVALID_ARGUMENT; } listFreer.add(listHolder_4); - for (size_t i_4 = 0; i_4 < self.streamTransportOptions.triggerOptions.motionZones.count; ++i_4) { - auto element_4 = MTR_SAFE_CAST(self.streamTransportOptions.triggerOptions.motionZones[i_4], NSNumber); + for (size_t i_4 = 0; i_4 < self.transportOptions.triggerOptions.motionZones.count; ++i_4) { + auto element_4 = MTR_SAFE_CAST(self.transportOptions.triggerOptions.motionZones[i_4], MTRPushAVStreamTransportClusterTransportZoneOptionsStruct); if (!element_4) { // Wrong kind of value. - MTR_LOG_ERROR("%@ incorrectly present in list of %@", self.streamTransportOptions.triggerOptions.motionZones[i_4], NSStringFromClass(NSNumber.class)); + MTR_LOG_ERROR("%@ incorrectly present in list of %@", self.transportOptions.triggerOptions.motionZones[i_4], NSStringFromClass(MTRPushAVStreamTransportClusterTransportZoneOptionsStruct.class)); return CHIP_ERROR_INVALID_ARGUMENT; } - listHolder_4->mList[i_4] = element_4.unsignedShortValue; + if (element_4.zone == nil) { + listHolder_4->mList[i_4].zone.SetNull(); + } else { + auto & nonNullValue_6 = listHolder_4->mList[i_4].zone.SetNonNull(); + nonNullValue_6 = element_4.zone.unsignedShortValue; + } + if (element_4.sensitivity != nil) { + auto & definedValue_6 = listHolder_4->mList[i_4].sensitivity.Emplace(); + definedValue_6 = element_4.sensitivity.unsignedCharValue; + } } - nonNullValue_3 = ListType_4(listHolder_4->mList, self.streamTransportOptions.triggerOptions.motionZones.count); + nonNullValue_3 = ListType_4(listHolder_4->mList, self.transportOptions.triggerOptions.motionZones.count); } else { nonNullValue_3 = ListType_4(); } } } } - if (self.streamTransportOptions.triggerOptions.motionSensitivity != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.triggerOptions.motionSensitivity.Emplace(); - if (self.streamTransportOptions.triggerOptions.motionSensitivity == nil) { - definedValue_2.SetNull(); - } else { - auto & nonNullValue_3 = definedValue_2.SetNonNull(); - nonNullValue_3 = self.streamTransportOptions.triggerOptions.motionSensitivity.unsignedCharValue; - } - } - if (self.streamTransportOptions.triggerOptions.motionTimeControl != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.triggerOptions.motionTimeControl.Emplace(); - if (self.streamTransportOptions.triggerOptions.motionTimeControl == nil) { - definedValue_2.SetNull(); - } else { - auto & nonNullValue_3 = definedValue_2.SetNonNull(); - nonNullValue_3.initialDuration = self.streamTransportOptions.triggerOptions.motionTimeControl.initialDuration.unsignedShortValue; - nonNullValue_3.augmentationDuration = self.streamTransportOptions.triggerOptions.motionTimeControl.augmentationDuration.unsignedShortValue; - nonNullValue_3.maxDuration = self.streamTransportOptions.triggerOptions.motionTimeControl.maxDuration.unsignedIntValue; - nonNullValue_3.blindDuration = self.streamTransportOptions.triggerOptions.motionTimeControl.blindDuration.unsignedShortValue; - } - } - if (self.streamTransportOptions.triggerOptions.activationReason != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.triggerOptions.activationReason.Emplace(); - if (self.streamTransportOptions.triggerOptions.activationReason == nil) { + if (self.transportOptions.triggerOptions.motionSensitivity != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.triggerOptions.motionSensitivity.Emplace(); + if (self.transportOptions.triggerOptions.motionSensitivity == nil) { definedValue_2.SetNull(); } else { auto & nonNullValue_3 = definedValue_2.SetNonNull(); - nonNullValue_3 = static_cast>(self.streamTransportOptions.triggerOptions.activationReason.unsignedCharValue); - } - } - encodableStruct.streamTransportOptions.containerFormat = static_cast>(self.streamTransportOptions.containerFormat.unsignedCharValue); - encodableStruct.streamTransportOptions.ingestMethod = static_cast>(self.streamTransportOptions.ingestMethod.unsignedCharValue); - encodableStruct.streamTransportOptions.containerOptions.containerType = static_cast>(self.streamTransportOptions.containerOptions.containerType.unsignedCharValue); - if (self.streamTransportOptions.containerOptions.cmafContainerOptions != nil) { - auto & definedValue_2 = encodableStruct.streamTransportOptions.containerOptions.CMAFContainerOptions.Emplace(); - if (self.streamTransportOptions.containerOptions.cmafContainerOptions == nil) { + nonNullValue_3 = self.transportOptions.triggerOptions.motionSensitivity.unsignedCharValue; + } + } + if (self.transportOptions.triggerOptions.motionTimeControl != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.triggerOptions.motionTimeControl.Emplace(); + definedValue_2.initialDuration = self.transportOptions.triggerOptions.motionTimeControl.initialDuration.unsignedShortValue; + definedValue_2.augmentationDuration = self.transportOptions.triggerOptions.motionTimeControl.augmentationDuration.unsignedShortValue; + definedValue_2.maxDuration = self.transportOptions.triggerOptions.motionTimeControl.maxDuration.unsignedIntValue; + definedValue_2.blindDuration = self.transportOptions.triggerOptions.motionTimeControl.blindDuration.unsignedShortValue; + } + if (self.transportOptions.triggerOptions.maxPreRollLen != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.triggerOptions.maxPreRollLen.Emplace(); + definedValue_2 = self.transportOptions.triggerOptions.maxPreRollLen.unsignedShortValue; + } + encodableStruct.transportOptions.ingestMethod = static_cast>(self.transportOptions.ingestMethod.unsignedCharValue); + encodableStruct.transportOptions.containerFormat = static_cast>(self.transportOptions.containerFormat.unsignedCharValue); + encodableStruct.transportOptions.containerOptions.containerType = static_cast>(self.transportOptions.containerOptions.containerType.unsignedCharValue); + if (self.transportOptions.containerOptions.cmafContainerOptions != nil) { + auto & definedValue_2 = encodableStruct.transportOptions.containerOptions.CMAFContainerOptions.Emplace(); + if (self.transportOptions.containerOptions.cmafContainerOptions == nil) { definedValue_2.SetNull(); } else { auto & nonNullValue_3 = definedValue_2.SetNonNull(); - nonNullValue_3.chunkDuration = self.streamTransportOptions.containerOptions.cmafContainerOptions.chunkDuration.unsignedShortValue; - if (self.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey != nil) { + nonNullValue_3.chunkDuration = self.transportOptions.containerOptions.cmafContainerOptions.chunkDuration.unsignedShortValue; + if (self.transportOptions.containerOptions.cmafContainerOptions.cencKey != nil) { auto & definedValue_5 = nonNullValue_3.CENCKey.Emplace(); - if (self.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey == nil) { + if (self.transportOptions.containerOptions.cmafContainerOptions.cencKey == nil) { definedValue_5.SetNull(); } else { auto & nonNullValue_6 = definedValue_5.SetNonNull(); - nonNullValue_6 = AsByteSpan(self.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey); + nonNullValue_6 = AsByteSpan(self.transportOptions.containerOptions.cmafContainerOptions.cencKey); } } } } - if (self.streamTransportOptions.metadataOptions != nil) { - auto & definedValue_1 = encodableStruct.streamTransportOptions.metadataOptions.Emplace(); - if (self.streamTransportOptions.metadataOptions == nil) { + if (self.transportOptions.metadataOptions != nil) { + auto & definedValue_1 = encodableStruct.transportOptions.metadataOptions.Emplace(); + if (self.transportOptions.metadataOptions == nil) { definedValue_1.SetNull(); } else { auto & nonNullValue_2 = definedValue_1.SetNonNull(); - nonNullValue_2.multiplexing = static_cast>(self.streamTransportOptions.metadataOptions.multiplexing.unsignedCharValue); - nonNullValue_2.includeMotionZones = self.streamTransportOptions.metadataOptions.includeMotionZones.boolValue; - nonNullValue_2.enableMetadataPrivacySensitive = self.streamTransportOptions.metadataOptions.enableMetadataPrivacySensitive.boolValue; + nonNullValue_2.multiplexing = static_cast>(self.transportOptions.metadataOptions.multiplexing.unsignedCharValue); + nonNullValue_2.includeMotionZones = self.transportOptions.metadataOptions.includeMotionZones.boolValue; + nonNullValue_2.enableMetadataPrivacySensitive = self.transportOptions.metadataOptions.enableMetadataPrivacySensitive.boolValue; } } - if (self.streamTransportOptions.expiryTime != nil) { - auto & definedValue_1 = encodableStruct.streamTransportOptions.expiryTime.Emplace(); - if (self.streamTransportOptions.expiryTime == nil) { + if (self.transportOptions.expiryTime != nil) { + auto & definedValue_1 = encodableStruct.transportOptions.expiryTime.Emplace(); + if (self.transportOptions.expiryTime == nil) { definedValue_1.SetNull(); } else { auto & nonNullValue_2 = definedValue_1.SetNonNull(); - nonNullValue_2 = self.streamTransportOptions.expiryTime.unsignedIntValue; + nonNullValue_2 = self.transportOptions.expiryTime.unsignedIntValue; } } } @@ -35027,7 +34999,7 @@ - (instancetype)init _connectionID = nil; - _streamTransportStatus = @(0); + _transportStatus = @(0); _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -35039,7 +35011,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRPushAVStreamTransportClusterSetTransportStatusParams alloc] init]; other.connectionID = self.connectionID; - other.streamTransportStatus = self.streamTransportStatus; + other.transportStatus = self.transportStatus; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -35048,7 +35020,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; streamTransportStatus:%@; >", NSStringFromClass([self class]), _connectionID, _streamTransportStatus]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; transportStatus:%@; >", NSStringFromClass([self class]), _connectionID, _transportStatus]; return descriptionString; } @@ -35069,7 +35041,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } } { - encodableStruct.streamTransportStatus = static_cast>(self.streamTransportStatus.unsignedCharValue); + encodableStruct.transportStatus = static_cast>(self.transportStatus.unsignedCharValue); } auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); @@ -35217,7 +35189,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end -@implementation MTRPushAVStreamTransportClusterFindStreamConfigurationParams +@implementation MTRPushAVStreamTransportClusterFindTransportParams - (instancetype)init { if (self = [super init]) { @@ -35231,7 +35203,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRPushAVStreamTransportClusterFindStreamConfigurationParams alloc] init]; + auto other = [[MTRPushAVStreamTransportClusterFindTransportParams alloc] init]; other.connectionID = self.connectionID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -35248,11 +35220,11 @@ - (NSString *)description @end -@implementation MTRPushAVStreamTransportClusterFindStreamConfigurationParams (InternalMethods) +@implementation MTRPushAVStreamTransportClusterFindTransportParams (InternalMethods) - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader { - chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfiguration::Type encodableStruct; + chip::app::Clusters::PushAvStreamTransport::Commands::FindTransport::Type encodableStruct; ListFreer listFreer; { if (self.connectionID != nil) { @@ -35304,7 +35276,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end -@implementation MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams +@implementation MTRPushAVStreamTransportClusterFindTransportResponseParams - (instancetype)init { if (self = [super init]) { @@ -35316,7 +35288,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams alloc] init]; + auto other = [[MTRPushAVStreamTransportClusterFindTransportResponseParams alloc] init]; other.streamConfigurations = self.streamConfigurations; @@ -35336,7 +35308,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary *)r return nil; } - using DecodableType = chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfigurationResponse::DecodableType; + using DecodableType = chip::app::Clusters::PushAvStreamTransport::Commands::FindTransportResponse::DecodableType; chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue clusterID:DecodableType::GetClusterId() commandID:DecodableType::GetCommandId() @@ -35371,9 +35343,9 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary *)r @end -@implementation MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams (InternalMethods) +@implementation MTRPushAVStreamTransportClusterFindTransportResponseParams (InternalMethods) -- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfigurationResponse::DecodableType &)decodableStruct +- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::PushAvStreamTransport::Commands::FindTransportResponse::DecodableType &)decodableStruct { { { // Scope for our temporary variables @@ -35381,135 +35353,129 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::PushAvSt auto iter_0 = decodableStruct.streamConfigurations.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRPushAVStreamTransportClusterPushAVStreamConfigurationStruct * newElement_0; - newElement_0 = [MTRPushAVStreamTransportClusterPushAVStreamConfigurationStruct new]; + MTRPushAVStreamTransportClusterTransportConfigurationStruct * newElement_0; + newElement_0 = [MTRPushAVStreamTransportClusterTransportConfigurationStruct new]; newElement_0.connectionID = [NSNumber numberWithUnsignedShort:entry_0.connectionID]; - newElement_0.streamTransportStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.streamTransportStatus)]; - newElement_0.streamTransportOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct new]; - newElement_0.streamTransportOptions.streamType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.streamTransportOptions.streamType)]; - if (entry_0.streamTransportOptions.videoStreamID.HasValue()) { - if (entry_0.streamTransportOptions.videoStreamID.Value().IsNull()) { - newElement_0.streamTransportOptions.videoStreamID = nil; - } else { - newElement_0.streamTransportOptions.videoStreamID = [NSNumber numberWithUnsignedShort:entry_0.streamTransportOptions.videoStreamID.Value().Value()]; - } + newElement_0.transportStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.transportStatus)]; + newElement_0.transportOptions = [MTRPushAVStreamTransportClusterTransportOptionsStruct new]; + newElement_0.transportOptions.streamType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.transportOptions.streamType)]; + if (entry_0.transportOptions.videoStreamID.HasValue()) { + newElement_0.transportOptions.videoStreamID = [NSNumber numberWithUnsignedShort:entry_0.transportOptions.videoStreamID.Value()]; } else { - newElement_0.streamTransportOptions.videoStreamID = nil; + newElement_0.transportOptions.videoStreamID = nil; } - if (entry_0.streamTransportOptions.audioStreamID.HasValue()) { - if (entry_0.streamTransportOptions.audioStreamID.Value().IsNull()) { - newElement_0.streamTransportOptions.audioStreamID = nil; - } else { - newElement_0.streamTransportOptions.audioStreamID = [NSNumber numberWithUnsignedShort:entry_0.streamTransportOptions.audioStreamID.Value().Value()]; - } + if (entry_0.transportOptions.audioStreamID.HasValue()) { + newElement_0.transportOptions.audioStreamID = [NSNumber numberWithUnsignedShort:entry_0.transportOptions.audioStreamID.Value()]; } else { - newElement_0.streamTransportOptions.audioStreamID = nil; + newElement_0.transportOptions.audioStreamID = nil; } - newElement_0.streamTransportOptions.tlsEndpointID = [NSNumber numberWithUnsignedShort:entry_0.streamTransportOptions.TLSEndpointID]; - newElement_0.streamTransportOptions.url = AsString(entry_0.streamTransportOptions.url); - if (newElement_0.streamTransportOptions.url == nil) { + newElement_0.transportOptions.endpointID = [NSNumber numberWithUnsignedShort:entry_0.transportOptions.endpointID]; + newElement_0.transportOptions.url = AsString(entry_0.transportOptions.url); + if (newElement_0.transportOptions.url == nil) { CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT; return err; } - newElement_0.streamTransportOptions.triggerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct new]; - newElement_0.streamTransportOptions.triggerOptions.triggerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.streamTransportOptions.triggerOptions.triggerType)]; - if (entry_0.streamTransportOptions.triggerOptions.motionZones.HasValue()) { - if (entry_0.streamTransportOptions.triggerOptions.motionZones.Value().IsNull()) { - newElement_0.streamTransportOptions.triggerOptions.motionZones = nil; + newElement_0.transportOptions.triggerOptions = [MTRPushAVStreamTransportClusterTransportTriggerOptionsStruct new]; + newElement_0.transportOptions.triggerOptions.triggerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.transportOptions.triggerOptions.triggerType)]; + if (entry_0.transportOptions.triggerOptions.motionZones.HasValue()) { + if (entry_0.transportOptions.triggerOptions.motionZones.Value().IsNull()) { + newElement_0.transportOptions.triggerOptions.motionZones = nil; } else { { // Scope for our temporary variables auto * array_6 = [NSMutableArray new]; - auto iter_6 = entry_0.streamTransportOptions.triggerOptions.motionZones.Value().Value().begin(); + auto iter_6 = entry_0.transportOptions.triggerOptions.motionZones.Value().Value().begin(); while (iter_6.Next()) { auto & entry_6 = iter_6.GetValue(); - NSNumber * newElement_6; - newElement_6 = [NSNumber numberWithUnsignedShort:entry_6]; + MTRPushAVStreamTransportClusterTransportZoneOptionsStruct * newElement_6; + newElement_6 = [MTRPushAVStreamTransportClusterTransportZoneOptionsStruct new]; + if (entry_6.zone.IsNull()) { + newElement_6.zone = nil; + } else { + newElement_6.zone = [NSNumber numberWithUnsignedShort:entry_6.zone.Value()]; + } + if (entry_6.sensitivity.HasValue()) { + newElement_6.sensitivity = [NSNumber numberWithUnsignedChar:entry_6.sensitivity.Value()]; + } else { + newElement_6.sensitivity = nil; + } [array_6 addObject:newElement_6]; } CHIP_ERROR err = iter_6.GetStatus(); if (err != CHIP_NO_ERROR) { return err; } - newElement_0.streamTransportOptions.triggerOptions.motionZones = array_6; + newElement_0.transportOptions.triggerOptions.motionZones = array_6; } } } else { - newElement_0.streamTransportOptions.triggerOptions.motionZones = nil; + newElement_0.transportOptions.triggerOptions.motionZones = nil; } - if (entry_0.streamTransportOptions.triggerOptions.motionSensitivity.HasValue()) { - if (entry_0.streamTransportOptions.triggerOptions.motionSensitivity.Value().IsNull()) { - newElement_0.streamTransportOptions.triggerOptions.motionSensitivity = nil; + if (entry_0.transportOptions.triggerOptions.motionSensitivity.HasValue()) { + if (entry_0.transportOptions.triggerOptions.motionSensitivity.Value().IsNull()) { + newElement_0.transportOptions.triggerOptions.motionSensitivity = nil; } else { - newElement_0.streamTransportOptions.triggerOptions.motionSensitivity = [NSNumber numberWithUnsignedChar:entry_0.streamTransportOptions.triggerOptions.motionSensitivity.Value().Value()]; + newElement_0.transportOptions.triggerOptions.motionSensitivity = [NSNumber numberWithUnsignedChar:entry_0.transportOptions.triggerOptions.motionSensitivity.Value().Value()]; } } else { - newElement_0.streamTransportOptions.triggerOptions.motionSensitivity = nil; + newElement_0.transportOptions.triggerOptions.motionSensitivity = nil; } - if (entry_0.streamTransportOptions.triggerOptions.motionTimeControl.HasValue()) { - if (entry_0.streamTransportOptions.triggerOptions.motionTimeControl.Value().IsNull()) { - newElement_0.streamTransportOptions.triggerOptions.motionTimeControl = nil; - } else { - newElement_0.streamTransportOptions.triggerOptions.motionTimeControl = [MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct new]; - newElement_0.streamTransportOptions.triggerOptions.motionTimeControl.initialDuration = [NSNumber numberWithUnsignedShort:entry_0.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().initialDuration]; - newElement_0.streamTransportOptions.triggerOptions.motionTimeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:entry_0.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().augmentationDuration]; - newElement_0.streamTransportOptions.triggerOptions.motionTimeControl.maxDuration = [NSNumber numberWithUnsignedInt:entry_0.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().maxDuration]; - newElement_0.streamTransportOptions.triggerOptions.motionTimeControl.blindDuration = [NSNumber numberWithUnsignedShort:entry_0.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().blindDuration]; - } + if (entry_0.transportOptions.triggerOptions.motionTimeControl.HasValue()) { + newElement_0.transportOptions.triggerOptions.motionTimeControl = [MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct new]; + newElement_0.transportOptions.triggerOptions.motionTimeControl.initialDuration = [NSNumber numberWithUnsignedShort:entry_0.transportOptions.triggerOptions.motionTimeControl.Value().initialDuration]; + newElement_0.transportOptions.triggerOptions.motionTimeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:entry_0.transportOptions.triggerOptions.motionTimeControl.Value().augmentationDuration]; + newElement_0.transportOptions.triggerOptions.motionTimeControl.maxDuration = [NSNumber numberWithUnsignedInt:entry_0.transportOptions.triggerOptions.motionTimeControl.Value().maxDuration]; + newElement_0.transportOptions.triggerOptions.motionTimeControl.blindDuration = [NSNumber numberWithUnsignedShort:entry_0.transportOptions.triggerOptions.motionTimeControl.Value().blindDuration]; } else { - newElement_0.streamTransportOptions.triggerOptions.motionTimeControl = nil; + newElement_0.transportOptions.triggerOptions.motionTimeControl = nil; } - if (entry_0.streamTransportOptions.triggerOptions.activationReason.HasValue()) { - if (entry_0.streamTransportOptions.triggerOptions.activationReason.Value().IsNull()) { - newElement_0.streamTransportOptions.triggerOptions.activationReason = nil; - } else { - newElement_0.streamTransportOptions.triggerOptions.activationReason = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.streamTransportOptions.triggerOptions.activationReason.Value().Value())]; - } + if (entry_0.transportOptions.triggerOptions.maxPreRollLen.HasValue()) { + newElement_0.transportOptions.triggerOptions.maxPreRollLen = [NSNumber numberWithUnsignedShort:entry_0.transportOptions.triggerOptions.maxPreRollLen.Value()]; } else { - newElement_0.streamTransportOptions.triggerOptions.activationReason = nil; + newElement_0.transportOptions.triggerOptions.maxPreRollLen = nil; } - newElement_0.streamTransportOptions.containerFormat = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.streamTransportOptions.containerFormat)]; - newElement_0.streamTransportOptions.ingestMethod = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.streamTransportOptions.ingestMethod)]; - newElement_0.streamTransportOptions.containerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportContainerOptionsStruct new]; - newElement_0.streamTransportOptions.containerOptions.containerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.streamTransportOptions.containerOptions.containerType)]; - if (entry_0.streamTransportOptions.containerOptions.CMAFContainerOptions.HasValue()) { - if (entry_0.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().IsNull()) { - newElement_0.streamTransportOptions.containerOptions.cmafContainerOptions = nil; + newElement_0.transportOptions.ingestMethod = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.transportOptions.ingestMethod)]; + newElement_0.transportOptions.containerFormat = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.transportOptions.containerFormat)]; + newElement_0.transportOptions.containerOptions = [MTRPushAVStreamTransportClusterContainerOptionsStruct new]; + newElement_0.transportOptions.containerOptions.containerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.transportOptions.containerOptions.containerType)]; + if (entry_0.transportOptions.containerOptions.CMAFContainerOptions.HasValue()) { + if (entry_0.transportOptions.containerOptions.CMAFContainerOptions.Value().IsNull()) { + newElement_0.transportOptions.containerOptions.cmafContainerOptions = nil; } else { - newElement_0.streamTransportOptions.containerOptions.cmafContainerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct new]; - newElement_0.streamTransportOptions.containerOptions.cmafContainerOptions.chunkDuration = [NSNumber numberWithUnsignedShort:entry_0.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().chunkDuration]; - if (entry_0.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.HasValue()) { - if (entry_0.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().IsNull()) { - newElement_0.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = nil; + newElement_0.transportOptions.containerOptions.cmafContainerOptions = [MTRPushAVStreamTransportClusterCMAFContainerOptionsStruct new]; + newElement_0.transportOptions.containerOptions.cmafContainerOptions.chunkDuration = [NSNumber numberWithUnsignedShort:entry_0.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().chunkDuration]; + if (entry_0.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.HasValue()) { + if (entry_0.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().IsNull()) { + newElement_0.transportOptions.containerOptions.cmafContainerOptions.cencKey = nil; } else { - newElement_0.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = AsData(entry_0.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value()); + newElement_0.transportOptions.containerOptions.cmafContainerOptions.cencKey = AsData(entry_0.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value()); } } else { - newElement_0.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = nil; + newElement_0.transportOptions.containerOptions.cmafContainerOptions.cencKey = nil; } } } else { - newElement_0.streamTransportOptions.containerOptions.cmafContainerOptions = nil; + newElement_0.transportOptions.containerOptions.cmafContainerOptions = nil; } - if (entry_0.streamTransportOptions.metadataOptions.HasValue()) { - if (entry_0.streamTransportOptions.metadataOptions.Value().IsNull()) { - newElement_0.streamTransportOptions.metadataOptions = nil; + if (entry_0.transportOptions.metadataOptions.HasValue()) { + if (entry_0.transportOptions.metadataOptions.Value().IsNull()) { + newElement_0.transportOptions.metadataOptions = nil; } else { - newElement_0.streamTransportOptions.metadataOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct new]; - newElement_0.streamTransportOptions.metadataOptions.multiplexing = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.streamTransportOptions.metadataOptions.Value().Value().multiplexing)]; - newElement_0.streamTransportOptions.metadataOptions.includeMotionZones = [NSNumber numberWithBool:entry_0.streamTransportOptions.metadataOptions.Value().Value().includeMotionZones]; - newElement_0.streamTransportOptions.metadataOptions.enableMetadataPrivacySensitive = [NSNumber numberWithBool:entry_0.streamTransportOptions.metadataOptions.Value().Value().enableMetadataPrivacySensitive]; + newElement_0.transportOptions.metadataOptions = [MTRPushAVStreamTransportClusterMetadataOptionsStruct new]; + newElement_0.transportOptions.metadataOptions.multiplexing = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.transportOptions.metadataOptions.Value().Value().multiplexing)]; + newElement_0.transportOptions.metadataOptions.includeMotionZones = [NSNumber numberWithBool:entry_0.transportOptions.metadataOptions.Value().Value().includeMotionZones]; + newElement_0.transportOptions.metadataOptions.enableMetadataPrivacySensitive = [NSNumber numberWithBool:entry_0.transportOptions.metadataOptions.Value().Value().enableMetadataPrivacySensitive]; } } else { - newElement_0.streamTransportOptions.metadataOptions = nil; + newElement_0.transportOptions.metadataOptions = nil; } - if (entry_0.streamTransportOptions.expiryTime.HasValue()) { - if (entry_0.streamTransportOptions.expiryTime.Value().IsNull()) { - newElement_0.streamTransportOptions.expiryTime = nil; + if (entry_0.transportOptions.expiryTime.HasValue()) { + if (entry_0.transportOptions.expiryTime.Value().IsNull()) { + newElement_0.transportOptions.expiryTime = nil; } else { - newElement_0.streamTransportOptions.expiryTime = [NSNumber numberWithUnsignedInt:entry_0.streamTransportOptions.expiryTime.Value().Value()]; + newElement_0.transportOptions.expiryTime = [NSNumber numberWithUnsignedInt:entry_0.transportOptions.expiryTime.Value().Value()]; } } else { - newElement_0.streamTransportOptions.expiryTime = nil; + newElement_0.transportOptions.expiryTime = nil; } [array_0 addObject:newElement_0]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h index 1b23f1064aa66f..60bb6ecd43e141 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h @@ -2236,15 +2236,15 @@ NS_ASSUME_NONNULL_BEGIN @end -@interface MTRPushAVStreamTransportClusterFindStreamConfigurationParams (InternalMethods) +@interface MTRPushAVStreamTransportClusterFindTransportParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; @end -@interface MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams (InternalMethods) +@interface MTRPushAVStreamTransportClusterFindTransportResponseParams (InternalMethods) -- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfigurationResponse::DecodableType &)decodableStruct; +- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::PushAvStreamTransport::Commands::FindTransportResponse::DecodableType &)decodableStruct; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm index 991e87d33a4bc9..1059c5ccd94774 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm @@ -4935,6 +4935,26 @@ static id _Nullable DecodeEventPayloadForPushAVStreamTransportCluster(EventId aE __auto_type * value = [MTRPushAVStreamTransportClusterPushTransportBeginEvent new]; + do { + NSNumber * _Nonnull memberValue; + memberValue = [NSNumber numberWithUnsignedShort:cppValue.connectionID]; + value.connectionID = memberValue; + } while (0); + do { + NSNumber * _Nonnull memberValue; + memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.triggerType)]; + value.triggerType = memberValue; + } while (0); + do { + NSNumber * _Nullable memberValue; + if (cppValue.activationReason.HasValue()) { + memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.activationReason.Value())]; + } else { + memberValue = nil; + } + value.activationReason = memberValue; + } while (0); + return value; } case Events::PushTransportEnd::Id: { @@ -4952,65 +4972,18 @@ static id _Nullable DecodeEventPayloadForPushAVStreamTransportCluster(EventId aE value.connectionID = memberValue; } while (0); do { - MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct * _Nonnull memberValue; - memberValue = [MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct new]; - memberValue.triggerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.triggerDetails.triggerType)]; - if (cppValue.triggerDetails.motionZones.HasValue()) { - if (cppValue.triggerDetails.motionZones.Value().IsNull()) { - memberValue.motionZones = nil; - } else { - { // Scope for our temporary variables - auto * array_3 = [NSMutableArray new]; - auto iter_3 = cppValue.triggerDetails.motionZones.Value().Value().begin(); - while (iter_3.Next()) { - auto & entry_3 = iter_3.GetValue(); - NSNumber * newElement_3; - newElement_3 = [NSNumber numberWithUnsignedShort:entry_3]; - [array_3 addObject:newElement_3]; - } - CHIP_ERROR err = iter_3.GetStatus(); - if (err != CHIP_NO_ERROR) { - *aError = err; - return nil; - } - memberValue.motionZones = array_3; - } - } - } else { - memberValue.motionZones = nil; - } - if (cppValue.triggerDetails.motionSensitivity.HasValue()) { - if (cppValue.triggerDetails.motionSensitivity.Value().IsNull()) { - memberValue.motionSensitivity = nil; - } else { - memberValue.motionSensitivity = [NSNumber numberWithUnsignedChar:cppValue.triggerDetails.motionSensitivity.Value().Value()]; - } - } else { - memberValue.motionSensitivity = nil; - } - if (cppValue.triggerDetails.motionTimeControl.HasValue()) { - if (cppValue.triggerDetails.motionTimeControl.Value().IsNull()) { - memberValue.motionTimeControl = nil; - } else { - memberValue.motionTimeControl = [MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct new]; - memberValue.motionTimeControl.initialDuration = [NSNumber numberWithUnsignedShort:cppValue.triggerDetails.motionTimeControl.Value().Value().initialDuration]; - memberValue.motionTimeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:cppValue.triggerDetails.motionTimeControl.Value().Value().augmentationDuration]; - memberValue.motionTimeControl.maxDuration = [NSNumber numberWithUnsignedInt:cppValue.triggerDetails.motionTimeControl.Value().Value().maxDuration]; - memberValue.motionTimeControl.blindDuration = [NSNumber numberWithUnsignedShort:cppValue.triggerDetails.motionTimeControl.Value().Value().blindDuration]; - } - } else { - memberValue.motionTimeControl = nil; - } - if (cppValue.triggerDetails.activationReason.HasValue()) { - if (cppValue.triggerDetails.activationReason.Value().IsNull()) { - memberValue.activationReason = nil; - } else { - memberValue.activationReason = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.triggerDetails.activationReason.Value().Value())]; - } + NSNumber * _Nonnull memberValue; + memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.triggerType)]; + value.triggerType = memberValue; + } while (0); + do { + NSNumber * _Nullable memberValue; + if (cppValue.activationReason.HasValue()) { + memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.activationReason.Value())]; } else { - memberValue.activationReason = nil; + memberValue = nil; } - value.triggerDetails = memberValue; + value.activationReason = memberValue; } while (0); return value; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 32106bc0bbccc0..e61f51885527e6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -2322,7 +2322,7 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct : NSObject +@interface MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull initialDuration MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull augmentationDuration MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull maxDuration MTR_PROVISIONALLY_AVAILABLE; @@ -2330,63 +2330,73 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRPushAVStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct : NSObject +@interface MTRPushAVStreamTransportClusterTransportZoneOptionsStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nullable zone MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable sensitivity MTR_PROVISIONALLY_AVAILABLE; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRPushAVStreamTransportClusterMetadataOptionsStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull multiplexing MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull includeMotionZones MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull enableMetadataPrivacySensitive MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct : NSObject +@interface MTRPushAVStreamTransportClusterTransportTriggerOptionsStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull triggerType MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSArray * _Nullable motionZones MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nullable motionSensitivity MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct * _Nullable motionTimeControl MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nullable activationReason MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct * _Nullable motionTimeControl MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable maxPreRollLen MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRPushAVStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct : NSObject +@interface MTRPushAVStreamTransportClusterCMAFContainerOptionsStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull chunkDuration MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSData * _Nullable cencKey MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRPushAVStreamTransportClusterPushAVStreamTransportContainerOptionsStruct : NSObject +@interface MTRPushAVStreamTransportClusterContainerOptionsStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull containerType MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct * _Nullable cmafContainerOptions MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterCMAFContainerOptionsStruct * _Nullable cmafContainerOptions MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct : NSObject +@interface MTRPushAVStreamTransportClusterTransportOptionsStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull streamType MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nullable videoStreamID MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nullable audioStreamID MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull tlsEndpointID MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull endpointID MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSString * _Nonnull url MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct * _Nonnull triggerOptions MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull containerFormat MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterTransportTriggerOptionsStruct * _Nonnull triggerOptions MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull ingestMethod MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportContainerOptionsStruct * _Nonnull containerOptions MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct * _Nullable metadataOptions MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull containerFormat MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterContainerOptionsStruct * _Nonnull containerOptions MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterMetadataOptionsStruct * _Nullable metadataOptions MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nullable expiryTime MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRPushAVStreamTransportClusterPushAVStreamConfigurationStruct : NSObject +@interface MTRPushAVStreamTransportClusterTransportConfigurationStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull connectionID MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull streamTransportStatus MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct * _Nonnull streamTransportOptions MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull transportStatus MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRPushAVStreamTransportClusterTransportOptionsStruct * _Nonnull transportOptions MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE @interface MTRPushAVStreamTransportClusterPushTransportBeginEvent : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull connectionID MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull triggerType MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable activationReason MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE @interface MTRPushAVStreamTransportClusterPushTransportEndEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull connectionID MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct * _Nonnull triggerDetails MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull triggerType MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable activationReason MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 8ba884ff423a27..1aaff2b36441ef 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -9644,7 +9644,7 @@ - (NSString *)description @end -@implementation MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct +@implementation MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct - (instancetype)init { if (self = [super init]) { @@ -9662,7 +9662,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct alloc] init]; + auto other = [[MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct alloc] init]; other.initialDuration = self.initialDuration; other.augmentationDuration = self.augmentationDuration; @@ -9680,7 +9680,37 @@ - (NSString *)description @end -@implementation MTRPushAVStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct +@implementation MTRPushAVStreamTransportClusterTransportZoneOptionsStruct +- (instancetype)init +{ + if (self = [super init]) { + + _zone = nil; + + _sensitivity = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone +{ + auto other = [[MTRPushAVStreamTransportClusterTransportZoneOptionsStruct alloc] init]; + + other.zone = self.zone; + other.sensitivity = self.sensitivity; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: zone:%@; sensitivity:%@; >", NSStringFromClass([self class]), _zone, _sensitivity]; + return descriptionString; +} + +@end + +@implementation MTRPushAVStreamTransportClusterMetadataOptionsStruct - (instancetype)init { if (self = [super init]) { @@ -9696,7 +9726,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRPushAVStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct alloc] init]; + auto other = [[MTRPushAVStreamTransportClusterMetadataOptionsStruct alloc] init]; other.multiplexing = self.multiplexing; other.includeMotionZones = self.includeMotionZones; @@ -9713,7 +9743,7 @@ - (NSString *)description @end -@implementation MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct +@implementation MTRPushAVStreamTransportClusterTransportTriggerOptionsStruct - (instancetype)init { if (self = [super init]) { @@ -9726,33 +9756,33 @@ - (instancetype)init _motionTimeControl = nil; - _activationReason = nil; + _maxPreRollLen = nil; } return self; } - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct alloc] init]; + auto other = [[MTRPushAVStreamTransportClusterTransportTriggerOptionsStruct alloc] init]; other.triggerType = self.triggerType; other.motionZones = self.motionZones; other.motionSensitivity = self.motionSensitivity; other.motionTimeControl = self.motionTimeControl; - other.activationReason = self.activationReason; + other.maxPreRollLen = self.maxPreRollLen; return other; } - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: triggerType:%@; motionZones:%@; motionSensitivity:%@; motionTimeControl:%@; activationReason:%@; >", NSStringFromClass([self class]), _triggerType, _motionZones, _motionSensitivity, _motionTimeControl, _activationReason]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: triggerType:%@; motionZones:%@; motionSensitivity:%@; motionTimeControl:%@; maxPreRollLen:%@; >", NSStringFromClass([self class]), _triggerType, _motionZones, _motionSensitivity, _motionTimeControl, _maxPreRollLen]; return descriptionString; } @end -@implementation MTRPushAVStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct +@implementation MTRPushAVStreamTransportClusterCMAFContainerOptionsStruct - (instancetype)init { if (self = [super init]) { @@ -9766,7 +9796,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRPushAVStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct alloc] init]; + auto other = [[MTRPushAVStreamTransportClusterCMAFContainerOptionsStruct alloc] init]; other.chunkDuration = self.chunkDuration; other.cencKey = self.cencKey; @@ -9782,7 +9812,7 @@ - (NSString *)description @end -@implementation MTRPushAVStreamTransportClusterPushAVStreamTransportContainerOptionsStruct +@implementation MTRPushAVStreamTransportClusterContainerOptionsStruct - (instancetype)init { if (self = [super init]) { @@ -9796,7 +9826,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRPushAVStreamTransportClusterPushAVStreamTransportContainerOptionsStruct alloc] init]; + auto other = [[MTRPushAVStreamTransportClusterContainerOptionsStruct alloc] init]; other.containerType = self.containerType; other.cmafContainerOptions = self.cmafContainerOptions; @@ -9812,7 +9842,7 @@ - (NSString *)description @end -@implementation MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct +@implementation MTRPushAVStreamTransportClusterTransportOptionsStruct - (instancetype)init { if (self = [super init]) { @@ -9823,17 +9853,17 @@ - (instancetype)init _audioStreamID = nil; - _tlsEndpointID = @(0); + _endpointID = @(0); _url = @""; - _triggerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct new]; - - _containerFormat = @(0); + _triggerOptions = [MTRPushAVStreamTransportClusterTransportTriggerOptionsStruct new]; _ingestMethod = @(0); - _containerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportContainerOptionsStruct new]; + _containerFormat = @(0); + + _containerOptions = [MTRPushAVStreamTransportClusterContainerOptionsStruct new]; _metadataOptions = nil; @@ -9844,16 +9874,16 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct alloc] init]; + auto other = [[MTRPushAVStreamTransportClusterTransportOptionsStruct alloc] init]; other.streamType = self.streamType; other.videoStreamID = self.videoStreamID; other.audioStreamID = self.audioStreamID; - other.tlsEndpointID = self.tlsEndpointID; + other.endpointID = self.endpointID; other.url = self.url; other.triggerOptions = self.triggerOptions; - other.containerFormat = self.containerFormat; other.ingestMethod = self.ingestMethod; + other.containerFormat = self.containerFormat; other.containerOptions = self.containerOptions; other.metadataOptions = self.metadataOptions; other.expiryTime = self.expiryTime; @@ -9863,40 +9893,40 @@ - (id)copyWithZone:(NSZone * _Nullable)zone - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: streamType:%@; videoStreamID:%@; audioStreamID:%@; tlsEndpointID:%@; url:%@; triggerOptions:%@; containerFormat:%@; ingestMethod:%@; containerOptions:%@; metadataOptions:%@; expiryTime:%@; >", NSStringFromClass([self class]), _streamType, _videoStreamID, _audioStreamID, _tlsEndpointID, _url, _triggerOptions, _containerFormat, _ingestMethod, _containerOptions, _metadataOptions, _expiryTime]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: streamType:%@; videoStreamID:%@; audioStreamID:%@; endpointID:%@; url:%@; triggerOptions:%@; ingestMethod:%@; containerFormat:%@; containerOptions:%@; metadataOptions:%@; expiryTime:%@; >", NSStringFromClass([self class]), _streamType, _videoStreamID, _audioStreamID, _endpointID, _url, _triggerOptions, _ingestMethod, _containerFormat, _containerOptions, _metadataOptions, _expiryTime]; return descriptionString; } @end -@implementation MTRPushAVStreamTransportClusterPushAVStreamConfigurationStruct +@implementation MTRPushAVStreamTransportClusterTransportConfigurationStruct - (instancetype)init { if (self = [super init]) { _connectionID = @(0); - _streamTransportStatus = @(0); + _transportStatus = @(0); - _streamTransportOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct new]; + _transportOptions = [MTRPushAVStreamTransportClusterTransportOptionsStruct new]; } return self; } - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRPushAVStreamTransportClusterPushAVStreamConfigurationStruct alloc] init]; + auto other = [[MTRPushAVStreamTransportClusterTransportConfigurationStruct alloc] init]; other.connectionID = self.connectionID; - other.streamTransportStatus = self.streamTransportStatus; - other.streamTransportOptions = self.streamTransportOptions; + other.transportStatus = self.transportStatus; + other.transportOptions = self.transportOptions; return other; } - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; streamTransportStatus:%@; streamTransportOptions:%@; >", NSStringFromClass([self class]), _connectionID, _streamTransportStatus, _streamTransportOptions]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; transportStatus:%@; transportOptions:%@; >", NSStringFromClass([self class]), _connectionID, _transportStatus, _transportOptions]; return descriptionString; } @@ -9906,6 +9936,12 @@ @implementation MTRPushAVStreamTransportClusterPushTransportBeginEvent - (instancetype)init { if (self = [super init]) { + + _connectionID = @(0); + + _triggerType = @(0); + + _activationReason = nil; } return self; } @@ -9914,12 +9950,16 @@ - (id)copyWithZone:(NSZone * _Nullable)zone { auto other = [[MTRPushAVStreamTransportClusterPushTransportBeginEvent alloc] init]; + other.connectionID = self.connectionID; + other.triggerType = self.triggerType; + other.activationReason = self.activationReason; + return other; } - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; triggerType:%@; activationReason:%@; >", NSStringFromClass([self class]), _connectionID, _triggerType, _activationReason]; return descriptionString; } @@ -9932,7 +9972,9 @@ - (instancetype)init _connectionID = @(0); - _triggerDetails = [MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct new]; + _triggerType = @(0); + + _activationReason = nil; } return self; } @@ -9942,14 +9984,15 @@ - (id)copyWithZone:(NSZone * _Nullable)zone auto other = [[MTRPushAVStreamTransportClusterPushTransportEndEvent alloc] init]; other.connectionID = self.connectionID; - other.triggerDetails = self.triggerDetails; + other.triggerType = self.triggerType; + other.activationReason = self.activationReason; return other; } - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; triggerDetails:%@; >", NSStringFromClass([self class]), _connectionID, _triggerDetails]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: connectionID:%@; triggerType:%@; activationReason:%@; >", NSStringFromClass([self class]), _connectionID, _triggerType, _activationReason]; return descriptionString; } diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index cc2f3ea0878227..5978cda1c87742 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -38623,11 +38623,10 @@ namespace Attributes { namespace SupportedContainerFormats { Protocols::InteractionModel::Status -Get(EndpointId endpoint, - chip::BitMask * value) +Get(EndpointId endpoint, chip::BitMask * value) { - using Traits = NumericAttributeTraits< - chip::BitMask>; + using Traits = + NumericAttributeTraits>; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); Protocols::InteractionModel::Status status = @@ -38642,12 +38641,11 @@ Get(EndpointId endpoint, } Protocols::InteractionModel::Status -Set(EndpointId endpoint, - chip::BitMask value, +Set(EndpointId endpoint, chip::BitMask value, MarkAttributeDirty markDirty) { - using Traits = NumericAttributeTraits< - chip::BitMask>; + using Traits = + NumericAttributeTraits>; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return Protocols::InteractionModel::Status::ConstraintError; @@ -38660,11 +38658,10 @@ Set(EndpointId endpoint, } Protocols::InteractionModel::Status -Set(EndpointId endpoint, - chip::BitMask value) +Set(EndpointId endpoint, chip::BitMask value) { - using Traits = NumericAttributeTraits< - chip::BitMask>; + using Traits = + NumericAttributeTraits>; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return Protocols::InteractionModel::Status::ConstraintError; @@ -38680,11 +38677,9 @@ Set(EndpointId endpoint, namespace SupportedIngestMethods { Protocols::InteractionModel::Status -Get(EndpointId endpoint, - chip::BitMask * value) +Get(EndpointId endpoint, chip::BitMask * value) { - using Traits = NumericAttributeTraits< - chip::BitMask>; + using Traits = NumericAttributeTraits>; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); Protocols::InteractionModel::Status status = @@ -38699,12 +38694,10 @@ Get(EndpointId endpoint, } Protocols::InteractionModel::Status -Set(EndpointId endpoint, - chip::BitMask value, +Set(EndpointId endpoint, chip::BitMask value, MarkAttributeDirty markDirty) { - using Traits = NumericAttributeTraits< - chip::BitMask>; + using Traits = NumericAttributeTraits>; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return Protocols::InteractionModel::Status::ConstraintError; @@ -38717,11 +38710,9 @@ Set(EndpointId endpoint, } Protocols::InteractionModel::Status -Set(EndpointId endpoint, - chip::BitMask value) +Set(EndpointId endpoint, chip::BitMask value) { - using Traits = NumericAttributeTraits< - chip::BitMask>; + using Traits = NumericAttributeTraits>; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return Protocols::InteractionModel::Status::ConstraintError; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 1e4c8fdf7b399d..e9a6ddce2ac11b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -5868,30 +5868,24 @@ namespace PushAvStreamTransport { namespace Attributes { namespace SupportedContainerFormats { +Protocols::InteractionModel::Status Get(EndpointId endpoint, + chip::BitMask * + value); // SupportedContainerFormatsBitmap Protocols::InteractionModel::Status -Get(EndpointId endpoint, - chip::BitMask * - value); // PushAVStreamTransportSupportedContainerFormatsBitmap +Set(EndpointId endpoint, chip::BitMask value); Protocols::InteractionModel::Status -Set(EndpointId endpoint, - chip::BitMask value); -Protocols::InteractionModel::Status -Set(EndpointId endpoint, - chip::BitMask value, +Set(EndpointId endpoint, chip::BitMask value, MarkAttributeDirty markDirty); } // namespace SupportedContainerFormats namespace SupportedIngestMethods { +Protocols::InteractionModel::Status Get(EndpointId endpoint, + chip::BitMask * + value); // SupportedIngestMethodsBitmap Protocols::InteractionModel::Status -Get(EndpointId endpoint, - chip::BitMask * - value); // PushAVStreamTransportSupportedIngestMethodsBitmap +Set(EndpointId endpoint, chip::BitMask value); Protocols::InteractionModel::Status -Set(EndpointId endpoint, - chip::BitMask value); -Protocols::InteractionModel::Status -Set(EndpointId endpoint, - chip::BitMask value, +Set(EndpointId endpoint, chip::BitMask value, MarkAttributeDirty markDirty); } // namespace SupportedIngestMethods diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index c180eb8426b45b..5d3875d172a36c 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -6980,11 +6980,11 @@ bool emberAfPushAvStreamTransportClusterManuallyTriggerTransportCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::PushAvStreamTransport::Commands::ManuallyTriggerTransport::DecodableType & commandData); /** - * @brief Push AV Stream Transport Cluster FindStreamConfiguration Command callback (from client) + * @brief Push AV Stream Transport Cluster FindTransport Command callback (from client) */ -bool emberAfPushAvStreamTransportClusterFindStreamConfigurationCallback( +bool emberAfPushAvStreamTransportClusterFindTransportCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfiguration::DecodableType & commandData); + const chip::app::Clusters::PushAvStreamTransport::Commands::FindTransport::DecodableType & commandData); /** * @brief Unit Testing Cluster Test Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 1a1243b434fe82..a940955e96b1ef 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -3704,9 +3704,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(CameraAvStreamManagemen } } -static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::PushAVStreamTransportContainerFormatEnum val) +static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::ContainerFormatEnum val) { - using EnumType = PushAvStreamTransport::PushAVStreamTransportContainerFormatEnum; + using EnumType = PushAvStreamTransport::ContainerFormatEnum; switch (val) { case EnumType::kCmaf: @@ -3715,9 +3715,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport:: return EnumType::kUnknownEnumValue; } } -static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::PushAVStreamTransportIngestMethodEnum val) +static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::IngestMethodsEnum val) { - using EnumType = PushAvStreamTransport::PushAVStreamTransportIngestMethodEnum; + using EnumType = PushAvStreamTransport::IngestMethodsEnum; switch (val) { case EnumType::kCMAFIngest: @@ -3726,21 +3726,28 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport:: return EnumType::kUnknownEnumValue; } } -static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::PushAVStreamTransportStatusEnum val) +static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::StatusCodeEnum val) { - using EnumType = PushAvStreamTransport::PushAVStreamTransportStatusEnum; + using EnumType = PushAvStreamTransport::StatusCodeEnum; switch (val) { - case EnumType::kActive: - case EnumType::kInactive: + case EnumType::kAllocationNotPermitted: + case EnumType::kInvalidTlsEndpoint: + case EnumType::kInvalidStream: + case EnumType::kInvalidURL: + case EnumType::kInvalidZone: + case EnumType::kUnsupportedContainerFormat: + case EnumType::kUnsupportedIngestMethod: + case EnumType::kInvalidTriggerType: + case EnumType::kInvalidTransportStatus: return val; default: return EnumType::kUnknownEnumValue; } } -static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::PushAVStreamTransportStreamMultiplexingEnum val) +static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::StreamMultiplexingEnum val) { - using EnumType = PushAvStreamTransport::PushAVStreamTransportStreamMultiplexingEnum; + using EnumType = PushAvStreamTransport::StreamMultiplexingEnum; switch (val) { case EnumType::kInterleaved: @@ -3749,23 +3756,21 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport:: return EnumType::kUnknownEnumValue; } } -static auto __attribute__((unused)) -EnsureKnownEnumValue(PushAvStreamTransport::PushAVStreamTransportTriggerActivationReasonEnum val) +static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::TransportStatusEnum val) { - using EnumType = PushAvStreamTransport::PushAVStreamTransportTriggerActivationReasonEnum; + using EnumType = PushAvStreamTransport::TransportStatusEnum; switch (val) { - case EnumType::kUserInitiated: - case EnumType::kAutomation: - case EnumType::kEmergency: + case EnumType::kActive: + case EnumType::kInactive: return val; default: return EnumType::kUnknownEnumValue; } } -static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::PushAVStreamTransportTriggerTypeEnum val) +static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::TransportTriggerTypeEnum val) { - using EnumType = PushAvStreamTransport::PushAVStreamTransportTriggerTypeEnum; + using EnumType = PushAvStreamTransport::TransportTriggerTypeEnum; switch (val) { case EnumType::kCommand: @@ -3776,20 +3781,14 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport:: return EnumType::kUnknownEnumValue; } } -static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::StatusCodeEnum val) +static auto __attribute__((unused)) EnsureKnownEnumValue(PushAvStreamTransport::TriggerActivationReasonEnum val) { - using EnumType = PushAvStreamTransport::StatusCodeEnum; + using EnumType = PushAvStreamTransport::TriggerActivationReasonEnum; switch (val) { - case EnumType::kAllocationNotPermitted: - case EnumType::kInvalidParameters: - case EnumType::kInvalidUrl: - case EnumType::kInvalidTriggerOptions: - case EnumType::kUnsupportedContainerFormat: - case EnumType::kUnsupportedIngestMethod: - case EnumType::kPavstNotInUse: - case EnumType::kInvalidTriggerFormat: - case EnumType::kInvalidTransportStatus: + case EnumType::kUserInitiated: + case EnumType::kAutomation: + case EnumType::kEmergency: return val; default: return EnumType::kUnknownEnumValue; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 643f3f503cbe13..d8e74bfee25b2a 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -5632,8 +5632,8 @@ using WebRTCMetadataOptions = Clusters::detail::WebRTCMetadataOptions; namespace PushAvStreamTransport { -// Enum for PushAVStreamTransportContainerFormatEnum -enum class PushAVStreamTransportContainerFormatEnum : uint8_t +// Enum for ContainerFormatEnum +enum class ContainerFormatEnum : uint8_t { kCmaf = 0x00, // All received enum values that are not listed above will be mapped @@ -5643,8 +5643,8 @@ enum class PushAVStreamTransportContainerFormatEnum : uint8_t kUnknownEnumValue = 1, }; -// Enum for PushAVStreamTransportIngestMethodEnum -enum class PushAVStreamTransportIngestMethodEnum : uint8_t +// Enum for IngestMethodsEnum +enum class IngestMethodsEnum : uint8_t { kCMAFIngest = 0x00, // All received enum values that are not listed above will be mapped @@ -5654,20 +5654,27 @@ enum class PushAVStreamTransportIngestMethodEnum : uint8_t kUnknownEnumValue = 1, }; -// Enum for PushAVStreamTransportStatusEnum -enum class PushAVStreamTransportStatusEnum : uint8_t +// Enum for StatusCodeEnum +enum class StatusCodeEnum : uint8_t { - kActive = 0x00, - kInactive = 0x01, + kAllocationNotPermitted = 0x02, + kInvalidTlsEndpoint = 0x03, + kInvalidStream = 0x04, + kInvalidURL = 0x05, + kInvalidZone = 0x06, + kUnsupportedContainerFormat = 0x07, + kUnsupportedIngestMethod = 0x08, + kInvalidTriggerType = 0x09, + kInvalidTransportStatus = 0x10, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown // enum value. This specific should never be transmitted. - kUnknownEnumValue = 2, + kUnknownEnumValue = 0, }; -// Enum for PushAVStreamTransportStreamMultiplexingEnum -enum class PushAVStreamTransportStreamMultiplexingEnum : uint8_t +// Enum for StreamMultiplexingEnum +enum class StreamMultiplexingEnum : uint8_t { kInterleaved = 0x00, // All received enum values that are not listed above will be mapped @@ -5677,21 +5684,22 @@ enum class PushAVStreamTransportStreamMultiplexingEnum : uint8_t kUnknownEnumValue = 1, }; -// Enum for PushAVStreamTransportTriggerActivationReasonEnum -enum class PushAVStreamTransportTriggerActivationReasonEnum : uint8_t +using StreamTypeEnum = Clusters::detail::StreamTypeEnum; + +// Enum for TransportStatusEnum +enum class TransportStatusEnum : uint8_t { - kUserInitiated = 0x00, - kAutomation = 0x01, - kEmergency = 0x02, + kActive = 0x00, + kInactive = 0x01, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown // enum value. This specific should never be transmitted. - kUnknownEnumValue = 3, + kUnknownEnumValue = 2, }; -// Enum for PushAVStreamTransportTriggerTypeEnum -enum class PushAVStreamTransportTriggerTypeEnum : uint8_t +// Enum for TransportTriggerTypeEnum +enum class TransportTriggerTypeEnum : uint8_t { kCommand = 0x00, kMotion = 0x01, @@ -5703,35 +5711,33 @@ enum class PushAVStreamTransportTriggerTypeEnum : uint8_t kUnknownEnumValue = 3, }; -// Enum for StatusCodeEnum -enum class StatusCodeEnum : uint8_t +// Enum for TriggerActivationReasonEnum +enum class TriggerActivationReasonEnum : uint8_t { - kAllocationNotPermitted = 0x02, - kInvalidParameters = 0x03, - kInvalidUrl = 0x04, - kInvalidTriggerOptions = 0x05, - kUnsupportedContainerFormat = 0x06, - kUnsupportedIngestMethod = 0x07, - kPavstNotInUse = 0x08, - kInvalidTriggerFormat = 0x09, - kInvalidTransportStatus = 0x10, + kUserInitiated = 0x00, + kAutomation = 0x01, + kEmergency = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown // enum value. This specific should never be transmitted. - kUnknownEnumValue = 0, + kUnknownEnumValue = 3, }; -using StreamTypeEnum = Clusters::detail::StreamTypeEnum; +// Bitmap for Feature +enum class Feature : uint32_t +{ + kPerZoneSensitivity = 0x1, +}; -// Bitmap for PushAVStreamTransportSupportedContainerFormatsBitmap -enum class PushAVStreamTransportSupportedContainerFormatsBitmap : uint8_t +// Bitmap for SupportedContainerFormatsBitmap +enum class SupportedContainerFormatsBitmap : uint8_t { kCmaf = 0x1, }; -// Bitmap for PushAVStreamTransportSupportedIngestMethodsBitmap -enum class PushAVStreamTransportSupportedIngestMethodsBitmap : uint8_t +// Bitmap for SupportedIngestMethodsBitmap +enum class SupportedIngestMethodsBitmap : uint8_t { kCMAFIngest = 0x1, }; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 1bb3e056f80ee2..c3e2bc89ce2138 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -30883,7 +30883,7 @@ namespace Events {} // namespace Events namespace PushAvStreamTransport { namespace Structs { -namespace PushAVStreamTransportMotionTriggerTimeControlStruct { +namespace TransportMotionTriggerTimeControlStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30932,9 +30932,50 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } -} // namespace PushAVStreamTransportMotionTriggerTimeControlStruct +} // namespace TransportMotionTriggerTimeControlStruct -namespace PushAVStreamTransportMetadataOptionsStruct { +namespace TransportZoneOptionsStruct { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kZone), zone); + encoder.Encode(to_underlying(Fields::kSensitivity), sensitivity); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kZone)) + { + err = DataModel::Decode(reader, zone); + } + else if (__context_tag == to_underlying(Fields::kSensitivity)) + { + err = DataModel::Decode(reader, sensitivity); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} + +} // namespace TransportZoneOptionsStruct + +namespace MetadataOptionsStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30978,9 +31019,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } -} // namespace PushAVStreamTransportMetadataOptionsStruct +} // namespace MetadataOptionsStruct -namespace PushAVStreamTransportTriggerOptionsStruct { +namespace TransportTriggerOptionsStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30988,7 +31029,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const encoder.Encode(to_underlying(Fields::kMotionZones), motionZones); encoder.Encode(to_underlying(Fields::kMotionSensitivity), motionSensitivity); encoder.Encode(to_underlying(Fields::kMotionTimeControl), motionTimeControl); - encoder.Encode(to_underlying(Fields::kActivationReason), activationReason); + encoder.Encode(to_underlying(Fields::kMaxPreRollLen), maxPreRollLen); return encoder.Finalize(); } @@ -31022,9 +31063,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, motionTimeControl); } - else if (__context_tag == to_underlying(Fields::kActivationReason)) + else if (__context_tag == to_underlying(Fields::kMaxPreRollLen)) { - err = DataModel::Decode(reader, activationReason); + err = DataModel::Decode(reader, maxPreRollLen); } else { @@ -31034,9 +31075,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } -} // namespace PushAVStreamTransportTriggerOptionsStruct +} // namespace TransportTriggerOptionsStruct -namespace PushAVStreamTransportCMAFContainerOptionsStruct { +namespace CMAFContainerOptionsStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -31075,9 +31116,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } -} // namespace PushAVStreamTransportCMAFContainerOptionsStruct +} // namespace CMAFContainerOptionsStruct -namespace PushAVStreamTransportContainerOptionsStruct { +namespace ContainerOptionsStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -31116,20 +31157,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } -} // namespace PushAVStreamTransportContainerOptionsStruct +} // namespace ContainerOptionsStruct -namespace PushAVStreamTransportOptionsStruct { +namespace TransportOptionsStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kStreamType), streamType); encoder.Encode(to_underlying(Fields::kVideoStreamID), videoStreamID); encoder.Encode(to_underlying(Fields::kAudioStreamID), audioStreamID); - encoder.Encode(to_underlying(Fields::kTLSEndpointID), TLSEndpointID); + encoder.Encode(to_underlying(Fields::kEndpointID), endpointID); encoder.Encode(to_underlying(Fields::kUrl), url); encoder.Encode(to_underlying(Fields::kTriggerOptions), triggerOptions); - encoder.Encode(to_underlying(Fields::kContainerFormat), containerFormat); encoder.Encode(to_underlying(Fields::kIngestMethod), ingestMethod); + encoder.Encode(to_underlying(Fields::kContainerFormat), containerFormat); encoder.Encode(to_underlying(Fields::kContainerOptions), containerOptions); encoder.Encode(to_underlying(Fields::kMetadataOptions), metadataOptions); encoder.Encode(to_underlying(Fields::kExpiryTime), expiryTime); @@ -31162,9 +31203,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, audioStreamID); } - else if (__context_tag == to_underlying(Fields::kTLSEndpointID)) + else if (__context_tag == to_underlying(Fields::kEndpointID)) { - err = DataModel::Decode(reader, TLSEndpointID); + err = DataModel::Decode(reader, endpointID); } else if (__context_tag == to_underlying(Fields::kUrl)) { @@ -31174,14 +31215,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, triggerOptions); } - else if (__context_tag == to_underlying(Fields::kContainerFormat)) - { - err = DataModel::Decode(reader, containerFormat); - } else if (__context_tag == to_underlying(Fields::kIngestMethod)) { err = DataModel::Decode(reader, ingestMethod); } + else if (__context_tag == to_underlying(Fields::kContainerFormat)) + { + err = DataModel::Decode(reader, containerFormat); + } else if (__context_tag == to_underlying(Fields::kContainerOptions)) { err = DataModel::Decode(reader, containerOptions); @@ -31202,15 +31243,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } -} // namespace PushAVStreamTransportOptionsStruct +} // namespace TransportOptionsStruct -namespace PushAVStreamConfigurationStruct { +namespace TransportConfigurationStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kConnectionID), connectionID); - encoder.Encode(to_underlying(Fields::kStreamTransportStatus), streamTransportStatus); - encoder.Encode(to_underlying(Fields::kStreamTransportOptions), streamTransportOptions); + encoder.Encode(to_underlying(Fields::kTransportStatus), transportStatus); + encoder.Encode(to_underlying(Fields::kTransportOptions), transportOptions); return encoder.Finalize(); } @@ -31232,13 +31273,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, connectionID); } - else if (__context_tag == to_underlying(Fields::kStreamTransportStatus)) + else if (__context_tag == to_underlying(Fields::kTransportStatus)) { - err = DataModel::Decode(reader, streamTransportStatus); + err = DataModel::Decode(reader, transportStatus); } - else if (__context_tag == to_underlying(Fields::kStreamTransportOptions)) + else if (__context_tag == to_underlying(Fields::kTransportOptions)) { - err = DataModel::Decode(reader, streamTransportOptions); + err = DataModel::Decode(reader, transportOptions); } else { @@ -31248,7 +31289,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } -} // namespace PushAVStreamConfigurationStruct +} // namespace TransportConfigurationStruct } // namespace Structs namespace Commands { @@ -31256,7 +31297,7 @@ namespace AllocatePushTransport { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; - encoder.Encode(to_underlying(Fields::kStreamTransportOptions), streamTransportOptions); + encoder.Encode(to_underlying(Fields::kTransportOptions), transportOptions); return encoder.Finalize(); } @@ -31274,9 +31315,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) CHIP_ERROR err = CHIP_NO_ERROR; const uint8_t __context_tag = std::get(__element); - if (__context_tag == to_underlying(Fields::kStreamTransportOptions)) + if (__context_tag == to_underlying(Fields::kTransportOptions)) { - err = DataModel::Decode(reader, streamTransportOptions); + err = DataModel::Decode(reader, transportOptions); } else { @@ -31291,7 +31332,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kConnectionID), connectionID); - encoder.Encode(to_underlying(Fields::kStreamTransportOptions), streamTransportOptions); + encoder.Encode(to_underlying(Fields::kTransportOptions), transportOptions); encoder.Encode(to_underlying(Fields::kTransportStatus), transportStatus); return encoder.Finalize(); } @@ -31314,9 +31355,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, connectionID); } - else if (__context_tag == to_underlying(Fields::kStreamTransportOptions)) + else if (__context_tag == to_underlying(Fields::kTransportOptions)) { - err = DataModel::Decode(reader, streamTransportOptions); + err = DataModel::Decode(reader, transportOptions); } else if (__context_tag == to_underlying(Fields::kTransportStatus)) { @@ -31369,7 +31410,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kConnectionID), connectionID); - encoder.Encode(to_underlying(Fields::kStreamTransportOptions), streamTransportOptions); + encoder.Encode(to_underlying(Fields::kTransportOptions), transportOptions); return encoder.Finalize(); } @@ -31391,9 +31432,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, connectionID); } - else if (__context_tag == to_underlying(Fields::kStreamTransportOptions)) + else if (__context_tag == to_underlying(Fields::kTransportOptions)) { - err = DataModel::Decode(reader, streamTransportOptions); + err = DataModel::Decode(reader, transportOptions); } else { @@ -31408,7 +31449,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kConnectionID), connectionID); - encoder.Encode(to_underlying(Fields::kStreamTransportStatus), streamTransportStatus); + encoder.Encode(to_underlying(Fields::kTransportStatus), transportStatus); return encoder.Finalize(); } @@ -31430,9 +31471,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, connectionID); } - else if (__context_tag == to_underlying(Fields::kStreamTransportStatus)) + else if (__context_tag == to_underlying(Fields::kTransportStatus)) { - err = DataModel::Decode(reader, streamTransportStatus); + err = DataModel::Decode(reader, transportStatus); } else { @@ -31486,7 +31527,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } } // namespace ManuallyTriggerTransport. -namespace FindStreamConfiguration { +namespace FindTransport { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -31519,8 +31560,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); } } -} // namespace FindStreamConfiguration. -namespace FindStreamConfigurationResponse { +} // namespace FindTransport. +namespace FindTransportResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -31553,7 +31594,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); } } -} // namespace FindStreamConfigurationResponse. +} // namespace FindTransportResponse. } // namespace Commands namespace Attributes { @@ -31589,6 +31630,9 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { TLV::TLVType outer; ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kConnectionID), connectionID)); + ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTriggerType), triggerType)); + ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kActivationReason), activationReason)); return aWriter.EndContainer(outer); } @@ -31602,6 +31646,27 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { return std::get(__element); } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kConnectionID)) + { + err = DataModel::Decode(reader, connectionID); + } + else if (__context_tag == to_underlying(Fields::kTriggerType)) + { + err = DataModel::Decode(reader, triggerType); + } + else if (__context_tag == to_underlying(Fields::kActivationReason)) + { + err = DataModel::Decode(reader, activationReason); + } + else + { + } + + ReturnErrorOnFailure(err); } } } // namespace PushTransportBegin. @@ -31611,7 +31676,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const TLV::TLVType outer; ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kConnectionID), connectionID)); - ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTriggerDetails), triggerDetails)); + ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kTriggerType), triggerType)); + ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kActivationReason), activationReason)); return aWriter.EndContainer(outer); } @@ -31633,9 +31699,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, connectionID); } - else if (__context_tag == to_underlying(Fields::kTriggerDetails)) + else if (__context_tag == to_underlying(Fields::kTriggerType)) { - err = DataModel::Decode(reader, triggerDetails); + err = DataModel::Decode(reader, triggerType); + } + else if (__context_tag == to_underlying(Fields::kActivationReason)) + { + err = DataModel::Decode(reader, activationReason); } else { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 2447fe93fbbd2c..71251407f2a2b0 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -43171,7 +43171,7 @@ struct TypeInfo } // namespace WebRTCTransportRequestor namespace PushAvStreamTransport { namespace Structs { -namespace PushAVStreamTransportMotionTriggerTimeControlStruct { +namespace TransportMotionTriggerTimeControlStruct { enum class Fields : uint8_t { kInitialDuration = 0, @@ -43197,8 +43197,31 @@ struct Type using DecodableType = Type; -} // namespace PushAVStreamTransportMotionTriggerTimeControlStruct -namespace PushAVStreamTransportMetadataOptionsStruct { +} // namespace TransportMotionTriggerTimeControlStruct +namespace TransportZoneOptionsStruct { +enum class Fields : uint8_t +{ + kZone = 1, + kSensitivity = 2, +}; + +struct Type +{ +public: + DataModel::Nullable zone; + Optional sensitivity; + + CHIP_ERROR Decode(TLV::TLVReader & reader); + + static constexpr bool kIsFabricScoped = false; + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; +}; + +using DecodableType = Type; + +} // namespace TransportZoneOptionsStruct +namespace MetadataOptionsStruct { enum class Fields : uint8_t { kMultiplexing = 0, @@ -43209,9 +43232,9 @@ enum class Fields : uint8_t struct Type { public: - PushAVStreamTransportStreamMultiplexingEnum multiplexing = static_cast(0); - bool includeMotionZones = static_cast(0); - bool enableMetadataPrivacySensitive = static_cast(0); + StreamMultiplexingEnum multiplexing = static_cast(0); + bool includeMotionZones = static_cast(0); + bool enableMetadataPrivacySensitive = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -43222,25 +43245,25 @@ struct Type using DecodableType = Type; -} // namespace PushAVStreamTransportMetadataOptionsStruct -namespace PushAVStreamTransportTriggerOptionsStruct { +} // namespace MetadataOptionsStruct +namespace TransportTriggerOptionsStruct { enum class Fields : uint8_t { kTriggerType = 0, kMotionZones = 1, kMotionSensitivity = 2, kMotionTimeControl = 3, - kActivationReason = 4, + kMaxPreRollLen = 4, }; struct Type { public: - PushAVStreamTransportTriggerTypeEnum triggerType = static_cast(0); - Optional>> motionZones; + TransportTriggerTypeEnum triggerType = static_cast(0); + Optional>> motionZones; Optional> motionSensitivity; - Optional> motionTimeControl; - Optional> activationReason; + Optional motionTimeControl; + Optional maxPreRollLen; static constexpr bool kIsFabricScoped = false; @@ -43250,19 +43273,19 @@ struct Type struct DecodableType { public: - PushAVStreamTransportTriggerTypeEnum triggerType = static_cast(0); - Optional>> motionZones; + TransportTriggerTypeEnum triggerType = static_cast(0); + Optional>> motionZones; Optional> motionSensitivity; - Optional> motionTimeControl; - Optional> activationReason; + Optional motionTimeControl; + Optional maxPreRollLen; CHIP_ERROR Decode(TLV::TLVReader & reader); static constexpr bool kIsFabricScoped = false; }; -} // namespace PushAVStreamTransportTriggerOptionsStruct -namespace PushAVStreamTransportCMAFContainerOptionsStruct { +} // namespace TransportTriggerOptionsStruct +namespace CMAFContainerOptionsStruct { enum class Fields : uint8_t { kChunkDuration = 0, @@ -43284,8 +43307,8 @@ struct Type using DecodableType = Type; -} // namespace PushAVStreamTransportCMAFContainerOptionsStruct -namespace PushAVStreamTransportContainerOptionsStruct { +} // namespace CMAFContainerOptionsStruct +namespace ContainerOptionsStruct { enum class Fields : uint8_t { kContainerType = 0, @@ -43295,8 +43318,8 @@ enum class Fields : uint8_t struct Type { public: - PushAVStreamTransportContainerFormatEnum containerType = static_cast(0); - Optional> CMAFContainerOptions; + ContainerFormatEnum containerType = static_cast(0); + Optional> CMAFContainerOptions; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -43307,18 +43330,18 @@ struct Type using DecodableType = Type; -} // namespace PushAVStreamTransportContainerOptionsStruct -namespace PushAVStreamTransportOptionsStruct { +} // namespace ContainerOptionsStruct +namespace TransportOptionsStruct { enum class Fields : uint8_t { kStreamType = 0, kVideoStreamID = 1, kAudioStreamID = 2, - kTLSEndpointID = 3, + kEndpointID = 3, kUrl = 4, kTriggerOptions = 5, - kContainerFormat = 6, - kIngestMethod = 7, + kIngestMethod = 6, + kContainerFormat = 7, kContainerOptions = 8, kMetadataOptions = 9, kExpiryTime = 10, @@ -43328,15 +43351,15 @@ struct Type { public: StreamTypeEnum streamType = static_cast(0); - Optional> videoStreamID; - Optional> audioStreamID; - uint16_t TLSEndpointID = static_cast(0); + Optional videoStreamID; + Optional audioStreamID; + uint16_t endpointID = static_cast(0); chip::CharSpan url; - Structs::PushAVStreamTransportTriggerOptionsStruct::Type triggerOptions; - PushAVStreamTransportContainerFormatEnum containerFormat = static_cast(0); - PushAVStreamTransportIngestMethodEnum ingestMethod = static_cast(0); - Structs::PushAVStreamTransportContainerOptionsStruct::Type containerOptions; - Optional> metadataOptions; + Structs::TransportTriggerOptionsStruct::Type triggerOptions; + IngestMethodsEnum ingestMethod = static_cast(0); + ContainerFormatEnum containerFormat = static_cast(0); + Structs::ContainerOptionsStruct::Type containerOptions; + Optional> metadataOptions; Optional> expiryTime; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -43348,21 +43371,21 @@ struct Type using DecodableType = Type; -} // namespace PushAVStreamTransportOptionsStruct -namespace PushAVStreamConfigurationStruct { +} // namespace TransportOptionsStruct +namespace TransportConfigurationStruct { enum class Fields : uint8_t { - kConnectionID = 0, - kStreamTransportStatus = 1, - kStreamTransportOptions = 2, + kConnectionID = 0, + kTransportStatus = 1, + kTransportOptions = 2, }; struct Type { public: - uint16_t connectionID = static_cast(0); - PushAVStreamTransportStatusEnum streamTransportStatus = static_cast(0); - Structs::PushAVStreamTransportOptionsStruct::Type streamTransportOptions; + uint16_t connectionID = static_cast(0); + TransportStatusEnum transportStatus = static_cast(0); + Structs::TransportOptionsStruct::Type transportOptions; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -43373,7 +43396,7 @@ struct Type using DecodableType = Type; -} // namespace PushAVStreamConfigurationStruct +} // namespace TransportConfigurationStruct } // namespace Structs namespace Commands { @@ -43409,15 +43432,15 @@ struct Type; struct DecodableType; } // namespace ManuallyTriggerTransport -namespace FindStreamConfiguration { +namespace FindTransport { struct Type; struct DecodableType; -} // namespace FindStreamConfiguration +} // namespace FindTransport -namespace FindStreamConfigurationResponse { +namespace FindTransportResponse { struct Type; struct DecodableType; -} // namespace FindStreamConfigurationResponse +} // namespace FindTransportResponse } // namespace Commands @@ -43425,7 +43448,7 @@ namespace Commands { namespace AllocatePushTransport { enum class Fields : uint8_t { - kStreamTransportOptions = 0, + kTransportOptions = 0, }; struct Type @@ -43435,7 +43458,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::AllocatePushTransport::Id; } static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } - Structs::PushAVStreamTransportOptionsStruct::Type streamTransportOptions; + Structs::TransportOptionsStruct::Type transportOptions; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -43450,16 +43473,16 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::AllocatePushTransport::Id; } static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } - Structs::PushAVStreamTransportOptionsStruct::DecodableType streamTransportOptions; + Structs::TransportOptionsStruct::DecodableType transportOptions; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace AllocatePushTransport namespace AllocatePushTransportResponse { enum class Fields : uint8_t { - kConnectionID = 0, - kStreamTransportOptions = 1, - kTransportStatus = 2, + kConnectionID = 0, + kTransportOptions = 1, + kTransportStatus = 2, }; struct Type @@ -43470,8 +43493,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } uint16_t connectionID = static_cast(0); - Structs::PushAVStreamTransportOptionsStruct::Type streamTransportOptions; - PushAVStreamTransportStatusEnum transportStatus = static_cast(0); + Structs::TransportOptionsStruct::Type transportOptions; + TransportStatusEnum transportStatus = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -43487,8 +43510,8 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } uint16_t connectionID = static_cast(0); - Structs::PushAVStreamTransportOptionsStruct::DecodableType streamTransportOptions; - PushAVStreamTransportStatusEnum transportStatus = static_cast(0); + Structs::TransportOptionsStruct::DecodableType transportOptions; + TransportStatusEnum transportStatus = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace AllocatePushTransportResponse @@ -43527,8 +43550,8 @@ struct DecodableType namespace ModifyPushTransport { enum class Fields : uint8_t { - kConnectionID = 0, - kStreamTransportOptions = 1, + kConnectionID = 0, + kTransportOptions = 1, }; struct Type @@ -43539,7 +43562,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } uint16_t connectionID = static_cast(0); - Structs::PushAVStreamTransportOptionsStruct::Type streamTransportOptions; + Structs::TransportOptionsStruct::Type transportOptions; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -43555,15 +43578,15 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } uint16_t connectionID = static_cast(0); - Structs::PushAVStreamTransportOptionsStruct::DecodableType streamTransportOptions; + Structs::TransportOptionsStruct::DecodableType transportOptions; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ModifyPushTransport namespace SetTransportStatus { enum class Fields : uint8_t { - kConnectionID = 0, - kStreamTransportStatus = 1, + kConnectionID = 0, + kTransportStatus = 1, }; struct Type @@ -43574,7 +43597,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } DataModel::Nullable connectionID; - PushAVStreamTransportStatusEnum streamTransportStatus = static_cast(0); + TransportStatusEnum transportStatus = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -43590,7 +43613,7 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } DataModel::Nullable connectionID; - PushAVStreamTransportStatusEnum streamTransportStatus = static_cast(0); + TransportStatusEnum transportStatus = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SetTransportStatus @@ -43610,8 +43633,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } uint16_t connectionID = static_cast(0); - DataModel::Nullable activationReason; - Optional> timeControl; + DataModel::Nullable activationReason; + Optional> timeControl; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -43627,12 +43650,12 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } uint16_t connectionID = static_cast(0); - DataModel::Nullable activationReason; - Optional> timeControl; + DataModel::Nullable activationReason; + Optional> timeControl; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ManuallyTriggerTransport -namespace FindStreamConfiguration { +namespace FindTransport { enum class Fields : uint8_t { kConnectionID = 0, @@ -43642,14 +43665,14 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::FindStreamConfiguration::Id; } + static constexpr CommandId GetCommandId() { return Commands::FindTransport::Id; } static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } Optional> connectionID; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; - using ResponseType = Clusters::PushAvStreamTransport::Commands::FindStreamConfigurationResponse::DecodableType; + using ResponseType = Clusters::PushAvStreamTransport::Commands::FindTransportResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -43657,14 +43680,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::FindStreamConfiguration::Id; } + static constexpr CommandId GetCommandId() { return Commands::FindTransport::Id; } static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } Optional> connectionID; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace FindStreamConfiguration -namespace FindStreamConfigurationResponse { +}; // namespace FindTransport +namespace FindTransportResponse { enum class Fields : uint8_t { kStreamConfigurations = 0, @@ -43674,10 +43697,10 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::FindStreamConfigurationResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::FindTransportResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } - DataModel::List streamConfigurations; + DataModel::List streamConfigurations; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -43689,13 +43712,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::FindStreamConfigurationResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::FindTransportResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } - DataModel::DecodableList streamConfigurations; + DataModel::DecodableList streamConfigurations; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace FindStreamConfigurationResponse +}; // namespace FindTransportResponse } // namespace Commands namespace Attributes { @@ -43703,11 +43726,9 @@ namespace Attributes { namespace SupportedContainerFormats { struct TypeInfo { - using Type = chip::BitMask; - using DecodableType = - chip::BitMask; - using DecodableArgType = - chip::BitMask; + using Type = chip::BitMask; + using DecodableType = chip::BitMask; + using DecodableArgType = chip::BitMask; static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedContainerFormats::Id; } @@ -43717,11 +43738,9 @@ struct TypeInfo namespace SupportedIngestMethods { struct TypeInfo { - using Type = chip::BitMask; - using DecodableType = - chip::BitMask; - using DecodableArgType = - chip::BitMask; + using Type = chip::BitMask; + using DecodableType = chip::BitMask; + using DecodableArgType = chip::BitMask; static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedIngestMethods::Id; } @@ -43779,10 +43798,10 @@ struct TypeInfo CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::SupportedContainerFormats::TypeInfo::DecodableType supportedContainerFormats = static_cast< - chip::BitMask>(0); - Attributes::SupportedIngestMethods::TypeInfo::DecodableType supportedIngestMethods = static_cast< - chip::BitMask>(0); + Attributes::SupportedContainerFormats::TypeInfo::DecodableType supportedContainerFormats = + static_cast>(0); + Attributes::SupportedIngestMethods::TypeInfo::DecodableType supportedIngestMethods = + static_cast>(0); Attributes::CurrentConnections::TypeInfo::DecodableType currentConnections; Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; @@ -43798,6 +43817,9 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields : uint8_t { + kConnectionID = 0, + kTriggerType = 1, + kActivationReason = 2, }; struct Type @@ -43808,6 +43830,10 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } static constexpr bool kIsFabricScoped = false; + uint16_t connectionID = static_cast(0); + TransportTriggerTypeEnum triggerType = static_cast(0); + Optional activationReason; + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; }; @@ -43818,6 +43844,10 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::PushTransportBegin::Id; } static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } + uint16_t connectionID = static_cast(0); + TransportTriggerTypeEnum triggerType = static_cast(0); + Optional activationReason; + CHIP_ERROR Decode(TLV::TLVReader & reader); }; } // namespace PushTransportBegin @@ -43826,8 +43856,9 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields : uint8_t { - kConnectionID = 0, - kTriggerDetails = 1, + kConnectionID = 0, + kTriggerType = 1, + kActivationReason = 2, }; struct Type @@ -43838,8 +43869,9 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } static constexpr bool kIsFabricScoped = false; - uint16_t connectionID = static_cast(0); - Structs::PushAVStreamTransportTriggerOptionsStruct::Type triggerDetails; + uint16_t connectionID = static_cast(0); + TransportTriggerTypeEnum triggerType = static_cast(0); + Optional activationReason; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; }; @@ -43851,8 +43883,9 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::PushTransportEnd::Id; } static constexpr ClusterId GetClusterId() { return Clusters::PushAvStreamTransport::Id; } - uint16_t connectionID = static_cast(0); - Structs::PushAVStreamTransportTriggerOptionsStruct::DecodableType triggerDetails; + uint16_t connectionID = static_cast(0); + TransportTriggerTypeEnum triggerType = static_cast(0); + Optional activationReason; CHIP_ERROR Decode(TLV::TLVReader & reader); }; diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h index c1006f29449c0b..7fe8089a12b5a8 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h @@ -1974,13 +1974,13 @@ namespace ManuallyTriggerTransport { static constexpr CommandId Id = 0x00000005; } // namespace ManuallyTriggerTransport -namespace FindStreamConfiguration { +namespace FindTransport { static constexpr CommandId Id = 0x00000006; -} // namespace FindStreamConfiguration +} // namespace FindTransport -namespace FindStreamConfigurationResponse { +namespace FindTransportResponse { static constexpr CommandId Id = 0x00000007; -} // namespace FindStreamConfigurationResponse +} // namespace FindTransportResponse } // namespace Commands } // namespace PushAvStreamTransport diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 6dfc357f1188c2..bee063a2ea39a1 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -14579,7 +14579,7 @@ class WebRTCTransportRequestorEnd : public ClusterCommand | * ModifyPushTransport | 0x03 | | * SetTransportStatus | 0x04 | | * ManuallyTriggerTransport | 0x05 | -| * FindStreamConfiguration | 0x06 | +| * FindTransport | 0x06 | |------------------------------------------------------------------------------| | Attributes: | | | * SupportedContainerFormats | 0x0000 | @@ -14603,10 +14603,9 @@ class PushAvStreamTransportAllocatePushTransport : public ClusterCommand { public: PushAvStreamTransportAllocatePushTransport(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("allocate-push-transport", credsIssuerConfig), - mComplex_StreamTransportOptions(&mRequest.streamTransportOptions) + ClusterCommand("allocate-push-transport", credsIssuerConfig), mComplex_TransportOptions(&mRequest.transportOptions) { - AddArgument("StreamTransportOptions", &mComplex_StreamTransportOptions); + AddArgument("TransportOptions", &mComplex_TransportOptions); ClusterCommand::AddArguments(); } @@ -14633,8 +14632,8 @@ class PushAvStreamTransportAllocatePushTransport : public ClusterCommand private: chip::app::Clusters::PushAvStreamTransport::Commands::AllocatePushTransport::Type mRequest; - TypedComplexArgument - mComplex_StreamTransportOptions; + TypedComplexArgument + mComplex_TransportOptions; }; /* @@ -14682,11 +14681,10 @@ class PushAvStreamTransportModifyPushTransport : public ClusterCommand { public: PushAvStreamTransportModifyPushTransport(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("modify-push-transport", credsIssuerConfig), - mComplex_StreamTransportOptions(&mRequest.streamTransportOptions) + ClusterCommand("modify-push-transport", credsIssuerConfig), mComplex_TransportOptions(&mRequest.transportOptions) { AddArgument("ConnectionID", 0, UINT16_MAX, &mRequest.connectionID); - AddArgument("StreamTransportOptions", &mComplex_StreamTransportOptions); + AddArgument("TransportOptions", &mComplex_TransportOptions); ClusterCommand::AddArguments(); } @@ -14713,8 +14711,8 @@ class PushAvStreamTransportModifyPushTransport : public ClusterCommand private: chip::app::Clusters::PushAvStreamTransport::Commands::ModifyPushTransport::Type mRequest; - TypedComplexArgument - mComplex_StreamTransportOptions; + TypedComplexArgument + mComplex_TransportOptions; }; /* @@ -14727,7 +14725,7 @@ class PushAvStreamTransportSetTransportStatus : public ClusterCommand ClusterCommand("set-transport-status", credsIssuerConfig) { AddArgument("ConnectionID", 0, UINT16_MAX, &mRequest.connectionID); - AddArgument("StreamTransportStatus", 0, UINT8_MAX, &mRequest.streamTransportStatus); + AddArgument("TransportStatus", 0, UINT8_MAX, &mRequest.transportStatus); ClusterCommand::AddArguments(); } @@ -14795,18 +14793,18 @@ class PushAvStreamTransportManuallyTriggerTransport : public ClusterCommand private: chip::app::Clusters::PushAvStreamTransport::Commands::ManuallyTriggerTransport::Type mRequest; TypedComplexArgument>> + chip::app::Clusters::PushAvStreamTransport::Structs::TransportMotionTriggerTimeControlStruct::Type>>> mComplex_TimeControl; }; /* - * Command FindStreamConfiguration + * Command FindTransport */ -class PushAvStreamTransportFindStreamConfiguration : public ClusterCommand +class PushAvStreamTransportFindTransport : public ClusterCommand { public: - PushAvStreamTransportFindStreamConfiguration(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("find-stream-configuration", credsIssuerConfig) + PushAvStreamTransportFindTransport(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("find-transport", credsIssuerConfig) { AddArgument("ConnectionID", 0, UINT16_MAX, &mRequest.connectionID); ClusterCommand::AddArguments(); @@ -14815,7 +14813,7 @@ class PushAvStreamTransportFindStreamConfiguration : public ClusterCommand CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::PushAvStreamTransport::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfiguration::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::PushAvStreamTransport::Commands::FindTransport::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointIds.at(0)); @@ -14825,7 +14823,7 @@ class PushAvStreamTransportFindStreamConfiguration : public ClusterCommand CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::PushAvStreamTransport::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfiguration::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::PushAvStreamTransport::Commands::FindTransport::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, groupId); @@ -14834,7 +14832,7 @@ class PushAvStreamTransportFindStreamConfiguration : public ClusterCommand } private: - chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfiguration::Type mRequest; + chip::app::Clusters::PushAvStreamTransport::Commands::FindTransport::Type mRequest; }; /*----------------------------------------------------------------------------*\ @@ -27387,7 +27385,7 @@ void registerClusterPushAvStreamTransport(Commands & commands, CredentialIssuerC make_unique(credsIssuerConfig), // make_unique(credsIssuerConfig), // make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // @@ -27402,12 +27400,10 @@ void registerClusterPushAvStreamTransport(Commands & commands, CredentialIssuerC make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>>( + make_unique>>( Id, "supported-container-formats", 0, UINT8_MAX, Attributes::SupportedContainerFormats::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>>( + make_unique>>( Id, "supported-ingest-methods", 0, UINT8_MAX, Attributes::SupportedIngestMethods::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index e3af1bef11b8bf..1d0c0650441948 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -6479,7 +6479,7 @@ void ComplexArgumentParser::Finalize( CHIP_ERROR ComplexArgumentParser::Setup( const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMotionTriggerTimeControlStruct::Type & request, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportMotionTriggerTimeControlStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -6487,16 +6487,14 @@ CHIP_ERROR ComplexArgumentParser::Setup( // Copy to track which members we already processed. Json::Value valueCopy(value); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportMotionTriggerTimeControlStruct.initialDuration", - "initialDuration", value.isMember("initialDuration"))); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportMotionTriggerTimeControlStruct.augmentationDuration", - "augmentationDuration", value.isMember("augmentationDuration"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportMotionTriggerTimeControlStruct.maxDuration", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportMotionTriggerTimeControlStruct.initialDuration", + "initialDuration", value.isMember("initialDuration"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportMotionTriggerTimeControlStruct.augmentationDuration", + "augmentationDuration", value.isMember("augmentationDuration"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportMotionTriggerTimeControlStruct.maxDuration", "maxDuration", value.isMember("maxDuration"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist( - "PushAVStreamTransportMotionTriggerTimeControlStruct.blindDuration", "blindDuration", value.isMember("blindDuration"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportMotionTriggerTimeControlStruct.blindDuration", + "blindDuration", value.isMember("blindDuration"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "initialDuration"); @@ -6520,7 +6518,7 @@ CHIP_ERROR ComplexArgumentParser::Setup( } void ComplexArgumentParser::Finalize( - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMotionTriggerTimeControlStruct::Type & request) + chip::app::Clusters::PushAvStreamTransport::Structs::TransportMotionTriggerTimeControlStruct::Type & request) { ComplexArgumentParser::Finalize(request.initialDuration); ComplexArgumentParser::Finalize(request.augmentationDuration); @@ -6528,23 +6526,57 @@ void ComplexArgumentParser::Finalize( ComplexArgumentParser::Finalize(request.blindDuration); } -CHIP_ERROR ComplexArgumentParser::Setup( - const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMetadataOptionsStruct::Type & request, - Json::Value & value) +CHIP_ERROR +ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportZoneOptionsStruct::Type & request, + Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); // Copy to track which members we already processed. Json::Value valueCopy(value); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportMetadataOptionsStruct.multiplexing", - "multiplexing", value.isMember("multiplexing"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportMetadataOptionsStruct.includeMotionZones", - "includeMotionZones", value.isMember("includeMotionZones"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist( - "PushAVStreamTransportMetadataOptionsStruct.enableMetadataPrivacySensitive", "enableMetadataPrivacySensitive", - value.isMember("enableMetadataPrivacySensitive"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("TransportZoneOptionsStruct.zone", "zone", value.isMember("zone"))); + + char labelWithMember[kMaxLabelLength]; + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "zone"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.zone, value["zone"])); + valueCopy.removeMember("zone"); + + if (value.isMember("sensitivity")) + { + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "sensitivity"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.sensitivity, value["sensitivity"])); + } + valueCopy.removeMember("sensitivity"); + + return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); +} + +void ComplexArgumentParser::Finalize( + chip::app::Clusters::PushAvStreamTransport::Structs::TransportZoneOptionsStruct::Type & request) +{ + ComplexArgumentParser::Finalize(request.zone); + ComplexArgumentParser::Finalize(request.sensitivity); +} + +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::MetadataOptionsStruct::Type & request, + Json::Value & value) +{ + VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); + + // Copy to track which members we already processed. + Json::Value valueCopy(value); + + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MetadataOptionsStruct.multiplexing", "multiplexing", + value.isMember("multiplexing"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MetadataOptionsStruct.includeMotionZones", "includeMotionZones", + value.isMember("includeMotionZones"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MetadataOptionsStruct.enableMetadataPrivacySensitive", + "enableMetadataPrivacySensitive", + value.isMember("enableMetadataPrivacySensitive"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "multiplexing"); @@ -6563,26 +6595,25 @@ CHIP_ERROR ComplexArgumentParser::Setup( return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize( - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMetadataOptionsStruct::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::MetadataOptionsStruct::Type & request) { ComplexArgumentParser::Finalize(request.multiplexing); ComplexArgumentParser::Finalize(request.includeMotionZones); ComplexArgumentParser::Finalize(request.enableMetadataPrivacySensitive); } -CHIP_ERROR ComplexArgumentParser::Setup( - const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportTriggerOptionsStruct::Type & request, - Json::Value & value) +CHIP_ERROR +ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportTriggerOptionsStruct::Type & request, + Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); // Copy to track which members we already processed. Json::Value valueCopy(value); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportTriggerOptionsStruct.triggerType", - "triggerType", value.isMember("triggerType"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportTriggerOptionsStruct.triggerType", "triggerType", + value.isMember("triggerType"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "triggerType"); @@ -6610,38 +6641,38 @@ CHIP_ERROR ComplexArgumentParser::Setup( } valueCopy.removeMember("motionTimeControl"); - if (value.isMember("activationReason")) + if (value.isMember("maxPreRollLen")) { - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "activationReason"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.activationReason, value["activationReason"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "maxPreRollLen"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.maxPreRollLen, value["maxPreRollLen"])); } - valueCopy.removeMember("activationReason"); + valueCopy.removeMember("maxPreRollLen"); return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } void ComplexArgumentParser::Finalize( - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportTriggerOptionsStruct::Type & request) + chip::app::Clusters::PushAvStreamTransport::Structs::TransportTriggerOptionsStruct::Type & request) { ComplexArgumentParser::Finalize(request.triggerType); ComplexArgumentParser::Finalize(request.motionZones); ComplexArgumentParser::Finalize(request.motionSensitivity); ComplexArgumentParser::Finalize(request.motionTimeControl); - ComplexArgumentParser::Finalize(request.activationReason); + ComplexArgumentParser::Finalize(request.maxPreRollLen); } -CHIP_ERROR ComplexArgumentParser::Setup( - const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportCMAFContainerOptionsStruct::Type & request, - Json::Value & value) +CHIP_ERROR +ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::CMAFContainerOptionsStruct::Type & request, + Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); // Copy to track which members we already processed. Json::Value valueCopy(value); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportCMAFContainerOptionsStruct.chunkDuration", - "chunkDuration", value.isMember("chunkDuration"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("CMAFContainerOptionsStruct.chunkDuration", "chunkDuration", + value.isMember("chunkDuration"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "chunkDuration"); @@ -6659,24 +6690,23 @@ CHIP_ERROR ComplexArgumentParser::Setup( } void ComplexArgumentParser::Finalize( - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportCMAFContainerOptionsStruct::Type & request) + chip::app::Clusters::PushAvStreamTransport::Structs::CMAFContainerOptionsStruct::Type & request) { ComplexArgumentParser::Finalize(request.chunkDuration); ComplexArgumentParser::Finalize(request.CENCKey); } -CHIP_ERROR ComplexArgumentParser::Setup( - const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportContainerOptionsStruct::Type & request, - Json::Value & value) +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::ContainerOptionsStruct::Type & request, + Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); // Copy to track which members we already processed. Json::Value valueCopy(value); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportContainerOptionsStruct.containerType", - "containerType", value.isMember("containerType"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ContainerOptionsStruct.containerType", "containerType", + value.isMember("containerType"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "containerType"); @@ -6694,36 +6724,34 @@ CHIP_ERROR ComplexArgumentParser::Setup( return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize( - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportContainerOptionsStruct::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::ContainerOptionsStruct::Type & request) { ComplexArgumentParser::Finalize(request.containerType); ComplexArgumentParser::Finalize(request.CMAFContainerOptions); } -CHIP_ERROR ComplexArgumentParser::Setup( - const char * label, chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportOptionsStruct::Type & request, - Json::Value & value) +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportOptionsStruct::Type & request, + Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); // Copy to track which members we already processed. Json::Value valueCopy(value); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportOptionsStruct.streamType", "streamType", - value.isMember("streamType"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportOptionsStruct.TLSEndpointID", - "TLSEndpointID", value.isMember("TLSEndpointID"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportOptionsStruct.url", "url", value.isMember("url"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportOptionsStruct.triggerOptions", - "triggerOptions", value.isMember("triggerOptions"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportOptionsStruct.containerFormat", - "containerFormat", value.isMember("containerFormat"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportOptionsStruct.ingestMethod", "ingestMethod", + ComplexArgumentParser::EnsureMemberExist("TransportOptionsStruct.streamType", "streamType", value.isMember("streamType"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("TransportOptionsStruct.endpointID", "endpointID", value.isMember("endpointID"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportOptionsStruct.url", "url", value.isMember("url"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportOptionsStruct.triggerOptions", "triggerOptions", + value.isMember("triggerOptions"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportOptionsStruct.ingestMethod", "ingestMethod", value.isMember("ingestMethod"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamTransportOptionsStruct.containerOptions", - "containerOptions", value.isMember("containerOptions"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportOptionsStruct.containerFormat", "containerFormat", + value.isMember("containerFormat"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportOptionsStruct.containerOptions", "containerOptions", + value.isMember("containerOptions"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "streamType"); @@ -6744,9 +6772,9 @@ CHIP_ERROR ComplexArgumentParser::Setup( } valueCopy.removeMember("audioStreamID"); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "TLSEndpointID"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.TLSEndpointID, value["TLSEndpointID"])); - valueCopy.removeMember("TLSEndpointID"); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "endpointID"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.endpointID, value["endpointID"])); + valueCopy.removeMember("endpointID"); snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "url"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.url, value["url"])); @@ -6756,14 +6784,14 @@ CHIP_ERROR ComplexArgumentParser::Setup( ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.triggerOptions, value["triggerOptions"])); valueCopy.removeMember("triggerOptions"); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "containerFormat"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.containerFormat, value["containerFormat"])); - valueCopy.removeMember("containerFormat"); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "ingestMethod"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.ingestMethod, value["ingestMethod"])); valueCopy.removeMember("ingestMethod"); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "containerFormat"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.containerFormat, value["containerFormat"])); + valueCopy.removeMember("containerFormat"); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "containerOptions"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.containerOptions, value["containerOptions"])); valueCopy.removeMember("containerOptions"); @@ -6785,17 +6813,16 @@ CHIP_ERROR ComplexArgumentParser::Setup( return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize( - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportOptionsStruct::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::TransportOptionsStruct::Type & request) { ComplexArgumentParser::Finalize(request.streamType); ComplexArgumentParser::Finalize(request.videoStreamID); ComplexArgumentParser::Finalize(request.audioStreamID); - ComplexArgumentParser::Finalize(request.TLSEndpointID); + ComplexArgumentParser::Finalize(request.endpointID); ComplexArgumentParser::Finalize(request.url); ComplexArgumentParser::Finalize(request.triggerOptions); - ComplexArgumentParser::Finalize(request.containerFormat); ComplexArgumentParser::Finalize(request.ingestMethod); + ComplexArgumentParser::Finalize(request.containerFormat); ComplexArgumentParser::Finalize(request.containerOptions); ComplexArgumentParser::Finalize(request.metadataOptions); ComplexArgumentParser::Finalize(request.expiryTime); @@ -6803,7 +6830,7 @@ void ComplexArgumentParser::Finalize( CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamConfigurationStruct::Type & request, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportConfigurationStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -6811,38 +6838,35 @@ ComplexArgumentParser::Setup(const char * label, // Copy to track which members we already processed. Json::Value valueCopy(value); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamConfigurationStruct.connectionID", "connectionID", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportConfigurationStruct.connectionID", "connectionID", value.isMember("connectionID"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist( - "PushAVStreamConfigurationStruct.streamTransportStatus", "streamTransportStatus", value.isMember("streamTransportStatus"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("PushAVStreamConfigurationStruct.streamTransportOptions", - "streamTransportOptions", - value.isMember("streamTransportOptions"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportConfigurationStruct.transportStatus", "transportStatus", + value.isMember("transportStatus"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TransportConfigurationStruct.transportOptions", + "transportOptions", value.isMember("transportOptions"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "connectionID"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.connectionID, value["connectionID"])); valueCopy.removeMember("connectionID"); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "streamTransportStatus"); - ReturnErrorOnFailure( - ComplexArgumentParser::Setup(labelWithMember, request.streamTransportStatus, value["streamTransportStatus"])); - valueCopy.removeMember("streamTransportStatus"); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "transportStatus"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.transportStatus, value["transportStatus"])); + valueCopy.removeMember("transportStatus"); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "streamTransportOptions"); - ReturnErrorOnFailure( - ComplexArgumentParser::Setup(labelWithMember, request.streamTransportOptions, value["streamTransportOptions"])); - valueCopy.removeMember("streamTransportOptions"); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "transportOptions"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.transportOptions, value["transportOptions"])); + valueCopy.removeMember("transportOptions"); return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } void ComplexArgumentParser::Finalize( - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamConfigurationStruct::Type & request) + chip::app::Clusters::PushAvStreamTransport::Structs::TransportConfigurationStruct::Type & request) { ComplexArgumentParser::Finalize(request.connectionID); - ComplexArgumentParser::Finalize(request.streamTransportStatus); - ComplexArgumentParser::Finalize(request.streamTransportOptions); + ComplexArgumentParser::Finalize(request.transportStatus); + ComplexArgumentParser::Finalize(request.transportOptions); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Chime::Structs::ChimeSoundStruct::Type & request, diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index d1aadb58e01682..c2d71da03e6227 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -743,55 +743,52 @@ static void Finalize(chip::app::Clusters::CameraAvStreamManagement::Structs::Vid static CHIP_ERROR Setup(const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMotionTriggerTimeControlStruct::Type & request, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportMotionTriggerTimeControlStruct::Type & request, Json::Value & value); -static void -Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMotionTriggerTimeControlStruct::Type & request); +static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::TransportMotionTriggerTimeControlStruct::Type & request); -static CHIP_ERROR -Setup(const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMetadataOptionsStruct::Type & request, - Json::Value & value); +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportZoneOptionsStruct::Type & request, + Json::Value & value); -static void -Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMetadataOptionsStruct::Type & request); +static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::TransportZoneOptionsStruct::Type & request); -static CHIP_ERROR -Setup(const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportTriggerOptionsStruct::Type & request, - Json::Value & value); +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::MetadataOptionsStruct::Type & request, + Json::Value & value); -static void -Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportTriggerOptionsStruct::Type & request); +static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::MetadataOptionsStruct::Type & request); -static CHIP_ERROR -Setup(const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportCMAFContainerOptionsStruct::Type & request, - Json::Value & value); +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportTriggerOptionsStruct::Type & request, + Json::Value & value); -static void -Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportCMAFContainerOptionsStruct::Type & request); +static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::TransportTriggerOptionsStruct::Type & request); -static CHIP_ERROR -Setup(const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportContainerOptionsStruct::Type & request, - Json::Value & value); +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::CMAFContainerOptionsStruct::Type & request, + Json::Value & value); + +static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::CMAFContainerOptionsStruct::Type & request); + +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::PushAvStreamTransport::Structs::ContainerOptionsStruct::Type & request, + Json::Value & value); -static void -Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportContainerOptionsStruct::Type & request); +static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::ContainerOptionsStruct::Type & request); static CHIP_ERROR Setup(const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportOptionsStruct::Type & request, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportOptionsStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportOptionsStruct::Type & request); +static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::TransportOptionsStruct::Type & request); static CHIP_ERROR Setup(const char * label, - chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamConfigurationStruct::Type & request, + chip::app::Clusters::PushAvStreamTransport::Structs::TransportConfigurationStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamConfigurationStruct::Type & request); +static void Finalize(chip::app::Clusters::PushAvStreamTransport::Structs::TransportConfigurationStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Chime::Structs::ChimeSoundStruct::Type & request, Json::Value & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index d53b95eff2bdd3..1a4966649f6ed6 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -5754,8 +5754,7 @@ CHIP_ERROR DataModelLogger::LogValue( CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMotionTriggerTimeControlStruct::DecodableType & - value) + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportMotionTriggerTimeControlStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -5797,7 +5796,33 @@ CHIP_ERROR DataModelLogger::LogValue( CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMetadataOptionsStruct::DecodableType & value) + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportZoneOptionsStruct::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); + { + CHIP_ERROR err = LogValue("Zone", indent + 1, value.zone); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Zone'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("Sensitivity", indent + 1, value.sensitivity); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Sensitivity'"); + return err; + } + } + DataModelLogger::LogString(indent, "}"); + + return CHIP_NO_ERROR; +} + +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::PushAvStreamTransport::Structs::MetadataOptionsStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -5831,7 +5856,7 @@ CHIP_ERROR DataModelLogger::LogValue( CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportTriggerOptionsStruct::DecodableType & value) + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportTriggerOptionsStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -5867,10 +5892,10 @@ CHIP_ERROR DataModelLogger::LogValue( } } { - CHIP_ERROR err = LogValue("ActivationReason", indent + 1, value.activationReason); + CHIP_ERROR err = LogValue("MaxPreRollLen", indent + 1, value.maxPreRollLen); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ActivationReason'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'MaxPreRollLen'"); return err; } } @@ -5881,8 +5906,7 @@ CHIP_ERROR DataModelLogger::LogValue( CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportCMAFContainerOptionsStruct::DecodableType & - value) + const chip::app::Clusters::PushAvStreamTransport::Structs::CMAFContainerOptionsStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -5906,9 +5930,9 @@ CHIP_ERROR DataModelLogger::LogValue( return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue( - const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportContainerOptionsStruct::DecodableType & value) +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::PushAvStreamTransport::Structs::ContainerOptionsStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -5932,9 +5956,9 @@ CHIP_ERROR DataModelLogger::LogValue( return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue( - const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportOptionsStruct::DecodableType & value) +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportOptionsStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -5962,10 +5986,10 @@ CHIP_ERROR DataModelLogger::LogValue( } } { - CHIP_ERROR err = LogValue("TLSEndpointID", indent + 1, value.TLSEndpointID); + CHIP_ERROR err = LogValue("EndpointID", indent + 1, value.endpointID); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TLSEndpointID'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'EndpointID'"); return err; } } @@ -5986,18 +6010,18 @@ CHIP_ERROR DataModelLogger::LogValue( } } { - CHIP_ERROR err = LogValue("ContainerFormat", indent + 1, value.containerFormat); + CHIP_ERROR err = LogValue("IngestMethod", indent + 1, value.ingestMethod); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ContainerFormat'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'IngestMethod'"); return err; } } { - CHIP_ERROR err = LogValue("IngestMethod", indent + 1, value.ingestMethod); + CHIP_ERROR err = LogValue("ContainerFormat", indent + 1, value.containerFormat); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'IngestMethod'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ContainerFormat'"); return err; } } @@ -6032,7 +6056,7 @@ CHIP_ERROR DataModelLogger::LogValue( CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamConfigurationStruct::DecodableType & value) + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportConfigurationStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -6044,18 +6068,18 @@ CHIP_ERROR DataModelLogger::LogValue( } } { - CHIP_ERROR err = LogValue("StreamTransportStatus", indent + 1, value.streamTransportStatus); + CHIP_ERROR err = LogValue("TransportStatus", indent + 1, value.transportStatus); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'StreamTransportStatus'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TransportStatus'"); return err; } } { - CHIP_ERROR err = LogValue("StreamTransportOptions", indent + 1, value.streamTransportOptions); + CHIP_ERROR err = LogValue("TransportOptions", indent + 1, value.transportOptions); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'StreamTransportOptions'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TransportOptions'"); return err; } } @@ -9264,6 +9288,30 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const PushAvStreamTransport::Events::PushTransportBegin::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); + { + CHIP_ERROR err = DataModelLogger::LogValue("ConnectionID", indent + 1, value.connectionID); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ConnectionID'"); + return err; + } + } + { + CHIP_ERROR err = DataModelLogger::LogValue("TriggerType", indent + 1, value.triggerType); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TriggerType'"); + return err; + } + } + { + CHIP_ERROR err = DataModelLogger::LogValue("ActivationReason", indent + 1, value.activationReason); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ActivationReason'"); + return err; + } + } DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; @@ -9281,10 +9329,18 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, } } { - CHIP_ERROR err = DataModelLogger::LogValue("TriggerDetails", indent + 1, value.triggerDetails); + CHIP_ERROR err = DataModelLogger::LogValue("TriggerType", indent + 1, value.triggerType); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TriggerType'"); + return err; + } + } + { + CHIP_ERROR err = DataModelLogger::LogValue("ActivationReason", indent + 1, value.activationReason); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TriggerDetails'"); + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ActivationReason'"); return err; } } @@ -10189,13 +10245,13 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("connectionID", indent + 1, value.connectionID)); - ReturnErrorOnFailure(DataModelLogger::LogValue("streamTransportOptions", indent + 1, value.streamTransportOptions)); + ReturnErrorOnFailure(DataModelLogger::LogValue("transportOptions", indent + 1, value.transportOptions)); ReturnErrorOnFailure(DataModelLogger::LogValue("transportStatus", indent + 1, value.transportStatus)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const PushAvStreamTransport::Commands::FindStreamConfigurationResponse::DecodableType & value) + const PushAvStreamTransport::Commands::FindTransportResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("streamConfigurations", indent + 1, value.streamConfigurations)); @@ -19174,12 +19230,12 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP switch (path.mAttributeId) { case PushAvStreamTransport::Attributes::SupportedContainerFormats::Id: { - chip::BitMask value; + chip::BitMask value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedContainerFormats", 1, value); } case PushAvStreamTransport::Attributes::SupportedIngestMethods::Id: { - chip::BitMask value; + chip::BitMask value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedIngestMethods", 1, value); } @@ -20559,10 +20615,10 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AllocatePushTransportResponse", 1, value); } - case PushAvStreamTransport::Commands::FindStreamConfigurationResponse::Id: { - PushAvStreamTransport::Commands::FindStreamConfigurationResponse::DecodableType value; + case PushAvStreamTransport::Commands::FindTransportResponse::Id: { + PushAvStreamTransport::Commands::FindTransportResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("FindStreamConfigurationResponse", 1, value); + return DataModelLogger::LogValue("FindTransportResponse", 1, value); } } break; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 1f5741fdfee66f..d24042c64123ca 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -455,35 +455,36 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::CameraAvStreamManagement::Structs::VideoSensorParamsStruct::DecodableType & value); -static CHIP_ERROR LogValue( - const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMotionTriggerTimeControlStruct::DecodableType & - value); +static CHIP_ERROR +LogValue(const char * label, size_t indent, + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportMotionTriggerTimeControlStruct::DecodableType & value); -static CHIP_ERROR LogValue( - const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportMetadataOptionsStruct::DecodableType & value); +static CHIP_ERROR +LogValue(const char * label, size_t indent, + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportZoneOptionsStruct::DecodableType & value); -static CHIP_ERROR LogValue( - const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportTriggerOptionsStruct::DecodableType & value); +static CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::PushAvStreamTransport::Structs::MetadataOptionsStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportCMAFContainerOptionsStruct::DecodableType & - value); + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportTriggerOptionsStruct::DecodableType & value); -static CHIP_ERROR LogValue( - const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportContainerOptionsStruct::DecodableType & value); +static CHIP_ERROR +LogValue(const char * label, size_t indent, + const chip::app::Clusters::PushAvStreamTransport::Structs::CMAFContainerOptionsStruct::DecodableType & value); + +static CHIP_ERROR +LogValue(const char * label, size_t indent, + const chip::app::Clusters::PushAvStreamTransport::Structs::ContainerOptionsStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamTransportOptionsStruct::DecodableType & value); + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportOptionsStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Structs::PushAVStreamConfigurationStruct::DecodableType & value); + const chip::app::Clusters::PushAvStreamTransport::Structs::TransportConfigurationStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Chime::Structs::ChimeSoundStruct::DecodableType & value); @@ -972,7 +973,7 @@ LogValue(const char * label, size_t indent, const chip::app::Clusters::PushAvStreamTransport::Commands::AllocatePushTransportResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfigurationResponse::DecodableType & value); + const chip::app::Clusters::PushAvStreamTransport::Commands::FindTransportResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::CommissionerControl::Commands::ReverseOpenCommissioningWindow::DecodableType & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp index 600577d852914e..66ad8228711630 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp @@ -5752,8 +5752,8 @@ char const * AcceptedCommandIdToText(chip::ClusterId cluster, chip::CommandId id return "SetTransportStatus"; case chip::app::Clusters::PushAvStreamTransport::Commands::ManuallyTriggerTransport::Id: return "ManuallyTriggerTransport"; - case chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfiguration::Id: - return "FindStreamConfiguration"; + case chip::app::Clusters::PushAvStreamTransport::Commands::FindTransport::Id: + return "FindTransport"; default: return "Unknown"; } @@ -6332,8 +6332,8 @@ char const * GeneratedCommandIdToText(chip::ClusterId cluster, chip::CommandId i { case chip::app::Clusters::PushAvStreamTransport::Commands::AllocatePushTransportResponse::Id: return "AllocatePushTransportResponse"; - case chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfigurationResponse::Id: - return "FindStreamConfigurationResponse"; + case chip::app::Clusters::PushAvStreamTransport::Commands::FindTransportResponse::Id: + return "FindTransportResponse"; default: return "Unknown"; } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 1b7a6c94f91b71..44d3130aa1e6a6 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -156298,7 +156298,7 @@ class SubscribeAttributeWebRTCTransportRequestorClusterRevision : public Subscri | * ModifyPushTransport | 0x03 | | * SetTransportStatus | 0x04 | | * ManuallyTriggerTransport | 0x05 | -| * FindStreamConfiguration | 0x06 | +| * FindTransport | 0x06 | |------------------------------------------------------------------------------| | Attributes: | | | * SupportedContainerFormats | 0x0000 | @@ -156323,10 +156323,10 @@ class PushAvStreamTransportAllocatePushTransport : public ClusterCommand { public: PushAvStreamTransportAllocatePushTransport() : ClusterCommand("allocate-push-transport") - , mComplex_StreamTransportOptions(&mRequest.streamTransportOptions) + , mComplex_TransportOptions(&mRequest.transportOptions) { #if MTR_ENABLE_PROVISIONAL - AddArgument("StreamTransportOptions", &mComplex_StreamTransportOptions); + AddArgument("TransportOptions", &mComplex_TransportOptions); #endif // MTR_ENABLE_PROVISIONAL ClusterCommand::AddArguments(); } @@ -156343,121 +156343,115 @@ class PushAvStreamTransportAllocatePushTransport : public ClusterCommand { __auto_type * params = [[MTRPushAVStreamTransportClusterAllocatePushTransportParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL - params.streamTransportOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct new]; - params.streamTransportOptions.streamType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.streamType)]; - if (mRequest.streamTransportOptions.videoStreamID.HasValue()) { - if (mRequest.streamTransportOptions.videoStreamID.Value().IsNull()) { - params.streamTransportOptions.videoStreamID = nil; - } else { - params.streamTransportOptions.videoStreamID = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.videoStreamID.Value().Value()]; - } + params.transportOptions = [MTRPushAVStreamTransportClusterTransportOptionsStruct new]; + params.transportOptions.streamType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.streamType)]; + if (mRequest.transportOptions.videoStreamID.HasValue()) { + params.transportOptions.videoStreamID = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.videoStreamID.Value()]; } else { - params.streamTransportOptions.videoStreamID = nil; + params.transportOptions.videoStreamID = nil; } - if (mRequest.streamTransportOptions.audioStreamID.HasValue()) { - if (mRequest.streamTransportOptions.audioStreamID.Value().IsNull()) { - params.streamTransportOptions.audioStreamID = nil; - } else { - params.streamTransportOptions.audioStreamID = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.audioStreamID.Value().Value()]; - } + if (mRequest.transportOptions.audioStreamID.HasValue()) { + params.transportOptions.audioStreamID = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.audioStreamID.Value()]; } else { - params.streamTransportOptions.audioStreamID = nil; + params.transportOptions.audioStreamID = nil; } - params.streamTransportOptions.tlsEndpointID = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.TLSEndpointID]; - params.streamTransportOptions.url = [[NSString alloc] initWithBytes:mRequest.streamTransportOptions.url.data() length:mRequest.streamTransportOptions.url.size() encoding:NSUTF8StringEncoding]; - params.streamTransportOptions.triggerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct new]; - params.streamTransportOptions.triggerOptions.triggerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.triggerOptions.triggerType)]; - if (mRequest.streamTransportOptions.triggerOptions.motionZones.HasValue()) { - if (mRequest.streamTransportOptions.triggerOptions.motionZones.Value().IsNull()) { - params.streamTransportOptions.triggerOptions.motionZones = nil; + params.transportOptions.endpointID = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.endpointID]; + params.transportOptions.url = [[NSString alloc] initWithBytes:mRequest.transportOptions.url.data() length:mRequest.transportOptions.url.size() encoding:NSUTF8StringEncoding]; + params.transportOptions.triggerOptions = [MTRPushAVStreamTransportClusterTransportTriggerOptionsStruct new]; + params.transportOptions.triggerOptions.triggerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.triggerOptions.triggerType)]; + if (mRequest.transportOptions.triggerOptions.motionZones.HasValue()) { + if (mRequest.transportOptions.triggerOptions.motionZones.Value().IsNull()) { + params.transportOptions.triggerOptions.motionZones = nil; } else { { // Scope for our temporary variables auto * array_4 = [NSMutableArray new]; - for (auto & entry_4 : mRequest.streamTransportOptions.triggerOptions.motionZones.Value().Value()) { - NSNumber * newElement_4; - newElement_4 = [NSNumber numberWithUnsignedShort:entry_4]; + for (auto & entry_4 : mRequest.transportOptions.triggerOptions.motionZones.Value().Value()) { + MTRPushAVStreamTransportClusterTransportZoneOptionsStruct * newElement_4; + newElement_4 = [MTRPushAVStreamTransportClusterTransportZoneOptionsStruct new]; + if (entry_4.zone.IsNull()) { + newElement_4.zone = nil; + } else { + newElement_4.zone = [NSNumber numberWithUnsignedShort:entry_4.zone.Value()]; + } + if (entry_4.sensitivity.HasValue()) { + newElement_4.sensitivity = [NSNumber numberWithUnsignedChar:entry_4.sensitivity.Value()]; + } else { + newElement_4.sensitivity = nil; + } [array_4 addObject:newElement_4]; } - params.streamTransportOptions.triggerOptions.motionZones = array_4; + params.transportOptions.triggerOptions.motionZones = array_4; } } } else { - params.streamTransportOptions.triggerOptions.motionZones = nil; + params.transportOptions.triggerOptions.motionZones = nil; } - if (mRequest.streamTransportOptions.triggerOptions.motionSensitivity.HasValue()) { - if (mRequest.streamTransportOptions.triggerOptions.motionSensitivity.Value().IsNull()) { - params.streamTransportOptions.triggerOptions.motionSensitivity = nil; + if (mRequest.transportOptions.triggerOptions.motionSensitivity.HasValue()) { + if (mRequest.transportOptions.triggerOptions.motionSensitivity.Value().IsNull()) { + params.transportOptions.triggerOptions.motionSensitivity = nil; } else { - params.streamTransportOptions.triggerOptions.motionSensitivity = [NSNumber numberWithUnsignedChar:mRequest.streamTransportOptions.triggerOptions.motionSensitivity.Value().Value()]; + params.transportOptions.triggerOptions.motionSensitivity = [NSNumber numberWithUnsignedChar:mRequest.transportOptions.triggerOptions.motionSensitivity.Value().Value()]; } } else { - params.streamTransportOptions.triggerOptions.motionSensitivity = nil; - } - if (mRequest.streamTransportOptions.triggerOptions.motionTimeControl.HasValue()) { - if (mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().IsNull()) { - params.streamTransportOptions.triggerOptions.motionTimeControl = nil; - } else { - params.streamTransportOptions.triggerOptions.motionTimeControl = [MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct new]; - params.streamTransportOptions.triggerOptions.motionTimeControl.initialDuration = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().initialDuration]; - params.streamTransportOptions.triggerOptions.motionTimeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().augmentationDuration]; - params.streamTransportOptions.triggerOptions.motionTimeControl.maxDuration = [NSNumber numberWithUnsignedInt:mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().maxDuration]; - params.streamTransportOptions.triggerOptions.motionTimeControl.blindDuration = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().blindDuration]; - } + params.transportOptions.triggerOptions.motionSensitivity = nil; + } + if (mRequest.transportOptions.triggerOptions.motionTimeControl.HasValue()) { + params.transportOptions.triggerOptions.motionTimeControl = [MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct new]; + params.transportOptions.triggerOptions.motionTimeControl.initialDuration = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.triggerOptions.motionTimeControl.Value().initialDuration]; + params.transportOptions.triggerOptions.motionTimeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.triggerOptions.motionTimeControl.Value().augmentationDuration]; + params.transportOptions.triggerOptions.motionTimeControl.maxDuration = [NSNumber numberWithUnsignedInt:mRequest.transportOptions.triggerOptions.motionTimeControl.Value().maxDuration]; + params.transportOptions.triggerOptions.motionTimeControl.blindDuration = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.triggerOptions.motionTimeControl.Value().blindDuration]; } else { - params.streamTransportOptions.triggerOptions.motionTimeControl = nil; + params.transportOptions.triggerOptions.motionTimeControl = nil; } - if (mRequest.streamTransportOptions.triggerOptions.activationReason.HasValue()) { - if (mRequest.streamTransportOptions.triggerOptions.activationReason.Value().IsNull()) { - params.streamTransportOptions.triggerOptions.activationReason = nil; - } else { - params.streamTransportOptions.triggerOptions.activationReason = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.triggerOptions.activationReason.Value().Value())]; - } + if (mRequest.transportOptions.triggerOptions.maxPreRollLen.HasValue()) { + params.transportOptions.triggerOptions.maxPreRollLen = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.triggerOptions.maxPreRollLen.Value()]; } else { - params.streamTransportOptions.triggerOptions.activationReason = nil; - } - params.streamTransportOptions.containerFormat = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.containerFormat)]; - params.streamTransportOptions.ingestMethod = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.ingestMethod)]; - params.streamTransportOptions.containerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportContainerOptionsStruct new]; - params.streamTransportOptions.containerOptions.containerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.containerOptions.containerType)]; - if (mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.HasValue()) { - if (mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().IsNull()) { - params.streamTransportOptions.containerOptions.cmafContainerOptions = nil; - } else { - params.streamTransportOptions.containerOptions.cmafContainerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct new]; - params.streamTransportOptions.containerOptions.cmafContainerOptions.chunkDuration = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().chunkDuration]; - if (mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.HasValue()) { - if (mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().IsNull()) { - params.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = nil; + params.transportOptions.triggerOptions.maxPreRollLen = nil; + } + params.transportOptions.ingestMethod = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.ingestMethod)]; + params.transportOptions.containerFormat = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.containerFormat)]; + params.transportOptions.containerOptions = [MTRPushAVStreamTransportClusterContainerOptionsStruct new]; + params.transportOptions.containerOptions.containerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.containerOptions.containerType)]; + if (mRequest.transportOptions.containerOptions.CMAFContainerOptions.HasValue()) { + if (mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().IsNull()) { + params.transportOptions.containerOptions.cmafContainerOptions = nil; + } else { + params.transportOptions.containerOptions.cmafContainerOptions = [MTRPushAVStreamTransportClusterCMAFContainerOptionsStruct new]; + params.transportOptions.containerOptions.cmafContainerOptions.chunkDuration = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().chunkDuration]; + if (mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.HasValue()) { + if (mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().IsNull()) { + params.transportOptions.containerOptions.cmafContainerOptions.cencKey = nil; } else { - params.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = [NSData dataWithBytes:mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value().data() length:mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value().size()]; + params.transportOptions.containerOptions.cmafContainerOptions.cencKey = [NSData dataWithBytes:mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value().data() length:mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value().size()]; } } else { - params.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = nil; + params.transportOptions.containerOptions.cmafContainerOptions.cencKey = nil; } } } else { - params.streamTransportOptions.containerOptions.cmafContainerOptions = nil; + params.transportOptions.containerOptions.cmafContainerOptions = nil; } - if (mRequest.streamTransportOptions.metadataOptions.HasValue()) { - if (mRequest.streamTransportOptions.metadataOptions.Value().IsNull()) { - params.streamTransportOptions.metadataOptions = nil; + if (mRequest.transportOptions.metadataOptions.HasValue()) { + if (mRequest.transportOptions.metadataOptions.Value().IsNull()) { + params.transportOptions.metadataOptions = nil; } else { - params.streamTransportOptions.metadataOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct new]; - params.streamTransportOptions.metadataOptions.multiplexing = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.metadataOptions.Value().Value().multiplexing)]; - params.streamTransportOptions.metadataOptions.includeMotionZones = [NSNumber numberWithBool:mRequest.streamTransportOptions.metadataOptions.Value().Value().includeMotionZones]; - params.streamTransportOptions.metadataOptions.enableMetadataPrivacySensitive = [NSNumber numberWithBool:mRequest.streamTransportOptions.metadataOptions.Value().Value().enableMetadataPrivacySensitive]; + params.transportOptions.metadataOptions = [MTRPushAVStreamTransportClusterMetadataOptionsStruct new]; + params.transportOptions.metadataOptions.multiplexing = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.metadataOptions.Value().Value().multiplexing)]; + params.transportOptions.metadataOptions.includeMotionZones = [NSNumber numberWithBool:mRequest.transportOptions.metadataOptions.Value().Value().includeMotionZones]; + params.transportOptions.metadataOptions.enableMetadataPrivacySensitive = [NSNumber numberWithBool:mRequest.transportOptions.metadataOptions.Value().Value().enableMetadataPrivacySensitive]; } } else { - params.streamTransportOptions.metadataOptions = nil; + params.transportOptions.metadataOptions = nil; } - if (mRequest.streamTransportOptions.expiryTime.HasValue()) { - if (mRequest.streamTransportOptions.expiryTime.Value().IsNull()) { - params.streamTransportOptions.expiryTime = nil; + if (mRequest.transportOptions.expiryTime.HasValue()) { + if (mRequest.transportOptions.expiryTime.Value().IsNull()) { + params.transportOptions.expiryTime = nil; } else { - params.streamTransportOptions.expiryTime = [NSNumber numberWithUnsignedInt:mRequest.streamTransportOptions.expiryTime.Value().Value()]; + params.transportOptions.expiryTime = [NSNumber numberWithUnsignedInt:mRequest.transportOptions.expiryTime.Value().Value()]; } } else { - params.streamTransportOptions.expiryTime = nil; + params.transportOptions.expiryTime = nil; } #endif // MTR_ENABLE_PROVISIONAL uint16_t repeatCount = mRepeatCount.ValueOr(1); @@ -156487,7 +156481,7 @@ class PushAvStreamTransportAllocatePushTransport : public ClusterCommand { private: chip::app::Clusters::PushAvStreamTransport::Commands::AllocatePushTransport::Type mRequest; - TypedComplexArgument mComplex_StreamTransportOptions; + TypedComplexArgument mComplex_TransportOptions; }; #endif // MTR_ENABLE_PROVISIONAL @@ -156552,13 +156546,13 @@ class PushAvStreamTransportModifyPushTransport : public ClusterCommand { public: PushAvStreamTransportModifyPushTransport() : ClusterCommand("modify-push-transport") - , mComplex_StreamTransportOptions(&mRequest.streamTransportOptions) + , mComplex_TransportOptions(&mRequest.transportOptions) { #if MTR_ENABLE_PROVISIONAL AddArgument("ConnectionID", 0, UINT16_MAX, &mRequest.connectionID); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - AddArgument("StreamTransportOptions", &mComplex_StreamTransportOptions); + AddArgument("TransportOptions", &mComplex_TransportOptions); #endif // MTR_ENABLE_PROVISIONAL ClusterCommand::AddArguments(); } @@ -156578,121 +156572,115 @@ class PushAvStreamTransportModifyPushTransport : public ClusterCommand { params.connectionID = [NSNumber numberWithUnsignedShort:mRequest.connectionID]; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - params.streamTransportOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportOptionsStruct new]; - params.streamTransportOptions.streamType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.streamType)]; - if (mRequest.streamTransportOptions.videoStreamID.HasValue()) { - if (mRequest.streamTransportOptions.videoStreamID.Value().IsNull()) { - params.streamTransportOptions.videoStreamID = nil; - } else { - params.streamTransportOptions.videoStreamID = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.videoStreamID.Value().Value()]; - } + params.transportOptions = [MTRPushAVStreamTransportClusterTransportOptionsStruct new]; + params.transportOptions.streamType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.streamType)]; + if (mRequest.transportOptions.videoStreamID.HasValue()) { + params.transportOptions.videoStreamID = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.videoStreamID.Value()]; } else { - params.streamTransportOptions.videoStreamID = nil; + params.transportOptions.videoStreamID = nil; } - if (mRequest.streamTransportOptions.audioStreamID.HasValue()) { - if (mRequest.streamTransportOptions.audioStreamID.Value().IsNull()) { - params.streamTransportOptions.audioStreamID = nil; - } else { - params.streamTransportOptions.audioStreamID = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.audioStreamID.Value().Value()]; - } + if (mRequest.transportOptions.audioStreamID.HasValue()) { + params.transportOptions.audioStreamID = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.audioStreamID.Value()]; } else { - params.streamTransportOptions.audioStreamID = nil; + params.transportOptions.audioStreamID = nil; } - params.streamTransportOptions.tlsEndpointID = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.TLSEndpointID]; - params.streamTransportOptions.url = [[NSString alloc] initWithBytes:mRequest.streamTransportOptions.url.data() length:mRequest.streamTransportOptions.url.size() encoding:NSUTF8StringEncoding]; - params.streamTransportOptions.triggerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportTriggerOptionsStruct new]; - params.streamTransportOptions.triggerOptions.triggerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.triggerOptions.triggerType)]; - if (mRequest.streamTransportOptions.triggerOptions.motionZones.HasValue()) { - if (mRequest.streamTransportOptions.triggerOptions.motionZones.Value().IsNull()) { - params.streamTransportOptions.triggerOptions.motionZones = nil; + params.transportOptions.endpointID = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.endpointID]; + params.transportOptions.url = [[NSString alloc] initWithBytes:mRequest.transportOptions.url.data() length:mRequest.transportOptions.url.size() encoding:NSUTF8StringEncoding]; + params.transportOptions.triggerOptions = [MTRPushAVStreamTransportClusterTransportTriggerOptionsStruct new]; + params.transportOptions.triggerOptions.triggerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.triggerOptions.triggerType)]; + if (mRequest.transportOptions.triggerOptions.motionZones.HasValue()) { + if (mRequest.transportOptions.triggerOptions.motionZones.Value().IsNull()) { + params.transportOptions.triggerOptions.motionZones = nil; } else { { // Scope for our temporary variables auto * array_4 = [NSMutableArray new]; - for (auto & entry_4 : mRequest.streamTransportOptions.triggerOptions.motionZones.Value().Value()) { - NSNumber * newElement_4; - newElement_4 = [NSNumber numberWithUnsignedShort:entry_4]; + for (auto & entry_4 : mRequest.transportOptions.triggerOptions.motionZones.Value().Value()) { + MTRPushAVStreamTransportClusterTransportZoneOptionsStruct * newElement_4; + newElement_4 = [MTRPushAVStreamTransportClusterTransportZoneOptionsStruct new]; + if (entry_4.zone.IsNull()) { + newElement_4.zone = nil; + } else { + newElement_4.zone = [NSNumber numberWithUnsignedShort:entry_4.zone.Value()]; + } + if (entry_4.sensitivity.HasValue()) { + newElement_4.sensitivity = [NSNumber numberWithUnsignedChar:entry_4.sensitivity.Value()]; + } else { + newElement_4.sensitivity = nil; + } [array_4 addObject:newElement_4]; } - params.streamTransportOptions.triggerOptions.motionZones = array_4; + params.transportOptions.triggerOptions.motionZones = array_4; } } } else { - params.streamTransportOptions.triggerOptions.motionZones = nil; + params.transportOptions.triggerOptions.motionZones = nil; } - if (mRequest.streamTransportOptions.triggerOptions.motionSensitivity.HasValue()) { - if (mRequest.streamTransportOptions.triggerOptions.motionSensitivity.Value().IsNull()) { - params.streamTransportOptions.triggerOptions.motionSensitivity = nil; + if (mRequest.transportOptions.triggerOptions.motionSensitivity.HasValue()) { + if (mRequest.transportOptions.triggerOptions.motionSensitivity.Value().IsNull()) { + params.transportOptions.triggerOptions.motionSensitivity = nil; } else { - params.streamTransportOptions.triggerOptions.motionSensitivity = [NSNumber numberWithUnsignedChar:mRequest.streamTransportOptions.triggerOptions.motionSensitivity.Value().Value()]; + params.transportOptions.triggerOptions.motionSensitivity = [NSNumber numberWithUnsignedChar:mRequest.transportOptions.triggerOptions.motionSensitivity.Value().Value()]; } } else { - params.streamTransportOptions.triggerOptions.motionSensitivity = nil; - } - if (mRequest.streamTransportOptions.triggerOptions.motionTimeControl.HasValue()) { - if (mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().IsNull()) { - params.streamTransportOptions.triggerOptions.motionTimeControl = nil; - } else { - params.streamTransportOptions.triggerOptions.motionTimeControl = [MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct new]; - params.streamTransportOptions.triggerOptions.motionTimeControl.initialDuration = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().initialDuration]; - params.streamTransportOptions.triggerOptions.motionTimeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().augmentationDuration]; - params.streamTransportOptions.triggerOptions.motionTimeControl.maxDuration = [NSNumber numberWithUnsignedInt:mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().maxDuration]; - params.streamTransportOptions.triggerOptions.motionTimeControl.blindDuration = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.triggerOptions.motionTimeControl.Value().Value().blindDuration]; - } + params.transportOptions.triggerOptions.motionSensitivity = nil; + } + if (mRequest.transportOptions.triggerOptions.motionTimeControl.HasValue()) { + params.transportOptions.triggerOptions.motionTimeControl = [MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct new]; + params.transportOptions.triggerOptions.motionTimeControl.initialDuration = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.triggerOptions.motionTimeControl.Value().initialDuration]; + params.transportOptions.triggerOptions.motionTimeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.triggerOptions.motionTimeControl.Value().augmentationDuration]; + params.transportOptions.triggerOptions.motionTimeControl.maxDuration = [NSNumber numberWithUnsignedInt:mRequest.transportOptions.triggerOptions.motionTimeControl.Value().maxDuration]; + params.transportOptions.triggerOptions.motionTimeControl.blindDuration = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.triggerOptions.motionTimeControl.Value().blindDuration]; } else { - params.streamTransportOptions.triggerOptions.motionTimeControl = nil; + params.transportOptions.triggerOptions.motionTimeControl = nil; } - if (mRequest.streamTransportOptions.triggerOptions.activationReason.HasValue()) { - if (mRequest.streamTransportOptions.triggerOptions.activationReason.Value().IsNull()) { - params.streamTransportOptions.triggerOptions.activationReason = nil; - } else { - params.streamTransportOptions.triggerOptions.activationReason = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.triggerOptions.activationReason.Value().Value())]; - } + if (mRequest.transportOptions.triggerOptions.maxPreRollLen.HasValue()) { + params.transportOptions.triggerOptions.maxPreRollLen = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.triggerOptions.maxPreRollLen.Value()]; } else { - params.streamTransportOptions.triggerOptions.activationReason = nil; - } - params.streamTransportOptions.containerFormat = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.containerFormat)]; - params.streamTransportOptions.ingestMethod = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.ingestMethod)]; - params.streamTransportOptions.containerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportContainerOptionsStruct new]; - params.streamTransportOptions.containerOptions.containerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.containerOptions.containerType)]; - if (mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.HasValue()) { - if (mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().IsNull()) { - params.streamTransportOptions.containerOptions.cmafContainerOptions = nil; - } else { - params.streamTransportOptions.containerOptions.cmafContainerOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportCMAFContainerOptionsStruct new]; - params.streamTransportOptions.containerOptions.cmafContainerOptions.chunkDuration = [NSNumber numberWithUnsignedShort:mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().chunkDuration]; - if (mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.HasValue()) { - if (mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().IsNull()) { - params.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = nil; + params.transportOptions.triggerOptions.maxPreRollLen = nil; + } + params.transportOptions.ingestMethod = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.ingestMethod)]; + params.transportOptions.containerFormat = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.containerFormat)]; + params.transportOptions.containerOptions = [MTRPushAVStreamTransportClusterContainerOptionsStruct new]; + params.transportOptions.containerOptions.containerType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.containerOptions.containerType)]; + if (mRequest.transportOptions.containerOptions.CMAFContainerOptions.HasValue()) { + if (mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().IsNull()) { + params.transportOptions.containerOptions.cmafContainerOptions = nil; + } else { + params.transportOptions.containerOptions.cmafContainerOptions = [MTRPushAVStreamTransportClusterCMAFContainerOptionsStruct new]; + params.transportOptions.containerOptions.cmafContainerOptions.chunkDuration = [NSNumber numberWithUnsignedShort:mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().chunkDuration]; + if (mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.HasValue()) { + if (mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().IsNull()) { + params.transportOptions.containerOptions.cmafContainerOptions.cencKey = nil; } else { - params.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = [NSData dataWithBytes:mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value().data() length:mRequest.streamTransportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value().size()]; + params.transportOptions.containerOptions.cmafContainerOptions.cencKey = [NSData dataWithBytes:mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value().data() length:mRequest.transportOptions.containerOptions.CMAFContainerOptions.Value().Value().CENCKey.Value().Value().size()]; } } else { - params.streamTransportOptions.containerOptions.cmafContainerOptions.cencKey = nil; + params.transportOptions.containerOptions.cmafContainerOptions.cencKey = nil; } } } else { - params.streamTransportOptions.containerOptions.cmafContainerOptions = nil; + params.transportOptions.containerOptions.cmafContainerOptions = nil; } - if (mRequest.streamTransportOptions.metadataOptions.HasValue()) { - if (mRequest.streamTransportOptions.metadataOptions.Value().IsNull()) { - params.streamTransportOptions.metadataOptions = nil; + if (mRequest.transportOptions.metadataOptions.HasValue()) { + if (mRequest.transportOptions.metadataOptions.Value().IsNull()) { + params.transportOptions.metadataOptions = nil; } else { - params.streamTransportOptions.metadataOptions = [MTRPushAVStreamTransportClusterPushAVStreamTransportMetadataOptionsStruct new]; - params.streamTransportOptions.metadataOptions.multiplexing = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportOptions.metadataOptions.Value().Value().multiplexing)]; - params.streamTransportOptions.metadataOptions.includeMotionZones = [NSNumber numberWithBool:mRequest.streamTransportOptions.metadataOptions.Value().Value().includeMotionZones]; - params.streamTransportOptions.metadataOptions.enableMetadataPrivacySensitive = [NSNumber numberWithBool:mRequest.streamTransportOptions.metadataOptions.Value().Value().enableMetadataPrivacySensitive]; + params.transportOptions.metadataOptions = [MTRPushAVStreamTransportClusterMetadataOptionsStruct new]; + params.transportOptions.metadataOptions.multiplexing = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportOptions.metadataOptions.Value().Value().multiplexing)]; + params.transportOptions.metadataOptions.includeMotionZones = [NSNumber numberWithBool:mRequest.transportOptions.metadataOptions.Value().Value().includeMotionZones]; + params.transportOptions.metadataOptions.enableMetadataPrivacySensitive = [NSNumber numberWithBool:mRequest.transportOptions.metadataOptions.Value().Value().enableMetadataPrivacySensitive]; } } else { - params.streamTransportOptions.metadataOptions = nil; + params.transportOptions.metadataOptions = nil; } - if (mRequest.streamTransportOptions.expiryTime.HasValue()) { - if (mRequest.streamTransportOptions.expiryTime.Value().IsNull()) { - params.streamTransportOptions.expiryTime = nil; + if (mRequest.transportOptions.expiryTime.HasValue()) { + if (mRequest.transportOptions.expiryTime.Value().IsNull()) { + params.transportOptions.expiryTime = nil; } else { - params.streamTransportOptions.expiryTime = [NSNumber numberWithUnsignedInt:mRequest.streamTransportOptions.expiryTime.Value().Value()]; + params.transportOptions.expiryTime = [NSNumber numberWithUnsignedInt:mRequest.transportOptions.expiryTime.Value().Value()]; } } else { - params.streamTransportOptions.expiryTime = nil; + params.transportOptions.expiryTime = nil; } #endif // MTR_ENABLE_PROVISIONAL uint16_t repeatCount = mRepeatCount.ValueOr(1); @@ -156716,7 +156704,7 @@ class PushAvStreamTransportModifyPushTransport : public ClusterCommand { private: chip::app::Clusters::PushAvStreamTransport::Commands::ModifyPushTransport::Type mRequest; - TypedComplexArgument mComplex_StreamTransportOptions; + TypedComplexArgument mComplex_TransportOptions; }; #endif // MTR_ENABLE_PROVISIONAL @@ -156733,7 +156721,7 @@ class PushAvStreamTransportSetTransportStatus : public ClusterCommand { AddArgument("ConnectionID", 0, UINT16_MAX, &mRequest.connectionID); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - AddArgument("StreamTransportStatus", 0, UINT8_MAX, &mRequest.streamTransportStatus); + AddArgument("TransportStatus", 0, UINT8_MAX, &mRequest.transportStatus); #endif // MTR_ENABLE_PROVISIONAL ClusterCommand::AddArguments(); } @@ -156757,7 +156745,7 @@ class PushAvStreamTransportSetTransportStatus : public ClusterCommand { } #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - params.streamTransportStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.streamTransportStatus)]; + params.transportStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.transportStatus)]; #endif // MTR_ENABLE_PROVISIONAL uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; @@ -156831,7 +156819,7 @@ class PushAvStreamTransportManuallyTriggerTransport : public ClusterCommand { if (mRequest.timeControl.Value().IsNull()) { params.timeControl = nil; } else { - params.timeControl = [MTRPushAVStreamTransportClusterPushAVStreamTransportMotionTriggerTimeControlStruct new]; + params.timeControl = [MTRPushAVStreamTransportClusterTransportMotionTriggerTimeControlStruct new]; params.timeControl.initialDuration = [NSNumber numberWithUnsignedShort:mRequest.timeControl.Value().Value().initialDuration]; params.timeControl.augmentationDuration = [NSNumber numberWithUnsignedShort:mRequest.timeControl.Value().Value().augmentationDuration]; params.timeControl.maxDuration = [NSNumber numberWithUnsignedInt:mRequest.timeControl.Value().Value().maxDuration]; @@ -156862,18 +156850,18 @@ class PushAvStreamTransportManuallyTriggerTransport : public ClusterCommand { private: chip::app::Clusters::PushAvStreamTransport::Commands::ManuallyTriggerTransport::Type mRequest; - TypedComplexArgument>> mComplex_TimeControl; + TypedComplexArgument>> mComplex_TimeControl; }; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL /* - * Command FindStreamConfiguration + * Command FindTransport */ -class PushAvStreamTransportFindStreamConfiguration : public ClusterCommand { +class PushAvStreamTransportFindTransport : public ClusterCommand { public: - PushAvStreamTransportFindStreamConfiguration() - : ClusterCommand("find-stream-configuration") + PushAvStreamTransportFindTransport() + : ClusterCommand("find-transport") { #if MTR_ENABLE_PROVISIONAL AddArgument("ConnectionID", 0, UINT16_MAX, &mRequest.connectionID); @@ -156884,13 +156872,13 @@ class PushAvStreamTransportFindStreamConfiguration : public ClusterCommand { CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::PushAvStreamTransport::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfiguration::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::PushAvStreamTransport::Commands::FindTransport::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterPushAVStreamTransport alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRPushAVStreamTransportClusterFindStreamConfigurationParams alloc] init]; + __auto_type * params = [[MTRPushAVStreamTransportClusterFindTransportParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL if (mRequest.connectionID.HasValue()) { @@ -156906,18 +156894,18 @@ class PushAvStreamTransportFindStreamConfiguration : public ClusterCommand { uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster findStreamConfigurationWithParams:params completion: - ^(MTRPushAVStreamTransportClusterFindStreamConfigurationResponseParams * _Nullable values, NSError * _Nullable error) { + [cluster findTransportWithParams:params completion: + ^(MTRPushAVStreamTransportClusterFindTransportResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); if (error == nil) { - constexpr chip::CommandId responseId = chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfigurationResponse::Id; + constexpr chip::CommandId responseId = chip::app::Clusters::PushAvStreamTransport::Commands::FindTransportResponse::Id; RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values); } responsesNeeded--; if (error != nil) { mError = error; LogNSError("Error", error); - constexpr chip::CommandId responseId = chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfigurationResponse::Id; + constexpr chip::CommandId responseId = chip::app::Clusters::PushAvStreamTransport::Commands::FindTransportResponse::Id; RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error); } if (responsesNeeded == 0) { @@ -156929,7 +156917,7 @@ class PushAvStreamTransportFindStreamConfiguration : public ClusterCommand { } private: - chip::app::Clusters::PushAvStreamTransport::Commands::FindStreamConfiguration::Type mRequest; + chip::app::Clusters::PushAvStreamTransport::Commands::FindTransport::Type mRequest; }; #endif // MTR_ENABLE_PROVISIONAL @@ -180735,7 +180723,7 @@ void registerClusterPushAvStreamTransport(Commands & commands) make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL make_unique(Id), // make_unique(Id), //