Refined constructGoLivePost for enhanced broadcasting to accept desired canvases

Author: avoitenko-logitech

obs-studio-server/source/nodeobs_service.cpp

@@ -1373,7 +1373,17 @@ bool OBS_service::startMultiTrackStreaming(StreamServiceId serviceId, bool dualS
 
 	auto vod_track_mixer = IsVodTrackEnabled(services[serviceId]) ? std::optional{vodTrackIndex} : std::nullopt;
 
-	auto go_live_post = osn::constructGoLivePost(serviceId, dualStreamingMode, key, std::nullopt, std::nullopt, vod_track_mixer.has_value());
+	std::vector<obs_video_info*> canvases;
+	canvases.push_back(videoInfo[serviceId]);
+	if (dualStreamingMode) {
+		if (serviceId == StreamServiceId::Main) {
+			canvases.push_back(videoInfo[StreamServiceId::Second]);
+		} else if (serviceId == StreamServiceId::Second) {
+			canvases.push_back(videoInfo[StreamServiceId::Main]);
+		}
+	}
+
+	auto go_live_post = osn::constructGoLivePost(canvases, key, std::nullopt, std::nullopt, vod_track_mixer.has_value());
 	std::optional<osn::Config> go_live_config = osn::DownloadGoLiveConfig(auto_config_url, go_live_post);
 	if (!go_live_config.has_value()) {
 		throw std::runtime_error("startStreaming - go live config is empty");

obs-studio-server/source/osn-multitrack-video-configuration.cpp

@@ -218,8 +218,11 @@ std::string MultitrackVideoAutoConfigURL(obs_service_t *service)
 	return url;
 }
 
-PostData constructGoLivePost(StreamServiceId serviceId, bool dualStreamingMode, std::string streamKey, const std::optional<uint64_t> &maximum_aggregate_bitrate,
-			     const std::optional<uint32_t> &maximum_video_tracks, bool vod_track_enabled)
+PostData constructGoLivePost(std::vector<obs_video_info*> canvases,
+	                         std::string streamKey,
+							 const std::optional<uint64_t> &maximum_aggregate_bitrate,
+			     			 const std::optional<uint32_t> &maximum_video_tracks,
+							 bool vod_track_enabled)
 {
 	PostData post_data{};
 	post_data.service = "IVS";
@@ -255,6 +258,19 @@ PostData constructGoLivePost(StreamServiceId serviceId, bool dualStreamingMode,
 	if (obs_get_video_info(&ovi))
 		preferences.composition_gpu_index = ovi.adapter;
 
+
+	for (const auto& c : canvases) {
+		if (!c) {
+			blog(LOG_WARNING, "constructGoLivePost - empty canvas, skipping");
+			continue;
+		}
+
+		preferences.canvases.emplace_back(
+				Canvas{c->output_width, c->output_height, c->base_width, c->base_height, {c->fps_num, c->fps_den}});
+	}
+
+	// TODO: remove
+	/*
 	const size_t contexts = obs_get_video_info_count();
 	for (size_t i = 0; i < contexts; i++) {
 		if (obs_get_video_info_by_index(i, &ovi)) {
@@ -273,6 +289,7 @@ PostData constructGoLivePost(StreamServiceId serviceId, bool dualStreamingMode,
 				Canvas{ovi.output_width, ovi.output_height, ovi.base_width, ovi.base_height, {ovi.fps_num, ovi.fps_den}});
 		}
 	}
+	*/
 
 	obs_audio_info2 oai2;
 	if (obs_get_audio_info2(&oai2)) {

obs-studio-server/source/osn-multitrack-video-configuration.hpp

@@ -7,14 +7,15 @@
 
 #include <optional>
 #include <string>
+#include <vector>
 
 namespace osn {
 
 std::string MultitrackVideoAutoConfigURL(obs_service_t *service);
 
 Config DownloadGoLiveConfig(std::string url, const PostData &post_data);
 
-PostData constructGoLivePost(StreamServiceId serviceId, bool dualStreamingMode, std::string streamKey, const std::optional<uint64_t> &maximum_aggregate_bitrate,
+PostData constructGoLivePost(std::vector<obs_video_info*> canvases, std::string streamKey, const std::optional<uint64_t> &maximum_aggregate_bitrate,
 			     const std::optional<uint32_t> &maximum_video_tracks, bool vod_track_enabled);
 
 }

obs-studio-server/source/osn-multitrack-video-system-info.cpp

@@ -241,7 +241,6 @@ void system_info(Capabilities &capabilities)
 		system_data.build = ver.build;
 		system_data.release = win_release_id;
 		system_data.revision = std::to_string(ver.revis);
-		;
 		system_data.bits = is_64_bit_windows() ? 64 : 32;
 		system_data.arm = is_arm64_windows();
 		system_data.armEmulation = os_get_emulation_status();

obs-studio-server/source/osn-streaming.cpp

@@ -446,8 +446,7 @@ void osn::Streaming::StartEnhancedBroadcastingStream(std::optional<size_t> vod_t
 	auto auto_config_url = osn::MultitrackVideoAutoConfigURL(this->service);
 	blog(LOG_INFO, "Auto config URL: %s", auto_config_url.c_str());
 
-	const bool dualStreamingMode = true; // TODO: revise this??????? Make this dynamic?????
-	auto go_live_post = osn::constructGoLivePost(StreamServiceId::Main, dualStreamingMode, key, std::nullopt, std::nullopt, vod_track_mixer.has_value());
+	auto go_live_post = osn::constructGoLivePost({this->GetCanvas()}, key, std::nullopt, std::nullopt, vod_track_mixer.has_value());
 	std::optional<osn::Config> go_live_config = osn::DownloadGoLiveConfig(auto_config_url, go_live_post);
 	if (!go_live_config.has_value()) {
 		throw std::runtime_error("startStreaming - go live config is empty");