サイマルキャストマルチコーデックに対応する

CHANGES.md

@@ -110,6 +110,8 @@
   - @melpon
 - [ADD] WebSocket での接続時に User-Agent ヘッダーを追加する
   - @melpon
+- [ADD] sumomo に --simulcast-multicodec オプションを追加
+  - @melpon
 
 ## 2024.6.1
 
@@ -135,9 +137,9 @@
 
 - [CHANGE] 別リポジトリに分かれていた Sora C++ SDK のサンプル集を examples/ 以下のディレクトリに統合する
   - @melpon
-- [UPDATE] libwebrtc を `m122.6261.1.0` にあげる
+- [UPDATE] libwebrtc を `m122.6261.1.1` にあげる
   - Ubuntu のビルドを通すために、 __assertion_handler というファイルをコピーする必要があった
-  - @miosakuma @enm10k
+  - @miosakuma @enm10k @melpon
 - [UPDATE] libvpl を v2.10.1 にあげる
   - @enm10k
 - [ADD] OpenH264 エンコーダを追加

CMakeLists.txt

@@ -357,6 +357,7 @@ elseif (SORA_TARGET_OS STREQUAL "macos")
     PUBLIC
       WEBRTC_POSIX
       WEBRTC_MAC
+      RTC_ENABLE_H265
   )
 
   target_link_libraries(sora
@@ -402,6 +403,7 @@ elseif (SORA_TARGET_OS STREQUAL "ios")
       WEBRTC_MAC
       WEBRTC_IOS
       OPENSSL_IS_BORINGSSL
+      RTC_ENABLE_H265
   )
 
 elseif (SORA_TARGET_OS STREQUAL "android")
@@ -422,6 +424,7 @@ elseif (SORA_TARGET_OS STREQUAL "android")
       WEBRTC_POSIX
       WEBRTC_LINUX
       WEBRTC_ANDROID
+      RTC_ENABLE_H265
       _LIBCPP_ABI_NAMESPACE=Cr
       _LIBCPP_ABI_VERSION=2
       _LIBCPP_DISABLE_AVAILABILITY

examples/sumomo/src/sumomo.cpp

@@ -42,6 +42,7 @@ struct SumomoConfig {
   boost::optional<bool> spotlight;
   int spotlight_number = 0;
   boost::optional<bool> simulcast;
+  boost::optional<bool> simulcast_multicodec;
   boost::optional<bool> data_channel_signaling;
   boost::optional<bool> ignore_disconnect_websocket;
 
@@ -153,6 +154,7 @@ class Sumomo : public std::enable_shared_from_this<Sumomo>,
     config.spotlight = config_.spotlight;
     config.spotlight_number = config_.spotlight_number;
     config.simulcast = config_.simulcast;
+    config.simulcast_multicodec = config_.simulcast_multicodec;
     config.data_channel_signaling = config_.data_channel_signaling;
     config.ignore_disconnect_websocket = config_.ignore_disconnect_websocket;
     config.proxy_agent = "Momo Sample for Sora C++ SDK";
@@ -412,6 +414,8 @@ int main(int argc, char* argv[]) {
       ->check(CLI::Range(0, 8));
   add_optional_bool(app, "--simulcast", config.simulcast,
                     "Use simulcast (default: none)");
+  add_optional_bool(app, "--simulcast-multicodec", config.simulcast_multicodec,
+                    "Use simulcast multi-codec (default: none)");
   add_optional_bool(app, "--data-channel-signaling",
                     config.data_channel_signaling,
                     "Use DataChannel for Sora signaling (default: none)");

include/sora/sora_signaling.h

@@ -105,6 +105,7 @@ struct SoraSignalingConfig {
   std::string spotlight_focus_rid;
   std::string spotlight_unfocus_rid;
   boost::optional<bool> simulcast;
+  boost::optional<bool> simulcast_multicodec;
   std::string simulcast_rid;
   boost::optional<bool> data_channel_signaling;
   int data_channel_signaling_timeout = 180;

src/default_video_formats.cpp

@@ -27,16 +27,17 @@ std::vector<webrtc::SdpVideoFormat> GetDefaultVideoFormats(
         cricket::kAv1CodecName, webrtc::CodecParameterMap(),
         webrtc::LibaomAv1EncoderSupportedScalabilityModes()));
   } else if (codec == webrtc::kVideoCodecH264) {
-    r.push_back(CreateH264Format(webrtc::H264Profile::kProfileBaseline,
-                                 webrtc::H264Level::kLevel3_1, "1"));
-    r.push_back(CreateH264Format(webrtc::H264Profile::kProfileBaseline,
-                                 webrtc::H264Level::kLevel3_1, "0"));
-    r.push_back(
-        CreateH264Format(webrtc::H264Profile::kProfileConstrainedBaseline,
-                         webrtc::H264Level::kLevel3_1, "1"));
-    r.push_back(
-        CreateH264Format(webrtc::H264Profile::kProfileConstrainedBaseline,
-                         webrtc::H264Level::kLevel3_1, "0"));
+    for (auto profile : {
+             webrtc::H264Profile::kProfileBaseline,
+             webrtc::H264Profile::kProfileConstrainedBaseline,
+             webrtc::H264Profile::kProfileMain,
+         }) {
+      for (auto level : {webrtc::H264Level::kLevel3_1}) {
+        for (auto mode : {0, 1}) {
+          r.push_back(CreateH264Format(profile, level, std::to_string(mode)));
+        }
+      }
+    }
   } else if (codec == webrtc::kVideoCodecH265) {
     r.push_back(webrtc::SdpVideoFormat(cricket::kH265CodecName));
   }

src/sora_signaling.cpp

@@ -271,6 +271,10 @@ void SoraSignaling::DoSendConnect(bool redirect) {
     m["simulcast"] = *config_.simulcast;
   }
 
+  if (config_.simulcast_multicodec) {
+    m["simulcast_multicodec"] = *config_.simulcast_multicodec;
+  }
+
   if (!config_.simulcast_rid.empty()) {
     m["simulcast_rid"] = config_.simulcast_rid;
   }

test/.testparam.example.json

@@ -23,10 +23,12 @@
       "capture_width": 1024,
       "capture_height": 768,
       "video_bit_rate": 0,
-      "video_codec_type": "H264",
+      "video_codec_type": null,
       "simulcast": false,
+      "simulcast_multicodec": false,
       "use_hardware_encoder": true,
       "openh264": null,
+      "log_level": 2,
     },
 
     "signaling_urls": ["必須"],

test/hello.cpp

@@ -71,6 +71,7 @@ void HelloSora::Run() {
   config.video_bit_rate = config_.video_bit_rate;
   config.multistream = true;
   config.simulcast = config_.simulcast;
+  config.simulcast_multicodec = config_.simulcast_multicodec;
   conn_ = sora::SoraSignaling::Create(config);
 
   boost::asio::executor_work_guard<boost::asio::io_context::executor_type>
@@ -170,6 +171,12 @@ int main(int argc, char* argv[]) {
   if (auto it = v.as_object().find("simulcast"); it != v.as_object().end()) {
     config.simulcast = it->value().as_bool();
   }
+  if (auto it = v.as_object().find("simulcast_multicodec"); it != v.as_object().end()) {
+    config.simulcast_multicodec = it->value().as_bool();
+  }
+  if (auto it = v.as_object().find("log_level"); it != v.as_object().end()) {
+    rtc::LogMessage::LogToDebug((rtc::LoggingSeverity)boost::json::value_to<int>(it->value()));
+  }
 
   sora::SoraClientContextConfig context_config;
   context_config.get_android_application_context = GetAndroidApplicationContext;

test/hello.h

@@ -14,6 +14,7 @@ struct HelloSoraConfig {
   int video_bit_rate = 0;
   std::string video_codec_type = "H264";
   bool simulcast = false;
+  bool simulcast_multicodec = false;
 };
 
 class HelloSora : public std::enable_shared_from_this<HelloSora>,