sumomo に --simulcast-multicodec オプションを追加

shiguredo · Apr 18, 2024 · a9057f5 · a9057f5
1 parent 056cd22
commit a9057f5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,9 @@
 
 ## develop
 
+- [ADD] sumomo に --simulcast-multicodec オプションを追加
+  - @melpon
+
 ## 2024.6.0 (2024-04-01)
 
 - [CHANGE] `VplVideoDecoderImpl` の `ImplementationName` を `oneVPL` から `libvpl` に変更する

diff --git a/examples/sumomo/src/sumomo.cpp b/examples/sumomo/src/sumomo.cpp
@@ -37,6 +37,7 @@ struct MomoSampleConfig {
   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;
 
@@ -142,6 +143,7 @@ class MomoSample : public std::enable_shared_from_this<MomoSample>,
     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";
@@ -375,6 +377,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)");

diff --git a/include/sora/sora_signaling.h b/include/sora/sora_signaling.h
@@ -89,6 +89,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;

diff --git a/src/sora_signaling.cpp b/src/sora_signaling.cpp
@@ -265,6 +265,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;
   }