artin/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2026-02-06 11:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

VNC-151 Refactor cli arg validation

Browse Source
This commit is contained in:
El 2025-10-26 19:25:38 +00:00
parent 6762d29ea1
commit a369ee55dd
No known key found for this signature in database
GPG Key ID: 205388FEB607950A
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/rfb/VNCServerST.cxx
View File

@ -254,25 +254,24 @@ VNCServerST::VNCServerST(const char* name_, SDesktop* desktop_)
if (watermarkData)
sendWatermark = true;
const char *selected_codec = Server::videoCodec;
const char *codec_cli_arg = Server::videoCodec;
if (codec_cli_arg[0]) {
const auto parsed_codecs = SupportedVideoEncoders::parse(codec_cli_arg);
for (auto codec: parsed_codecs) {
if (!SupportedVideoEncoders::is_supported(codec))
throw std::invalid_argument(fmt::format("Unknown video codec: {}", codec));
}
if (selected_codec[0] && !SupportedVideoEncoders::is_supported(selected_codec))
throw std::invalid_argument(fmt::format("Unknown video codec: {}", selected_codec));
encoders = SupportedVideoEncoders::filter_available_encoders(SupportedVideoEncoders::map_encoders(parsed_codecs), video_encoders::available_encoders);
const auto selected_encoders = SupportedVideoEncoders::parse(selected_codec);
std::string encoder_names;
for (auto encoder: video_encoders::available_encoders) {
if (std::ranges::find(selected_encoders, encoder) != selected_encoders.end())
encoders.push_back(encoder);
for (const auto encoder: encoders)
encoder_names.append(KasmVideoEncoders::to_string(encoder)).append(" ");
slog.info("Using CLI-specified video codecs (supported subset): %s", encoder_names.c_str());
}
std::string encoder_names;
for (auto encoder: encoders)
encoder_names.append(KasmVideoEncoders::to_string(encoder)).append(" ");
slog.info("Using CLI-specified video codecs (supported subset): %s", encoder_names.c_str());
if (Server::selfBench)
SelfBench();