summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliushuyu <liushuyu011@gmail.com>2021-11-29 07:51:25 +0100
committerliushuyu <liushuyu011@gmail.com>2021-12-03 05:01:34 +0100
commitcd27f211c8ad67c73c831e57a4eb298f9693253f (patch)
tree403adf1ba5f36c9896c9553affc17dea5a073cb6
parentMerge pull request #7490 from Morph1984/stub-album-save-screenshot (diff)
downloadyuzu-cd27f211c8ad67c73c831e57a4eb298f9693253f.tar
yuzu-cd27f211c8ad67c73c831e57a4eb298f9693253f.tar.gz
yuzu-cd27f211c8ad67c73c831e57a4eb298f9693253f.tar.bz2
yuzu-cd27f211c8ad67c73c831e57a4eb298f9693253f.tar.lz
yuzu-cd27f211c8ad67c73c831e57a4eb298f9693253f.tar.xz
yuzu-cd27f211c8ad67c73c831e57a4eb298f9693253f.tar.zst
yuzu-cd27f211c8ad67c73c831e57a4eb298f9693253f.zip
-rw-r--r--src/video_core/command_classes/codecs/codec.cpp37
1 files changed, 27 insertions, 10 deletions
diff --git a/src/video_core/command_classes/codecs/codec.cpp b/src/video_core/command_classes/codecs/codec.cpp
index 02d309170..1949a8cf3 100644
--- a/src/video_core/command_classes/codecs/codec.cpp
+++ b/src/video_core/command_classes/codecs/codec.cpp
@@ -23,6 +23,14 @@ namespace Tegra {
namespace {
constexpr AVPixelFormat PREFERRED_GPU_FMT = AV_PIX_FMT_NV12;
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) {
av_packet_free(&ptr);
@@ -61,6 +69,19 @@ Codec::~Codec() {
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
// List all the currently loaded Linux modules
static std::vector<std::string> ListLinuxKernelModules() {
@@ -122,16 +143,12 @@ bool Codec::CreateGpuAvDevice() {
av_dict_free(&hwdevice_options);
#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,
-#endif
- };
- for (const auto& type : GPU_DECODER_TYPES) {
+ static const auto supported_contexts = ListSupportedContexts();
+ for (const auto& type : PREFERRED_GPU_DECODERS) {
+ if (std::none_of(supported_contexts.begin(), supported_contexts.end(),
+ [&type](const auto& context) { return context == type; })) {
+ continue;
+ }
const int hwdevice_res = av_hwdevice_ctx_create(&av_gpu_decoder, type, nullptr, nullptr, 0);
if (hwdevice_res < 0) {
LOG_DEBUG(Service_NVDRV, "{} av_hwdevice_ctx_create failed {}",