Skip to content

Commit cb30305

Browse files
authored
Use SFU provided ICE servers (#24)
* Use SFU provided ICE servers * Use default agent receive timeout * Update version specification for esp_peer * Format
1 parent 6fa9155 commit cb30305

File tree

3 files changed

+14
-24
lines changed

3 files changed

+14
-24
lines changed

components/livekit/core/engine.c

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -502,25 +502,17 @@ static inline size_t map_ice_servers(
502502

503503
static bool establish_peer_connections(engine_t *eng, livekit_pb_join_response_t *join)
504504
{
505-
esp_peer_ice_server_cfg_t server_list[] = {
506-
{ .stun_url = "stun:stun.l.google.com:19302" },
507-
{ .stun_url = "stun:stun1.l.google.com:19302" },
508-
{ .stun_url = "stun:stun2.l.google.com:19302" }
509-
};
510-
int server_count = sizeof(server_list) / sizeof(server_list[0]);
511-
512-
// TODO: Replace the above with the following to set the ICE servers dynamically:
513-
// esp_peer_ice_server_cfg_t server_list[CONFIG_LK_MAX_ICE_SERVERS];
514-
// int server_count = map_ice_servers(
515-
// join->ice_servers,
516-
// join->ice_servers_count,
517-
// server_list,
518-
// sizeof(server_list) / sizeof(server_list[0])
519-
// );
520-
// if (server_count < 1) {
521-
// ESP_LOGW(TAG, "No ICE servers available");
522-
// return false;
523-
// }
505+
esp_peer_ice_server_cfg_t server_list[CONFIG_LK_MAX_ICE_SERVERS];
506+
int server_count = map_ice_servers(
507+
join->ice_servers,
508+
join->ice_servers_count,
509+
server_list,
510+
sizeof(server_list) / sizeof(server_list[0])
511+
);
512+
if (server_count < 1) {
513+
ESP_LOGW(TAG, "No ICE servers available");
514+
return false;
515+
}
524516

525517
peer_options_t options = {
526518
.force_relay = join->client_configuration.force_relay

components/livekit/core/peer.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,11 @@ peer_err_t peer_create(peer_handle_t *handle, peer_options_t *options)
288288

289289
// Configuration for the default peer implementation
290290
esp_peer_default_cfg_t default_peer_cfg = {
291-
.agent_recv_timeout = 10000,
292291
.data_ch_cfg = {
293292
.cache_timeout = 5000,
294293
.send_cache_size = 100 * 1024,
295294
.recv_cache_size = 100 * 1024
296295
}
297-
// TODO: Set options
298296
};
299297
esp_peer_media_dir_t audio_dir = get_media_direction(options->media->audio_dir, peer->options.role);
300298
esp_peer_media_dir_t video_dir = get_media_direction(options->media->video_dir, peer->options.role);

components/livekit/idf_component.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ version: 0.2.0
88
dependencies:
99
idf: ">=5.4"
1010
espressif/esp_websocket_client: ~1.5.0
11-
espressif/esp_codec_dev: "~1.4"
12-
espressif/esp_capture: "~0.7"
13-
espressif/esp_peer: ^1.2.3
11+
espressif/esp_codec_dev: ~1.4
12+
espressif/esp_capture: ~0.7
13+
espressif/esp_peer: ~1.2.3
1414
media_lib_sal:
1515
path: ../third_party/esp-webrtc-solution/components/media_lib_sal
1616
nanopb:

0 commit comments

Comments
 (0)