Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 233b68e

Browse files
authoredMar 20, 2025··
Merge branch 'master' into master
2 parents 14bedbe + 75b5405 commit 233b68e

File tree

74 files changed

+610
-309
lines changed

Some content is hidden

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

74 files changed

+610
-309
lines changed
 

‎examples/camera-app/camera-common/camera-app.matter

+17-14
Original file line numberDiff line numberDiff line change
@@ -2445,10 +2445,11 @@ provisional cluster WebRTCTransportProvider = 1363 {
24452445
fabric_scoped struct WebRTCSessionStruct {
24462446
int16u id = 1;
24472447
node_id peerNodeID = 2;
2448-
StreamUsageEnum streamUsage = 3;
2449-
nullable int16u videoStreamID = 4;
2450-
nullable int16u audioStreamID = 5;
2451-
WebRTCMetadataOptionsBitmap metadataOptions = 6;
2448+
endpoint_no peerEndpointID = 3;
2449+
StreamUsageEnum streamUsage = 4;
2450+
nullable int16u videoStreamID = 5;
2451+
nullable int16u audioStreamID = 6;
2452+
WebRTCMetadataOptionsBitmap metadataOptions = 7;
24522453
fabric_idx fabricIndex = 254;
24532454
}
24542455

@@ -2462,11 +2463,12 @@ provisional cluster WebRTCTransportProvider = 1363 {
24622463

24632464
request struct SolicitOfferRequest {
24642465
StreamUsageEnum streamUsage = 0;
2465-
optional nullable int16u videoStreamID = 1;
2466-
optional nullable int16u audioStreamID = 2;
2467-
optional ICEServerStruct ICEServers[] = 3;
2468-
optional char_string ICETransportPolicy = 4;
2469-
optional WebRTCMetadataOptionsBitmap metadataOptions = 5;
2466+
endpoint_no originatingEndpointID = 1;
2467+
optional nullable int16u videoStreamID = 2;
2468+
optional nullable int16u audioStreamID = 3;
2469+
optional ICEServerStruct ICEServers[] = 4;
2470+
optional char_string ICETransportPolicy = 5;
2471+
optional WebRTCMetadataOptionsBitmap metadataOptions = 6;
24702472
}
24712473

24722474
response struct SolicitOfferResponse = 2 {
@@ -2480,11 +2482,12 @@ provisional cluster WebRTCTransportProvider = 1363 {
24802482
nullable int16u webRTCSessionID = 0;
24812483
char_string sdp = 1;
24822484
StreamUsageEnum streamUsage = 2;
2483-
optional nullable int16u videoStreamID = 3;
2484-
optional nullable int16u audioStreamID = 4;
2485-
optional ICEServerStruct ICEServers[] = 5;
2486-
optional char_string ICETransportPolicy = 6;
2487-
optional WebRTCMetadataOptionsBitmap metadataOptions = 7;
2485+
endpoint_no originatingEndpointID = 3;
2486+
optional nullable int16u videoStreamID = 4;
2487+
optional nullable int16u audioStreamID = 5;
2488+
optional ICEServerStruct ICEServers[] = 6;
2489+
optional char_string ICETransportPolicy = 7;
2490+
optional WebRTCMetadataOptionsBitmap metadataOptions = 8;
24882491
}
24892492

24902493
response struct ProvideOfferResponse = 4 {

‎examples/contact-sensor-app/nxp/k32w1/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ chip_enable_ble = true
2727
chip_generate_link_map_file = true
2828

2929
chip_system_config_provide_statistics = false
30-
chip_system_config_use_open_thread_inet_endpoints = true
30+
chip_system_config_use_openthread_inet_endpoints = true
3131
chip_with_lwip = false
3232

3333
chip_enable_icd_server = true

0 commit comments

Comments
 (0)
Please sign in to comment.