Merge pull request obsproject#235 from amazon-contributing/ruwen/add-…

…adapter-idx UI: Add `composition_gpu_index` to multitrack video postdata
amazon-contributing · Jun 14, 2024 · 8f33c77 · 8f33c77
2 parents 2c0e021 + 6d3eea4
commit 8f33c77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/UI/goliveapi-postdata.cpp b/UI/goliveapi-postdata.cpp
@@ -37,6 +37,8 @@ constructGoLivePost(QString streamKey,
 
 		preferences.canvas_width = ovi.base_width;
 		preferences.canvas_height = ovi.base_height;
+
+		preferences.composition_gpu_index = ovi.adapter;
 	}
 
 	if (!extra_views.empty()) {

diff --git a/UI/models/multitrack-video.hpp b/UI/models/multitrack-video.hpp
@@ -202,11 +202,13 @@ struct Preferences {
 	media_frames_per_second framerate;
 	uint32_t canvas_width;
 	uint32_t canvas_height;
+	optional<uint32_t> composition_gpu_index;
 
 	NLOHMANN_DEFINE_TYPE_INTRUSIVE(Preferences, maximum_aggregate_bitrate,
 				       maximum_video_tracks, extra_views,
 				       vod_track_audio, width, height,
-				       framerate, canvas_width, canvas_height)
+				       framerate, canvas_width, canvas_height,
+				       composition_gpu_index)
 };
 
 struct PostData {