UI: Add support for backup/redundant streams

UI/api-interface.cpp

@@ -385,7 +385,10 @@ struct OBSStudioAPI : obs_frontend_callbacks {
 
 	obs_output_t *obs_frontend_get_streaming_output(void) override
 	{
-		OBSOutput output = main->outputHandler->streamOutput.Get();
+		if (main->outputHandler->streamOutputs.empty())
+			return nullptr;
+
+		OBSOutput output = main->outputHandler->streamOutputs[0].Get();
 		return obs_output_get_ref(output);
 	}
 
@@ -506,7 +509,7 @@ struct OBSStudioAPI : obs_frontend_callbacks {
 
 	obs_service_t *obs_frontend_get_streaming_service(void) override
 	{
-		return main->GetService();
+		return main->GetServices().front();
 	}
 
 	void obs_frontend_save_streaming_service(void) override

UI/auth-oauth.cpp

@@ -316,7 +316,7 @@ void OAuthStreamKey::OnStreamConfig()
 		return;
 
 	OBSBasic *main = OBSBasic::Get();
-	obs_service_t *service = main->GetService();
+	obs_service_t *service = main->GetServices().front();
 
 	OBSDataAutoRelease settings = obs_service_get_settings(service);
 

UI/data/locale/en-US.ini

@@ -192,6 +192,8 @@ Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Link)"
 Basic.AutoConfig.StreamPage.EncoderKey="Encoder Key"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Connected account"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimate bitrate with bandwidth test (may take a few minutes)"
+Basic.AutoConfig.StreamPage.AllowRedundantStreams="Allow redundant streams"
+Basic.AutoConfig.StreamPage.AllowRedundantStreamsTooltip="Simultaneously upload a stream and backup copies of the stream to increase reliability."
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Prefer hardware encoding"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Hardware Encoding eliminates most CPU usage, but may require more bitrate to obtain the same level of quality."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Stream warning"

UI/forms/AutoConfigStreamPage.ui

@@ -386,7 +386,23 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
+       <item row="5" column="1">
+        <widget class="QCheckBox" name="allowRedundantStreams">
+         <property name="toolTip">
+          <string>Basic.AutoConfig.StreamPage.AllowRedundantStreamsTooltip</string>
+         </property>
+         <property name="text">
+          <string>Basic.AutoConfig.StreamPage.AllowRedundantStreams</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <property name="visible">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
         <widget class="QGroupBox" name="region">
          <property name="title">
           <string>BandwidthTest.Region</string>
@@ -423,7 +439,7 @@
          </layout>
         </widget>
        </item>
-       <item row="7" column="1">
+       <item row="8" column="1">
         <widget class="QPushButton" name="connectAccount2">
          <property name="cursor">
           <cursorShape>PointingHandCursor</cursorShape>
@@ -433,7 +449,7 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="6" column="1">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -446,7 +462,7 @@
          </property>
         </spacer>
        </item>
-       <item row="8" column="1">
+       <item row="9" column="1">
         <layout class="QHBoxLayout" name="horizontalLayout_6">
          <property name="leftMargin">
           <number>7</number>
@@ -475,14 +491,14 @@
          </item>
         </layout>
        </item>
-       <item row="8" column="0">
+       <item row="9" column="0">
         <widget class="QLabel" name="connectedAccountLabel">
          <property name="text">
           <string>Basic.AutoConfig.StreamPage.ConnectedAccount</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0">
+       <item row="10" column="0">
         <spacer name="horizontalSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -495,7 +511,7 @@
          </property>
         </spacer>
        </item>
-       <item row="9" column="1">
+       <item row="10" column="1">
         <widget class="QPushButton" name="useStreamKeyAdv">
          <property name="text">
           <string>Basic.AutoConfig.StreamPage.UseStreamKeyAdvanced</string>

UI/streaming-helpers.cpp

@@ -7,9 +7,15 @@
 #include <util/platform.h>
 #include <util/util.hpp>
 #include <obs.h>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <sstream>
 
 using namespace json11;
 
+std::string create_server_id(const std::string &server,
+			     const std::vector<std::string> &backupServers);
+
 static Json open_json_file(const char *path)
 {
 	BPtr<char> file_data = os_quick_read_utf8_file(path);
@@ -68,6 +74,63 @@ Json get_service_from_json(const Json &root, const char *name)
 	return Json();
 }
 
+std::vector<std::string> get_backup_servers(obs_data_t *settings)
+{
+	OBSDataArrayAutoRelease backup_servers =
+		obs_data_get_array(settings, "backup_servers");
+	size_t count = obs_data_array_count(backup_servers);
+
+	std::vector<std::string> result;
+	for (size_t i = 0; i < count; ++i) {
+		OBSDataAutoRelease array_obj =
+			obs_data_array_item(backup_servers, i);
+		result.push_back(
+			std::string(obs_data_get_string(array_obj, "server")));
+	}
+
+	return result;
+}
+
+OBSDataArrayAutoRelease backup_servers_to_data_array(const QJsonArray &array)
+{
+	OBSDataArrayAutoRelease data = obs_data_array_create();
+	for (auto item : array) {
+		OBSDataAutoRelease obj = obs_data_create();
+		obs_data_set_string(obj, "server",
+				    item.toString().toStdString().c_str());
+		obs_data_array_push_back(data, obj);
+	}
+	return data;
+}
+
+std::string create_server_id(const std::string &server,
+			     const std::vector<std::string> &backupServers)
+{
+	std::stringstream id;
+
+	id << server;
+	for (const auto &backup_server : backupServers)
+		id << "," << backup_server;
+
+	return id.str();
+}
+
+int find_server_index(const std::string &server,
+		      const std::vector<std::string> &backupServers,
+		      QComboBox *serversComboBox)
+{
+	std::string id = create_server_id(server, backupServers);
+	int idx = -1;
+	for (int i = 0; i < serversComboBox->count(); i++) {
+		QJsonObject data = serversComboBox->itemData(i).toJsonObject();
+		if (id == data.value("id").toString().toStdString()) {
+			idx = i;
+			break;
+		}
+	}
+	return idx;
+}
+
 bool StreamSettingsUI::IsServiceOutputHasNetworkFeatures()
 {
 	if (IsCustomService())
@@ -199,7 +262,26 @@ void StreamSettingsUI::UpdateServerList()
 
 	auto &servers = service["servers"].array_items();
 	for (const Json &entry : servers) {
-		ui_server->addItem(entry["name"].string_value().c_str(),
-				   entry["url"].string_value().c_str());
+		QJsonObject data;
+		QJsonArray qbackup_servers;
+		const auto &urls = entry["backup_urls"].array_items();
+
+		for (auto &url : urls) {
+			qbackup_servers.append(
+				QString::fromStdString(url.string_value()));
+		}
+
+		std::vector<std::string> backup_servers;
+		for (auto &url : urls)
+			backup_servers.push_back(url.string_value());
+
+		// `id` is used to easily lookup items in `ui_server`.
+		data.insert("id", QString::fromStdString(create_server_id(
+					  entry["url"].string_value(),
+					  backup_servers)));
+		data.insert("server", QString::fromStdString(
+					      entry["url"].string_value()));
+		data.insert("backup_servers", qbackup_servers);
+		ui_server->addItem(entry["name"].string_value().c_str(), data);
 	}
 }

UI/streaming-helpers.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "url-push-button.hpp"
+#include "obs.hpp"
 #include <QComboBox>
 #include <QLineEdit>
 #include <QLabel>
@@ -10,6 +11,12 @@
 extern json11::Json get_services_json();
 extern json11::Json get_service_from_json(const json11::Json &root,
 					  const char *name);
+extern OBSDataArrayAutoRelease
+backup_servers_to_data_array(const QJsonArray &array);
+extern std::vector<std::string> get_backup_servers(obs_data_t *settings);
+extern int find_server_index(const std::string &server,
+			     const std::vector<std::string> &backupServers,
+			     QComboBox *serversComboBox);
 
 enum class ListOpt : int {
 	ShowAll = 1,