Mirrors/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2026-07-17 16:36:49 +00:00
Code Issues Projects Releases Wiki Activity

VNC-151 Build fix

Browse source
This commit is contained in:
El 2026-02-24 16:06:57 +00:00
parent e88c932da1
commit 31bb57a09c
No known key found for this signature in database
GPG key ID: EB3F4C9EA29CDE59
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/rfb/encoders/EncoderProbe.cpp
View file

@ -17,13 +17,14 @@
*/
#include "EncoderProbe.h"
#include <fcntl.h>
#include <fmt/format.h>
#include <fstream>
#include <rfb/LogWriter.h>
#include <string>
#include <unistd.h>
#include <vector>
#include "KasmVideoConstants.h"
#include "KasmVideoEncoders.h"
#include <fstream>
extern "C" {
#include <libavcodec/avcodec.h>
@ -95,7 +96,7 @@ namespace rfb::video_encoders {
}
bool EncoderProbe::dri_node_supports_hwdevice_type(const char *dri_node, int hw_type) {
const auto path = std::format("/sys/class/drm/{}/device/vendor", dri_node);
const auto path = fmt::format("/sys/class/drm/{}/device/vendor", dri_node);
std::ifstream file{path};
if (!file.is_open())
@ -115,7 +116,7 @@ namespace rfb::video_encoders {
}
}
bool EncoderProbe::try_open_codec(const char *dri_node, const AVCodec *codec, const EncoderCandidate &candidate) {
bool EncoderProbe::try_open_codec(const char *dri_node, const AVCodec *codec, const EncoderCandidate &candidate) const {
FFmpeg::BufferGuard hw_ctx_guard;
AVBufferRef *hw_ctx{};
@ -231,7 +232,7 @@ namespace rfb::video_encoders {
continue;
}
const auto dri_device = std::format("/dev/dri/{}", dri_node_path);
const auto dri_device = fmt::format("/dev/dri/{}", dri_node_path);
vlog.debug("Trying dri node %s", dri_device.c_str());
if (!try_open_codec(dri_device.c_str(), codec, encoder_candidate))
continue;

4
common/rfb/encoders/EncoderProbe.h
View file

@ -35,8 +35,8 @@ namespace rfb::video_encoders {
};
explicit EncoderProbe(FFmpeg &ffmpeg, const std::vector<std::string_view> &parsed_encoders, const char *dri_node);
bool dri_node_supports_hwdevice_type(const char *dri_node, int hw_type);
bool try_open_codec(const char *dri_node, const AVCodec *codec, const EncoderCandidate &candidate);
static bool dri_node_supports_hwdevice_type(const char *dri_node, int hw_type);
bool try_open_codec(const char *dri_node, const AVCodec *codec, const EncoderCandidate &candidate) const;
KasmVideoEncoders::EncoderConfigs probe(const char *dri_node, std::span<EncoderCandidate> candidates);
public: