summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-11-27 00:38:40 +0100
committerGitHub <noreply@github.com>2021-11-27 00:38:40 +0100
commit157985f55616c39c5605168f4e6cf50fd7384320 (patch)
tree78399b8d75e55fe0bfa910c7df3a3644c03c5acc
parentMerge pull request #7440 from lioncash/fmt (diff)
parentvideo_core/codec: address comments (diff)
downloadyuzu-157985f55616c39c5605168f4e6cf50fd7384320.tar
yuzu-157985f55616c39c5605168f4e6cf50fd7384320.tar.gz
yuzu-157985f55616c39c5605168f4e6cf50fd7384320.tar.bz2
yuzu-157985f55616c39c5605168f4e6cf50fd7384320.tar.lz
yuzu-157985f55616c39c5605168f4e6cf50fd7384320.tar.xz
yuzu-157985f55616c39c5605168f4e6cf50fd7384320.tar.zst
yuzu-157985f55616c39c5605168f4e6cf50fd7384320.zip
-rw-r--r--src/video_core/command_classes/codecs/codec.cpp43
1 files changed, 41 insertions, 2 deletions
diff --git a/src/video_core/command_classes/codecs/codec.cpp b/src/video_core/command_classes/codecs/codec.cpp
index 916277811..02d309170 100644
--- a/src/video_core/command_classes/codecs/codec.cpp
+++ b/src/video_core/command_classes/codecs/codec.cpp
@@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <algorithm>
+#include <cstdio>
#include <fstream>
#include <vector>
#include "common/assert.h"
@@ -59,6 +61,34 @@ Codec::~Codec() {
av_buffer_unref(&av_gpu_decoder);
}
+#ifdef LIBVA_FOUND
+// List all the currently loaded Linux modules
+static std::vector<std::string> ListLinuxKernelModules() {
+ using FILEPtr = std::unique_ptr<FILE, decltype(&std::fclose)>;
+ auto module_listing = FILEPtr{fopen("/proc/modules", "rt"), std::fclose};
+ std::vector<std::string> modules{};
+ if (!module_listing) {
+ LOG_WARNING(Service_NVDRV, "Could not open /proc/modules to collect available modules");
+ return modules;
+ }
+ char* buffer = nullptr;
+ size_t buf_len = 0;
+ while (getline(&buffer, &buf_len, module_listing.get()) != -1) {
+ // format for the module listing file (sysfs)
+ // <name> <module_size> <depended_by_count> <depended_by_names> <status> <load_address>
+ auto line = std::string(buffer);
+ // we are only interested in module names
+ auto name_pos = line.find_first_of(" ");
+ if (name_pos == std::string::npos) {
+ continue;
+ }
+ modules.push_back(line.erase(name_pos));
+ }
+ free(buffer);
+ return modules;
+}
+#endif
+
bool Codec::CreateGpuAvDevice() {
#if defined(LIBVA_FOUND)
static constexpr std::array<const char*, 3> VAAPI_DRIVERS = {
@@ -67,8 +97,16 @@ bool Codec::CreateGpuAvDevice() {
"amdgpu",
};
AVDictionary* hwdevice_options = nullptr;
+ const auto loaded_modules = ListLinuxKernelModules();
av_dict_set(&hwdevice_options, "connection_type", "drm", 0);
for (const auto& driver : VAAPI_DRIVERS) {
+ // first check if the target driver is loaded in the kernel
+ bool found = std::any_of(loaded_modules.begin(), loaded_modules.end(),
+ [&driver](const auto& module) { return module == driver; });
+ if (!found) {
+ LOG_DEBUG(Service_NVDRV, "Kernel driver {} is not loaded, trying the next one", driver);
+ continue;
+ }
av_dict_set(&hwdevice_options, "kernel_driver", driver, 0);
const int hwdevice_error = av_hwdevice_ctx_create(&av_gpu_decoder, AV_HWDEVICE_TYPE_VAAPI,
nullptr, hwdevice_options, 0);
@@ -85,11 +123,12 @@ bool Codec::CreateGpuAvDevice() {
#endif
static constexpr auto HW_CONFIG_METHOD = AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX;
static constexpr std::array GPU_DECODER_TYPES{
+#ifdef linux
+ AV_HWDEVICE_TYPE_VDPAU,
+#endif
AV_HWDEVICE_TYPE_CUDA,
#ifdef _WIN32
AV_HWDEVICE_TYPE_D3D11VA,
-#else
- AV_HWDEVICE_TYPE_VDPAU,
#endif
};
for (const auto& type : GPU_DECODER_TYPES) {