jcgruenhage/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-14 18:54:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

video_core/codecs: fix multiple decoding issues on Linux ...

Browse source 
* when someone installed Intel video drivers on an AMD system, the
  decoder will select the Intel VA-API decoding driver and yuzu will
  crash due to incorrect driver selection; the fix will check if the
  currently about-to-use driver is loaded in the kernel
* when using NVIDIA driver on Linux with a ffmpeg that does not have
  CUDA capability enabled, the decoder will crash; the fix simply
  making the decoder prefers the VDPAU driver over CUDA on Linux
This commit is contained in:
liushuyu 2021-11-24 17:23:57 -07:00
parent cd6cf0422d
commit 72aa418b0b
No known key found for this signature in database
GPG key ID: 23D1CE4534419437
1 changed files with 47 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/video_core/command_classes/codecs/codec.cpp
View file

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cstdio>
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include "common/assert.h" #include "common/assert.h"
@ -59,6 +60,36 @@ Codec::~Codec() {
av_buffer_unref(&av_gpu_decoder); av_buffer_unref(&av_gpu_decoder);
} }
#ifdef LIBVA_FOUND
// List all the currently loaded Linux modules
static std::vector<std::string> ListLinuxKernelModules() {
std::vector<std::string> modules{};
auto module_listing = fopen("/proc/modules", "rt");
char* buffer = nullptr;
size_t buf_len = 0;
if (!module_listing) {
LOG_WARNING(Service_NVDRV, "Could not open /proc/modules to collect available modules");
return modules;
}
while (getline(&buffer, &buf_len, module_listing) != -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 + 1));
}
if (buffer) {
free(buffer);
}
fclose(module_listing);
return modules;
}
#endif
bool Codec::CreateGpuAvDevice() { bool Codec::CreateGpuAvDevice() {
#if defined(LIBVA_FOUND) #if defined(LIBVA_FOUND)
static constexpr std::array<const char*, 3> VAAPI_DRIVERS = { static constexpr std::array<const char*, 3> VAAPI_DRIVERS = {
@ -67,8 +98,21 @@ bool Codec::CreateGpuAvDevice() {
"amdgpu", "amdgpu",
}; };
AVDictionary* hwdevice_options = nullptr; AVDictionary* hwdevice_options = nullptr;
auto loaded_modules = ListLinuxKernelModules();
av_dict_set(&hwdevice_options, "connection_type", "drm", 0); av_dict_set(&hwdevice_options, "connection_type", "drm", 0);
for (const auto& driver : VAAPI_DRIVERS) { for (const auto& driver : VAAPI_DRIVERS) {
bool found = false;
// first check if the target driver is loaded in the kernel
for (const auto& module : loaded_modules) {
if (module == driver) {
found = true;
break;
}
}
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); av_dict_set(&hwdevice_options, "kernel_driver", driver, 0);
const int hwdevice_error = av_hwdevice_ctx_create(&av_gpu_decoder, AV_HWDEVICE_TYPE_VAAPI, const int hwdevice_error = av_hwdevice_ctx_create(&av_gpu_decoder, AV_HWDEVICE_TYPE_VAAPI,
nullptr, hwdevice_options, 0); nullptr, hwdevice_options, 0);
@ -85,11 +129,12 @@ bool Codec::CreateGpuAvDevice() {
#endif #endif
static constexpr auto HW_CONFIG_METHOD = AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX; static constexpr auto HW_CONFIG_METHOD = AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX;
static constexpr std::array GPU_DECODER_TYPES{ static constexpr std::array GPU_DECODER_TYPES{
#ifdef linux
AV_HWDEVICE_TYPE_VDPAU,
#endif
AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_CUDA,
#ifdef _WIN32 #ifdef _WIN32
AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_D3D11VA,
#else
AV_HWDEVICE_TYPE_VDPAU,
#endif #endif
}; };
for (const auto& type : GPU_DECODER_TYPES) { for (const auto& type : GPU_DECODER_TYPES) {