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 Adjust stream mode logic to use appropriate video codec configurations and presets

Browse Source
This commit is contained in:
El 2025-12-30 13:53:26 +00:00
parent c9f8db5dd2
commit 7b43cd12fc
No known key found for this signature in database
GPG Key ID: 205388FEB607950A
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/rfb/ConnParams.cxx
View File

@ -356,9 +356,11 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
}
if (encodings[i] >= pseudoEncodingStreamingVideoQualityLevel0 && encodings[i] <= pseudoEncodingStreamingVideoQualityLevel63) {
const auto &config = EncoderConfiguration::get_configuration(encoder);
const auto value = config.max_quality - encodings[i] + pseudoEncodingStreamingVideoQualityLevel0;
if (can_apply)
Server::videoQualityCRFCQP.setParam(pseudoEncodingStreamingVideoQualityLevel63 - encodings[i]);
clientparlog("videoQualityCRFCQP", pseudoEncodingStreamingVideoQualityLevel63 - encodings[i], can_apply);
Server::videoQualityCRFCQP.setParam(value);
clientparlog("videoQualityCRFCQP", value, can_apply);
}
if (encodings[i] >=pseudoEncodingStreamingModeAV1QSV && encodings[i] <= pseudoEncodingStreamingModeJpegWebp) {

14
common/rfb/SMsgWriter.cxx
View File

@ -24,6 +24,7 @@
#include <rfb/LogWriter.h>
#include <rfb/SMsgWriter.h>
#include <rfb/UpdateTracker.h>
#include <rfb/encoders/EncoderConfiguration.h>
#include <rfb/fenceTypes.h>
#include <rfb/ledStates.h>
#include <rfb/msgTypes.h>
@ -782,9 +783,20 @@ void SMsgWriter::writeVideoEncoders(const std::vector<int32_t> &encoders) {
const uint8_t size = conjunction.size();
os->writeU8(size);
for (auto encoder: conjunction)
for (auto encoder: conjunction) {
os->writeS32(encoder);
const auto &config = EncoderConfiguration::get_configuration(KasmVideoEncoders::from_encoding(encoder));
os->writeS32(config.min_quality);
os->writeS32(config.max_quality);
os->writeU8(config.presets.size());
for (const auto &preset_value: config.presets) {
os->writeS32(preset_value);
}
}
endMsg();
}

11
common/rfb/encoders/KasmVideoEncoders.h
View File

@ -75,11 +75,6 @@ auto enum_range(T begin, T end) {
namespace rfb {
struct KasmVideoEncoders {
struct EncoderSettings {
int16_t min_quality{};
int16_t max_quality{};
std::array<uint16_t, 5> presets{};
};
// Codecs are ordered by preferred usage quality
enum class Encoder : uint8_t
{
@ -98,7 +93,7 @@ namespace rfb {
h264_nvenc,
h264_software,
unavailable
unavailable // Keep this as the last entry - used for compile-time size checks
};
using Encoders = std::vector<Encoder>;
@ -119,6 +114,8 @@ namespace rfb {
"libx264",
"unavailable"});
static_assert(EncoderNames.size() == static_cast<size_t>(Encoder::unavailable) + 1, "EncoderNames array size must match Encoder enum count.");
static inline auto Encodings = std::to_array<int>({pseudoEncodingStreamingModeAV1VAAPI,
pseudoEncodingStreamingModeAV1VAAPI,
pseudoEncodingStreamingModeAV1NVENC,
@ -136,6 +133,8 @@ namespace rfb {
pseudoEncodingStreamingModeJpegWebp});
static_assert(Encodings.size() == static_cast<size_t>(Encoder::unavailable) + 1, "Encodings array size must match Encoder enum count. ");
static bool is_accelerated(Encoder encoder) {
return encoder != Encoder::h264_software && encoder != Encoder::h265_software && encoder != Encoder::av1_software;
}

11
common/rfb/encoders/SupportedVideoEncoders.h
View File

@ -1,5 +1,5 @@
/* 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
@ -17,8 +17,8 @@
*/
#pragma once
#include <array>
#include <algorithm>
#include <array>
#include <cstdint>
#include <string_view>
#include <vector>
@ -46,7 +46,7 @@ namespace rfb {
av1_vaapi,
av1_nvenc,
auto_detect,
unavailable
unavailable // Keep this as the last entry - used for compile-time size checks
};
static constexpr auto MappedCodecs = std::to_array<KasmVideoEncoders::Encoder>({KasmVideoEncoders::Encoder::h264_software,
@ -70,6 +70,9 @@ namespace rfb {
KasmVideoEncoders::Encoder::unavailable});
static_assert(
MappedCodecs.size() == static_cast<size_t>(Codecs::unavailable) + 1, "MappedCodecs array size must match Codecs enum count");
static inline auto CodecNames = std::to_array<std::string_view>({"h264",
"h264_vaapi",
"h264_nvenc",
@ -90,6 +93,8 @@ namespace rfb {
"auto"});
static_assert(CodecNames.size() == static_cast<size_t>(Codecs::unavailable), "CodecNames array size must match Codecs enum count");
static std::string_view to_string(Codecs codec) {
return CodecNames[static_cast<uint8_t>(codec)];
}