From 84427414fe9495e2df476710c1523be2ea5d815d Mon Sep 17 00:00:00 2001 From: El Date: Tue, 30 Dec 2025 22:30:37 +0000 Subject: [PATCH] VNC-151 Fix build --- common/rfb/encoders/EncoderConfiguration.cpp | 46 ++++++++++++++++++++ common/rfb/encoders/EncoderConfiguration.h | 44 +++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 common/rfb/encoders/EncoderConfiguration.cpp create mode 100644 common/rfb/encoders/EncoderConfiguration.h diff --git a/common/rfb/encoders/EncoderConfiguration.cpp b/common/rfb/encoders/EncoderConfiguration.cpp new file mode 100644 index 0000000..ca49f67 --- /dev/null +++ b/common/rfb/encoders/EncoderConfiguration.cpp @@ -0,0 +1,46 @@ +#include "EncoderConfiguration.h" + +namespace rfb { + static inline std::array(KasmVideoEncoders::Encoder::unavailable) + 1> EncoderConfigurations = + { + // AV1 + // av1_vaapi + EncoderConfiguration{0, 0, {}}, + // av1_ffmpeg_vaapi + EncoderConfiguration{0, 0, {}}, + // av1_nvenc + EncoderConfiguration{0, 0, {}}, + // av1_software + EncoderConfiguration{0, 0, {}}, + + // H.265 + // h265_vaapi + EncoderConfiguration{0, 51, {18, 23, 28, 39, 51}}, + // h265_ffmpeg_vaapi + EncoderConfiguration{0, 51, {18, 23, 28, 39, 51}}, + // h265_nvenc + EncoderConfiguration{0, 51, {18, 23, 28, 39, 51}}, + // h265_software + EncoderConfiguration{0, 51, {18, 23, 28, 39, 51}}, + + // H.264 + // h264_vaapi + EncoderConfiguration{0, 51, {18, 23, 28, 33, 51}}, + // h264_ffmpeg_vaapi + EncoderConfiguration{0, 51, {18, 23, 28, 39, 51}}, + // h264_nvenc + EncoderConfiguration{0, 51, {18, 23, 28, 39, 51}}, + // h264_software + EncoderConfiguration{0, 51, {18, 23, 28, 39, 51}}, + + EncoderConfiguration{} + }; + + // Compile-time check: EncoderConfigurations must match Encoder enum count (excluding unavailable) + static_assert(EncoderConfigurations.size() == static_cast(KasmVideoEncoders::Encoder::unavailable) + 1, + "EncoderSettingsArray size must match KasmVideoEncoders::Encoder enum count."); + + const EncoderConfiguration &EncoderConfiguration::get_configuration(KasmVideoEncoders::Encoder encoder) { + return EncoderConfigurations[static_cast(encoder)]; + } +} // namespace rfb diff --git a/common/rfb/encoders/EncoderConfiguration.h b/common/rfb/encoders/EncoderConfiguration.h new file mode 100644 index 0000000..36d90df --- /dev/null +++ b/common/rfb/encoders/EncoderConfiguration.h @@ -0,0 +1,44 @@ +/* Copyright (C) 2025 Kasm. All Rights Reserved. + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ +#pragma once + +#include +#include +#include +#include + +#include "KasmVideoEncoders.h" +#include "rdr/types.h" + +namespace rfb { + struct EncoderConfiguration { + struct CodecOption { + std::string name; + std::variant value; + }; + + static constexpr uint8_t MAX_PRESETS = 5; + rdr::S32 min_quality{}; + rdr::S32 max_quality{}; + + // std::vector codecOptions{}; + std::array presets{}; + + static const EncoderConfiguration &get_configuration(KasmVideoEncoders::Encoder encoder); + }; +} // namespace rfb