From ef057dd3af40c8040b9ac097cd3276eb91f27be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20S=C3=A4dtler?= <saedtler@twitch.tv>
Date: Mon, 21 Jul 2025 16:34:08 +0200
Subject: [PATCH] frontend: Fix and simplify initialization of supported_codecs

---
 frontend/utility/GoLiveAPI_PostData.cpp      | 18 +++++-------------
 frontend/utility/models/multitrack-video.hpp |  3 ++-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/frontend/utility/GoLiveAPI_PostData.cpp b/frontend/utility/GoLiveAPI_PostData.cpp
index 6e241dc17..02be6f28c 100644
--- a/frontend/utility/GoLiveAPI_PostData.cpp
+++ b/frontend/utility/GoLiveAPI_PostData.cpp
@@ -21,14 +21,6 @@ GoLiveApi::PostData constructGoLivePost(QString streamKey, const std::optional<u
 	client.name = "obs-studio";
 	client.version = obs_get_version_string();
 
-	auto add_codec = [&](const char *codec) {
-		auto it = std::find(std::begin(client.supported_codecs), std::end(client.supported_codecs), codec);
-		if (it != std::end(client.supported_codecs))
-			return;
-
-		client.supported_codecs.push_back(codec);
-	};
-
 	const char *encoder_id = nullptr;
 	for (size_t i = 0; obs_enum_encoder_types(i, &encoder_id); i++) {
 		auto codec = obs_get_encoder_codec(encoder_id);
@@ -36,13 +28,13 @@ GoLiveApi::PostData constructGoLivePost(QString streamKey, const std::optional<u
 			continue;
 
 		if (qstricmp(codec, "h264") == 0) {
-			add_codec("h264");
+			client.supported_codecs.emplace("h264");
 #ifdef ENABLE_HEVC
-		} else if (qstricmp(codec, "hevc")) {
-			add_codec("h265");
+		} else if (qstricmp(codec, "hevc") == 0) {
+			client.supported_codecs.emplace("h265");
 #endif
-		} else if (qstricmp(codec, "av1")) {
-			add_codec("av1");
+		} else if (qstricmp(codec, "av1") == 0) {
+			client.supported_codecs.emplace("av1");
 		}
 	}
 
diff --git a/frontend/utility/models/multitrack-video.hpp b/frontend/utility/models/multitrack-video.hpp
index 1443d2878..0aa1cae65 100644
--- a/frontend/utility/models/multitrack-video.hpp
+++ b/frontend/utility/models/multitrack-video.hpp
@@ -18,6 +18,7 @@
 
 #include <string>
 #include <optional>
+#include <unordered_set>
 
 #include <obs.h>
 
@@ -94,7 +95,7 @@ using json = nlohmann::json;
 struct Client {
 	string name = "obs-studio";
 	string version;
-	std::vector<string> supported_codecs;
+	std::unordered_set<std::string> supported_codecs;
 
 	NLOHMANN_DEFINE_TYPE_INTRUSIVE(Client, name, version, supported_codecs)
 };