sora::SoraClientContext::Create に webrtc::Environment を渡す

shiguredo · May 7, 2024 · ba5bb61 · ba5bb61
1 parent 01ad4ff
commit ba5bb61
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 14 deletions.
diff --git a/examples/messaging_recvonly_sample/src/messaging_recvonly_sample.cpp b/examples/messaging_recvonly_sample/src/messaging_recvonly_sample.cpp
@@ -1,3 +1,6 @@
+// WebRTC
+#include <api/environment/environment_factory.h>
+
 // Sora
 #include <sora/sora_client_context.h>
 
@@ -194,7 +197,8 @@ int main(int argc, char* argv[]) {
   sora::SoraClientContextConfig context_config;
   context_config.use_audio_device = false;
   context_config.use_hardware_encoder = false;
-  auto context = sora::SoraClientContext::Create(context_config);
+  auto env = webrtc::CreateEnvironment();
+  auto context = sora::SoraClientContext::Create(context_config, env);
 
   auto messaging_recvonly_sample =
       std::make_shared<MessagingRecvOnlySample>(context, config);

diff --git a/examples/sdl_sample/src/sdl_sample.cpp b/examples/sdl_sample/src/sdl_sample.cpp
@@ -1,3 +1,6 @@
+// WebRTC
+#include <api/environment/environment_factory.h>
+
 // Sora
 #include <sora/camera_device_capturer.h>
 #include <sora/sora_client_context.h>
@@ -248,8 +251,9 @@ int main(int argc, char* argv[]) {
     rtc::LogMessage::LogThreads();
   }
 
+  auto env = webrtc::CreateEnvironment();
   auto context =
-      sora::SoraClientContext::Create(sora::SoraClientContextConfig());
+      sora::SoraClientContext::Create(sora::SoraClientContextConfig(), env);
   auto sdlsample = std::make_shared<SDLSample>(context, config);
   sdlsample->Run();
 

diff --git a/examples/sumomo/src/sumomo.cpp b/examples/sumomo/src/sumomo.cpp
@@ -1,3 +1,6 @@
+// WebRTC
+#include <api/environment/environment_factory.h>
+
 // Sora
 #include <sora/camera_device_capturer.h>
 #include <sora/sora_client_context.h>
@@ -447,7 +450,8 @@ int main(int argc, char* argv[]) {
     context_config.use_hardware_encoder = *use_hardware_encoder;
   }
   context_config.openh264 = openh264;
-  auto context = sora::SoraClientContext::Create(context_config);
+  auto env = webrtc::CreateEnvironment();
+  auto context = sora::SoraClientContext::Create(context_config, env);
   auto sumomo = std::make_shared<Sumomo>(context, config);
   sumomo->Run();
 

diff --git a/include/sora/sora_client_context.h b/include/sora/sora_client_context.h
@@ -60,13 +60,6 @@ class SoraClientContext {
       const SoraClientContextConfig& config,
       webrtc::Environment& env);
 
-  static std::shared_ptr<SoraClientContext> Create(
-      const SoraClientContextConfig& config) {
-    // TODO(enm10k): ライフタイム的には env をクラスで保持した方が良さそうだが、 Create が static なメソッドなので難しい気がする
-    auto env = webrtc::CreateEnvironment();
-    return Create(SoraClientContextConfig(), env);
-  };
-
   ~SoraClientContext();
 
   rtc::Thread* network_thread() const { return network_thread_.get(); }

diff --git a/test/connect_disconnect.cpp b/test/connect_disconnect.cpp
@@ -3,6 +3,7 @@
 #include <iostream>
 
 // WebRTC
+#include <api/environment/environment_factory.h>
 #include <rtc_base/logging.h>
 
 #ifdef _WIN32
@@ -145,8 +146,9 @@ int main(int argc, char* argv[]) {
   //rtc::LogMessage::LogTimestamps();
   //rtc::LogMessage::LogThreads();
 
+  auto env = webrtc::CreateEnvironment();
   auto context =
-      sora::SoraClientContext::Create(sora::SoraClientContextConfig());
+      sora::SoraClientContext::Create(sora::SoraClientContextConfig(), env);
 
   boost::json::value v;
   {

diff --git a/test/datachannel.cpp b/test/datachannel.cpp
@@ -3,6 +3,7 @@
 #include <iostream>
 
 // WebRTC
+#include <api/environment/environment_factory.h>
 #include <rtc_base/logging.h>
 
 #ifdef _WIN32
@@ -160,7 +161,8 @@ int main(int argc, char* argv[]) {
   sora::SoraClientContextConfig context_config;
   context_config.use_audio_device = false;
   context_config.use_hardware_encoder = false;
-  auto context = sora::SoraClientContext::Create(context_config);
+  auto env = webrtc::CreateEnvironment();
+  auto context = sora::SoraClientContext::Create(context_config, env);
 
   boost::json::value v;
   {

diff --git a/test/e2e.cpp b/test/e2e.cpp
@@ -4,6 +4,7 @@
 #include <iostream>
 
 // WebRTC
+#include <api/environment/environment_factory.h>
 #include <rtc_base/logging.h>
 
 #ifdef _WIN32
@@ -44,7 +45,8 @@ class SoraClient : public std::enable_shared_from_this<SoraClient>,
     sora::SoraClientContextConfig context_config;
     context_config.use_audio_device = false;
     context_config.use_hardware_encoder = false;
-    auto context = sora::SoraClientContext::Create(context_config);
+    auto env = webrtc::CreateEnvironment();
+    auto context = sora::SoraClientContext::Create(context_config, env);
     auto pc_factory = context->peer_connection_factory();
     context_ = context;
 

diff --git a/test/hello.cpp b/test/hello.cpp
@@ -4,6 +4,7 @@
 #include <iostream>
 
 // WebRTC
+#include <api/environment/environment_factory.h>
 #include <rtc_base/logging.h>
 
 #ifdef _WIN32
@@ -179,7 +180,8 @@ int main(int argc, char* argv[]) {
   if (auto it = v.as_object().find("openh264"); it != v.as_object().end()) {
     context_config.openh264 = it->value().as_string();
   }
-  auto context = sora::SoraClientContext::Create(context_config);
+  auto env = webrtc::CreateEnvironment();
+  auto context = sora::SoraClientContext::Create(context_config, env);
 
   auto hello = std::make_shared<HelloSora>(context, config);
   hello->Run();