From 59e7ccbffe12d0267d156292f6437c7edb169254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Monnom?= Date: Mon, 28 Nov 2022 17:30:21 +0100 Subject: [PATCH] Successfully received video frames --- Cargo.toml | 2 +- crates/livekit-core/src/signal_client/mod.rs | 2 +- .../livekit-webrtc/libwebrtc-sys/include/livekit/webrtc.h | 2 ++ .../libwebrtc-sys/src/peer_connection_factory.cpp | 6 +++++- examples/simple_room/Cargo.toml | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a705033..5e5d1fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,4 +13,4 @@ members = [ ] [dependencies] -livekit-core = { path = "crates/livekit-core" } \ No newline at end of file +livekit-core = { path = "crates/livekit-core" } diff --git a/crates/livekit-core/src/signal_client/mod.rs b/crates/livekit-core/src/signal_client/mod.rs index 9e9d7c4..2958de4 100644 --- a/crates/livekit-core/src/signal_client/mod.rs +++ b/crates/livekit-core/src/signal_client/mod.rs @@ -53,7 +53,7 @@ impl Default for SignalOptions { reconnect: false, auto_subscribe: true, sid: "".to_string(), - adaptive_stream: true, + adaptive_stream: false, } } } diff --git a/crates/livekit-webrtc/libwebrtc-sys/include/livekit/webrtc.h b/crates/livekit-webrtc/libwebrtc-sys/include/livekit/webrtc.h index 11b4a6f..50fe659 100644 --- a/crates/livekit-webrtc/libwebrtc-sys/include/livekit/webrtc.h +++ b/crates/livekit-webrtc/libwebrtc-sys/include/livekit/webrtc.h @@ -32,6 +32,8 @@ class RTCRuntime { std::unique_ptr signaling_thread_; #ifdef WEBRTC_WIN rtc::WinsockInitializer winsock_; + rtc::PhysicalSocketServer ss_; + rtc::AutoSocketServerThread main_thread_ {&ss_}; #endif }; diff --git a/crates/livekit-webrtc/libwebrtc-sys/src/peer_connection_factory.cpp b/crates/livekit-webrtc/libwebrtc-sys/src/peer_connection_factory.cpp index 41ecf56..15c00b6 100644 --- a/crates/livekit-webrtc/libwebrtc-sys/src/peer_connection_factory.cpp +++ b/crates/livekit-webrtc/libwebrtc-sys/src/peer_connection_factory.cpp @@ -27,10 +27,12 @@ PeerConnectionFactory::PeerConnectionFactory( dependencies.network_thread = rtc_runtime_->network_thread(); dependencies.worker_thread = rtc_runtime_->worker_thread(); dependencies.signaling_thread = rtc_runtime_->signaling_thread(); + dependencies.socket_factory = rtc_runtime_->network_thread()->socketserver(); dependencies.task_queue_factory = webrtc::CreateDefaultTaskQueueFactory(); dependencies.event_log_factory = std::make_unique( dependencies.task_queue_factory.get()); dependencies.call_factory = webrtc::CreateCallFactory(); + dependencies.trials = std::make_unique(); cricket::MediaEngineDependencies media_deps; media_deps.task_queue_factory = dependencies.task_queue_factory.get(); @@ -38,6 +40,8 @@ PeerConnectionFactory::PeerConnectionFactory( media_deps.video_decoder_factory = webrtc::CreateBuiltinVideoDecoderFactory(); media_deps.audio_encoder_factory = webrtc::CreateBuiltinAudioEncoderFactory(); media_deps.audio_decoder_factory = webrtc::CreateBuiltinAudioDecoderFactory(); + media_deps.audio_processing = webrtc::AudioProcessingBuilder().Create(); + media_deps.trials = dependencies.trials.get(); dependencies.media_engine = cricket::CreateMediaEngine(std::move(media_deps)); @@ -96,4 +100,4 @@ std::unique_ptr create_rtc_configuration( return rtc; } -} // namespace livekit \ No newline at end of file +} // namespace livekit diff --git a/examples/simple_room/Cargo.toml b/examples/simple_room/Cargo.toml index 1f13b23..aab5f93 100644 --- a/examples/simple_room/Cargo.toml +++ b/examples/simple_room/Cargo.toml @@ -8,4 +8,4 @@ tokio = { version = "1", features = ["full"] } tracing = "0.1" tracing-subscriber = "0.3" livekit = { path = "../.." } -futures = "0.3" \ No newline at end of file +futures = "0.3"