4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

frontend: Allow selecting additional canvases for multitrack

Browse source
This commit is contained in:
Dennis Sädtler 2025-02-05 13:32:03 +01:00 • committed by Ryan Foster
commit 0552062390
10 changed files with 147 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

19
frontend/utility/GoLiveAPI_PostData.cpp
View file

@ -6,7 +6,8 @@
#include <nlohmann/json.hpp>
GoLiveApi::PostData constructGoLivePost(QString streamKey, const std::optional<uint64_t> &maximum_aggregate_bitrate,
const std::optional<uint32_t> &maximum_video_tracks, bool vod_track_enabled)
const std::optional<uint32_t> &maximum_video_tracks, bool vod_track_enabled,
const std::vector<OBSCanvasAutoRelease> &canvases)
{
GoLiveApi::PostData post_data{};
post_data.service = "IVS";
@ -49,13 +50,17 @@ GoLiveApi::PostData constructGoLivePost(QString streamKey, const std::optional<u
preferences.vod_track_audio = vod_track_enabled;
obs_video_info ovi;
if (obs_get_video_info(&ovi)) {
if (obs_get_video_info(&ovi))
preferences.composition_gpu_index = ovi.adapter;
preferences.canvases.emplace_back(GoLiveApi::Canvas{ovi.output_width,
ovi.output_height,
ovi.base_width,
ovi.base_height,
{ovi.fps_num, ovi.fps_den}});
for (const auto &canvas : canvases) {
if (obs_canvas_get_video_info(canvas, &ovi)) {
preferences.canvases.emplace_back(GoLiveApi::Canvas{ovi.output_width,
ovi.output_height,
ovi.base_width,
ovi.base_height,
{ovi.fps_num, ovi.fps_den}});
}
}
obs_audio_info2 oai2;