mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 00:50:42 +02:00
video_core/codecs: more robust ffmpeg hwdecoder selection logic
This commit is contained in:
parent
fdcc161323
commit
cd27f211c8
@ -23,6 +23,14 @@ namespace Tegra {
|
|||||||
namespace {
|
namespace {
|
||||||
constexpr AVPixelFormat PREFERRED_GPU_FMT = AV_PIX_FMT_NV12;
|
constexpr AVPixelFormat PREFERRED_GPU_FMT = AV_PIX_FMT_NV12;
|
||||||
constexpr AVPixelFormat PREFERRED_CPU_FMT = AV_PIX_FMT_YUV420P;
|
constexpr AVPixelFormat PREFERRED_CPU_FMT = AV_PIX_FMT_YUV420P;
|
||||||
|
constexpr std::array PREFERRED_GPU_DECODERS = {AV_HWDEVICE_TYPE_CUDA,
|
||||||
|
#ifdef _WIN32
|
||||||
|
AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_DXVA2,
|
||||||
|
#elif linux
|
||||||
|
AV_HWDEVICE_TYPE_VDPAU,
|
||||||
|
#endif
|
||||||
|
// last resort for Linux Flatpak (w/ NVIDIA)
|
||||||
|
AV_HWDEVICE_TYPE_VULKAN};
|
||||||
|
|
||||||
void AVPacketDeleter(AVPacket* ptr) {
|
void AVPacketDeleter(AVPacket* ptr) {
|
||||||
av_packet_free(&ptr);
|
av_packet_free(&ptr);
|
||||||
@ -61,6 +69,19 @@ Codec::~Codec() {
|
|||||||
av_buffer_unref(&av_gpu_decoder);
|
av_buffer_unref(&av_gpu_decoder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// List all the currently available hwcontext in ffmpeg
|
||||||
|
static std::vector<AVHWDeviceType> ListSupportedContexts() {
|
||||||
|
std::vector<AVHWDeviceType> contexts{};
|
||||||
|
enum AVHWDeviceType current_device_type = AV_HWDEVICE_TYPE_NONE;
|
||||||
|
do {
|
||||||
|
current_device_type = av_hwdevice_iterate_types(current_device_type);
|
||||||
|
// filter out VA-API since we will try that first if supported
|
||||||
|
if (current_device_type != AV_HWDEVICE_TYPE_VAAPI)
|
||||||
|
contexts.push_back(current_device_type);
|
||||||
|
} while (current_device_type != AV_HWDEVICE_TYPE_NONE);
|
||||||
|
return contexts;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef LIBVA_FOUND
|
#ifdef LIBVA_FOUND
|
||||||
// List all the currently loaded Linux modules
|
// List all the currently loaded Linux modules
|
||||||
static std::vector<std::string> ListLinuxKernelModules() {
|
static std::vector<std::string> ListLinuxKernelModules() {
|
||||||
@ -122,16 +143,12 @@ bool Codec::CreateGpuAvDevice() {
|
|||||||
av_dict_free(&hwdevice_options);
|
av_dict_free(&hwdevice_options);
|
||||||
#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 const auto supported_contexts = ListSupportedContexts();
|
||||||
#ifdef linux
|
for (const auto& type : PREFERRED_GPU_DECODERS) {
|
||||||
AV_HWDEVICE_TYPE_VDPAU,
|
if (std::none_of(supported_contexts.begin(), supported_contexts.end(),
|
||||||
#endif
|
[&type](const auto& context) { return context == type; })) {
|
||||||
AV_HWDEVICE_TYPE_CUDA,
|
continue;
|
||||||
#ifdef _WIN32
|
}
|
||||||
AV_HWDEVICE_TYPE_D3D11VA,
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
for (const auto& type : GPU_DECODER_TYPES) {
|
|
||||||
const int hwdevice_res = av_hwdevice_ctx_create(&av_gpu_decoder, type, nullptr, nullptr, 0);
|
const int hwdevice_res = av_hwdevice_ctx_create(&av_gpu_decoder, type, nullptr, nullptr, 0);
|
||||||
if (hwdevice_res < 0) {
|
if (hwdevice_res < 0) {
|
||||||
LOG_DEBUG(Service_NVDRV, "{} av_hwdevice_ctx_create failed {}",
|
LOG_DEBUG(Service_NVDRV, "{} av_hwdevice_ctx_create failed {}",
|
||||||
|
Loading…
Reference in New Issue
Block a user