libwebrtc を m124.6367.3.1 にあげる

VERSION

@@ -1,5 +1,5 @@
 SORA_CPP_SDK_VERSION=2024.6.1
-WEBRTC_BUILD_VERSION=m123.6312.3.5
+WEBRTC_BUILD_VERSION=m124.6367.3.1
 BOOST_VERSION=1.85.0
 CMAKE_VERSION=3.28.1
 CUDA_VERSION=11.8.0-1

examples/VERSION

@@ -1,6 +1,6 @@
 SORA_CPP_SDK_VERSION=2024.6.1
-WEBRTC_BUILD_VERSION=m123.6312.3.5
-BOOST_VERSION=1.85.0
+WEBRTC_BUILD_VERSION=m124.6367.3.1
+BOOST_VERSION=1.84.0
 CMAKE_VERSION=3.28.1
 SDL2_VERSION=2.30.3
 CLI11_VERSION=v2.4.2

include/sora/sora_client_context.h

@@ -2,6 +2,7 @@
 #define SORA_SORA_CLIENT_CONTEXT_H_
 
 // WebRTC
+#include <api/environment/environment_factory.h>
 #include <api/peer_connection_interface.h>
 #include <media/engine/webrtc_media_engine.h>
 #include <pc/connection_context.h>
@@ -55,6 +56,10 @@ struct SoraClientContextConfig {
 //   auto client = std::make_shared<MyClient>(context);
 class SoraClientContext {
  public:
+  static std::shared_ptr<SoraClientContext> Create(
+      const SoraClientContextConfig& config,
+      webrtc::Environment& env);
+
   static std::shared_ptr<SoraClientContext> Create(
       const SoraClientContextConfig& config);
 
@@ -84,6 +89,7 @@ class SoraClientContext {
   std::unique_ptr<rtc::Thread> signaling_thread_;
   rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory_;
   rtc::scoped_refptr<webrtc::ConnectionContext> connection_context_;
+  std::shared_ptr<webrtc::Environment> env_;
 };
 
 }  // namespace sora

include/sora/sora_video_decoder_factory.h

@@ -5,6 +5,7 @@
 #include <vector>
 
 // WebRTC
+#include <api/environment/environment.h>
 #include <api/video/video_codec_type.h>
 #include <api/video_codecs/video_decoder_factory.h>
 
@@ -52,7 +53,8 @@ class SoraVideoDecoderFactory : public webrtc::VideoDecoderFactory {
 
   std::vector<webrtc::SdpVideoFormat> GetSupportedFormats() const override;
 
-  std::unique_ptr<webrtc::VideoDecoder> CreateVideoDecoder(
+  std::unique_ptr<webrtc::VideoDecoder> Create(
+      const webrtc::Environment& env,
       const webrtc::SdpVideoFormat& format) override;
 
  private:
@@ -62,10 +64,11 @@ class SoraVideoDecoderFactory : public webrtc::VideoDecoderFactory {
 
 // ハードウェアデコーダを出来るだけ使おうとして、見つからなければソフトウェアデコーダを使う設定を返す
 SoraVideoDecoderFactoryConfig GetDefaultVideoDecoderFactoryConfig(
+    webrtc::Environment& env,
     std::shared_ptr<CudaContext> cuda_context = nullptr,
-    void* env = nullptr);
+    void* jni_env = nullptr);
 // ソフトウェアデコーダのみを使う設定を返す
-SoraVideoDecoderFactoryConfig GetSoftwareOnlyVideoDecoderFactoryConfig();
+SoraVideoDecoderFactoryConfig GetSoftwareOnlyVideoDecoderFactoryConfig(webrtc::Environment& env);
 
 }  // namespace sora
 

src/sora_client_context.cpp

@@ -5,7 +5,6 @@
 #include <api/audio_codecs/builtin_audio_encoder_factory.h>
 #include <api/create_peerconnection_factory.h>
 #include <api/enable_media.h>
-#include <api/environment/environment_factory.h>
 #include <api/rtc_event_log/rtc_event_log_factory.h>
 #include <api/task_queue/default_task_queue_factory.h>
 #include <call/call_config.h>
@@ -41,7 +40,8 @@ SoraClientContext::~SoraClientContext() {
 }
 
 std::shared_ptr<SoraClientContext> SoraClientContext::Create(
-    const SoraClientContextConfig& config) {
+    const SoraClientContextConfig& config,
+    webrtc::Environment& env) {
   rtc::InitializeSSL();
 
   std::shared_ptr<SoraClientContext> c = std::make_shared<SoraClientContext>();
@@ -53,6 +53,7 @@ std::shared_ptr<SoraClientContext> SoraClientContext::Create(
   c->worker_thread_->Start();
   c->signaling_thread_ = rtc::Thread::Create();
   c->signaling_thread_->Start();
+  c->env_ = std::make_shared<webrtc::Environment>(env);
 
   webrtc::PeerConnectionFactoryDependencies dependencies;
   dependencies.network_thread = c->network_thread_.get();
@@ -63,7 +64,7 @@ std::shared_ptr<SoraClientContext> SoraClientContext::Create(
       absl::make_unique<webrtc::RtcEventLogFactory>(
           dependencies.task_queue_factory.get());
 
-  void* env = sora::GetJNIEnv();
+  void* jni_env = sora::GetJNIEnv();
 
   dependencies.adm = c->worker_thread_->BlockingCall([&] {
     sora::AudioDeviceModuleConfig config;
@@ -92,7 +93,7 @@ std::shared_ptr<SoraClientContext> SoraClientContext::Create(
   {
     auto config = c->config_.use_hardware_encoder
                       ? sora::GetDefaultVideoEncoderFactoryConfig(
-                            cuda_context, env, c->config_.openh264)
+                            cuda_context, jni_env, c->config_.openh264)
                       : sora::GetSoftwareOnlyVideoEncoderFactoryConfig(
                             c->config_.openh264);
     config.use_simulcast_adapter = true;
@@ -102,10 +103,10 @@ std::shared_ptr<SoraClientContext> SoraClientContext::Create(
         absl::make_unique<sora::SoraVideoEncoderFactory>(std::move(config));
   }
   {
-    auto config =
-        c->config_.use_hardware_encoder
-            ? sora::GetDefaultVideoDecoderFactoryConfig(cuda_context, env)
-            : sora::GetSoftwareOnlyVideoDecoderFactoryConfig();
+    auto config = c->config_.use_hardware_encoder
+                      ? sora::GetDefaultVideoDecoderFactoryConfig(
+                            env, cuda_context, jni_env)
+                      : sora::GetSoftwareOnlyVideoDecoderFactoryConfig(env);
     dependencies.video_decoder_factory =
         absl::make_unique<sora::SoraVideoDecoderFactory>(std::move(config));
   }
@@ -136,4 +137,10 @@ std::shared_ptr<SoraClientContext> SoraClientContext::Create(
   return c;
 }
 
+std::shared_ptr<SoraClientContext> SoraClientContext::Create(
+    const SoraClientContextConfig& config) {
+  auto env = webrtc::CreateEnvironment();
+  return Create(config, env);
+}
+
 }  // namespace sora

src/sora_peer_connection_factory.cpp

@@ -14,6 +14,7 @@ class PeerConnectionFactoryWithContext : public webrtc::PeerConnectionFactory {
   PeerConnectionFactoryWithContext(
       webrtc::PeerConnectionFactoryDependencies dependencies)
       : PeerConnectionFactoryWithContext(
+            // TODO(enm10k): environment を外部から設定できるようにする
             webrtc::ConnectionContext::Create(webrtc::CreateEnvironment(),
                                               &dependencies),
             &dependencies) {}

src/sora_video_decoder_factory.cpp

@@ -2,6 +2,7 @@
 
 // WebRTC
 #include <absl/strings/match.h>
+#include <api/environment/environment.h>
 #include <api/video_codecs/sdp_video_format.h>
 #include <media/base/codec.h>
 #include <media/base/media_constants.h>
@@ -67,8 +68,8 @@ SoraVideoDecoderFactory::GetSupportedFormats() const {
   return r;
 }
 
-std::unique_ptr<webrtc::VideoDecoder>
-SoraVideoDecoderFactory::CreateVideoDecoder(
+std::unique_ptr<webrtc::VideoDecoder> SoraVideoDecoderFactory::Create(
+    const webrtc::Environment& env,
     const webrtc::SdpVideoFormat& format) {
   webrtc::VideoCodecType specified_codec =
       webrtc::PayloadStringToCodecType(format.name);
@@ -84,10 +85,10 @@ SoraVideoDecoderFactory::CreateVideoDecoder(
     std::vector<webrtc::SdpVideoFormat> supported_formats = formats_[n++];
 
     if (enc.factory != nullptr) {
-      create_video_decoder =
-          [factory = enc.factory.get()](const webrtc::SdpVideoFormat& format) {
-            return factory->CreateVideoDecoder(format);
-          };
+      create_video_decoder = [factory = enc.factory.get(),
+                              &env](const webrtc::SdpVideoFormat& format) {
+        return factory->Create(env, format);
+      };
     } else if (enc.create_video_decoder != nullptr) {
       create_video_decoder = enc.create_video_decoder;
     }
@@ -108,20 +109,21 @@ SoraVideoDecoderFactory::CreateVideoDecoder(
 }
 
 SoraVideoDecoderFactoryConfig GetDefaultVideoDecoderFactoryConfig(
+    webrtc::Environment& env,
     std::shared_ptr<CudaContext> cuda_context,
-    void* env) {
-  auto config = GetSoftwareOnlyVideoDecoderFactoryConfig();
+    void* jni_env) {
+  auto config = GetSoftwareOnlyVideoDecoderFactoryConfig(env);
 
 #if defined(__APPLE__)
   config.decoders.insert(config.decoders.begin(),
                          VideoDecoderConfig(CreateMacVideoDecoderFactory()));
 #endif
 
 #if defined(SORA_CPP_SDK_ANDROID)
-  if (env != nullptr) {
+  if (jni_env != nullptr) {
     config.decoders.insert(config.decoders.begin(),
                            VideoDecoderConfig(CreateAndroidVideoDecoderFactory(
-                               static_cast<JNIEnv*>(env))));
+                               static_cast<JNIEnv*>(jni_env))));
   }
 #endif
 
@@ -249,11 +251,12 @@ SoraVideoDecoderFactoryConfig GetDefaultVideoDecoderFactoryConfig(
   return config;
 }
 
-SoraVideoDecoderFactoryConfig GetSoftwareOnlyVideoDecoderFactoryConfig() {
+SoraVideoDecoderFactoryConfig GetSoftwareOnlyVideoDecoderFactoryConfig(
+    webrtc::Environment& env) {
   SoraVideoDecoderFactoryConfig config;
   config.decoders.push_back(VideoDecoderConfig(
       webrtc::kVideoCodecVP8,
-      [](auto format) { return webrtc::VP8Decoder::Create(); }));
+      [&env](auto format) { return webrtc::CreateVp8Decoder(env); }));
   config.decoders.push_back(VideoDecoderConfig(
       webrtc::kVideoCodecVP9,
       [](auto format) { return webrtc::VP9Decoder::Create(); }));

test/android/app/src/main/cpp/jni_onload.cc

@@ -12,7 +12,6 @@
 #undef JNIEXPORT
 #define JNIEXPORT __attribute__((visibility("default")))
 
-#include "examples/unityplugin/class_reference_holder.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/ssl_adapter.h"
 #include "sdk/android/native_api/jni/class_loader.h"