diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h index 5c0a838c94fbe2..7db09ed55aedd0 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h @@ -142,7 +142,7 @@ #define MATTER_DM_ZONE_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0) -#define MATTER_DM_WEBRTC_TRANSPORT_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (0) +#define MATTER_DM_WEB_RTC_TRANSPORT_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_CHIME_CLUSTER_SERVER_ENDPOINT_COUNT (0) @@ -274,7 +274,7 @@ #define MATTER_DM_ZONE_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0) -#define MATTER_DM_WEBRTC_TRANSPORT_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (0) +#define MATTER_DM_WEB_RTC_TRANSPORT_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_CHIME_CLUSTER_CLIENT_ENDPOINT_COUNT (0) diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h index c577a0ef3b7049..c82d5985948518 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h @@ -142,7 +142,7 @@ #define MATTER_DM_ZONE_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0) -#define MATTER_DM_WEBRTC_TRANSPORT_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (0) +#define MATTER_DM_WEB_RTC_TRANSPORT_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_CHIME_CLUSTER_SERVER_ENDPOINT_COUNT (0) @@ -274,7 +274,7 @@ #define MATTER_DM_ZONE_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0) -#define MATTER_DM_WEBRTC_TRANSPORT_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (0) +#define MATTER_DM_WEB_RTC_TRANSPORT_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_CHIME_CLUSTER_CLIENT_ENDPOINT_COUNT (0) diff --git a/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml index a111f07c47fbd2..719ed4e26cb27e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml @@ -1,6 +1,6 @@ @@ -70,7 +70,7 @@ Git: 0.9-fall2024-234-gf4d359001 Cameras WebRTC Transport Provider 0x0553 - WEBRTC_TRANSPORT_PROVIDER_CLUSTER + WEB_RTC_TRANSPORT_PROVIDER_CLUSTER The WebRTC transport provider cluster provides a way for stream providers (e.g. Cameras) to stream or receive their data through WebRTC. true true @@ -78,6 +78,7 @@ Git: 0.9-fall2024-234-gf4d359001 CurrentSessions Requests that the Provider initiates a new session with the Offer / Answer flow in a way that allows for options to be passed and work with devices needing the standby flow. + @@ -88,6 +89,7 @@ Git: 0.9-fall2024-234-gf4d359001 This command SHALL be generated in response to a SolicitOffer command. + @@ -96,6 +98,7 @@ Git: 0.9-fall2024-234-gf4d359001 This command allows an SDP Offer to be set and start a new session. + @@ -108,6 +111,7 @@ Git: 0.9-fall2024-234-gf4d359001 This command contains information about the session and streams created as a response to the requestor's offer. + @@ -115,18 +119,21 @@ Git: 0.9-fall2024-234-gf4d359001 This command SHALL be initiated from a Node in response to an Offer that was previously received from a remote peer. + - This command allows for https://rfc-editor.org/rfc/rfc8839#section-5.1 generated after the initial Offer / Answer exchange to be added to a session during the gathering phase. + This command allows for string based https://rfc-editor.org/rfc/rfc8839#section-5.1 generated after the initial Offer / Answer exchange, via a JSEP https://datatracker.ietf.org/doc/html/rfc9429#section-4.1.20 event, a DOM https://www.w3.org/TR/webrtc/#dom-rtcpeerconnectioniceevent event, or other WebRTC compliant implementations, to be added to a session during the gathering phase. + This command instructs the stream provider to end the WebRTC session. + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 8cad3324941963..a4b96e6c45f8df 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -10187,7 +10187,7 @@ provisional cluster WebRTCTransportProvider = 1363 { command ProvideOffer(ProvideOfferRequest): ProvideOfferResponse = 3; /** This command SHALL be initiated from a Node in response to an Offer that was previously received from a remote peer. */ command ProvideAnswer(ProvideAnswerRequest): DefaultSuccess = 5; - /** This command allows for https://rfc-editor.org/rfc/rfc8839#section-5.1 generated after the initial Offer / Answer exchange to be added to a session during the gathering phase. */ + /** This command allows for string based https://rfc-editor.org/rfc/rfc8839#section-5.1 generated after the initial Offer / Answer exchange, via a JSEP https://datatracker.ietf.org/doc/html/rfc9429#section-4.1.20 event, a DOM https://www.w3.org/TR/webrtc/#dom-rtcpeerconnectioniceevent event, or other WebRTC compliant implementations, to be added to a session during the gathering phase. */ command ProvideICECandidates(ProvideICECandidatesRequest): DefaultSuccess = 6; /** This command instructs the stream provider to end the WebRTC session. */ command EndSession(EndSessionRequest): DefaultSuccess = 7; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index b4321c273eb238..817160d18d3cd0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -14790,7 +14790,7 @@ MTR_PROVISIONALLY_AVAILABLE /** * Command ProvideICECandidates * - * This command allows for https://rfc-editor.org/rfc/rfc8839#section-5.1 generated after the initial Offer / Answer exchange to be added to a session during the gathering phase. + * This command allows for string based https://rfc-editor.org/rfc/rfc8839#section-5.1 generated after the initial Offer / Answer exchange, via a JSEP https://datatracker.ietf.org/doc/html/rfc9429#section-4.1.20 event, a DOM https://www.w3.org/TR/webrtc/#dom-rtcpeerconnectioniceevent event, or other WebRTC compliant implementations, to be added to a session during the gathering phase. */ - (void)provideICECandidatesWithParams:(MTRWebRTCTransportProviderClusterProvideICECandidatesParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; /** 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 9b37c723d2dc51..fb3c6c9c645c5f 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 @@ -37246,6 +37246,41 @@ bool CommandHasLargePayload(ClusterId aCluster, CommandId aCommand) { return true; } + if ((aCluster == Clusters::WebRTCTransportProvider::Id) && + (aCommand == Clusters::WebRTCTransportProvider::Commands::SolicitOffer::Id)) + { + return true; + } + if ((aCluster == Clusters::WebRTCTransportProvider::Id) && + (aCommand == Clusters::WebRTCTransportProvider::Commands::SolicitOfferResponse::Id)) + { + return true; + } + if ((aCluster == Clusters::WebRTCTransportProvider::Id) && + (aCommand == Clusters::WebRTCTransportProvider::Commands::ProvideOffer::Id)) + { + return true; + } + if ((aCluster == Clusters::WebRTCTransportProvider::Id) && + (aCommand == Clusters::WebRTCTransportProvider::Commands::ProvideOfferResponse::Id)) + { + return true; + } + if ((aCluster == Clusters::WebRTCTransportProvider::Id) && + (aCommand == Clusters::WebRTCTransportProvider::Commands::ProvideAnswer::Id)) + { + return true; + } + if ((aCluster == Clusters::WebRTCTransportProvider::Id) && + (aCommand == Clusters::WebRTCTransportProvider::Commands::ProvideICECandidates::Id)) + { + return true; + } + if ((aCluster == Clusters::WebRTCTransportProvider::Id) && + (aCommand == Clusters::WebRTCTransportProvider::Commands::EndSession::Id)) + { + return true; + } if ((aCluster == Clusters::WebRTCTransportRequestor::Id) && (aCommand == Clusters::WebRTCTransportRequestor::Commands::Offer::Id)) {