mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 00:33:23 +02:00
Merge pull request #8066 from ameerj/gpu-decode-fixes
codec: Fix GPU decoder detection on Windows and a memory leak
This commit is contained in:
commit
b1fdc02465
@ -56,6 +56,18 @@ AVPixelFormat GetGpuFormat(AVCodecContext* av_codec_ctx, const AVPixelFormat* pi
|
|||||||
av_codec_ctx->pix_fmt = PREFERRED_CPU_FMT;
|
av_codec_ctx->pix_fmt = PREFERRED_CPU_FMT;
|
||||||
return PREFERRED_CPU_FMT;
|
return PREFERRED_CPU_FMT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// List all the currently available hwcontext in ffmpeg
|
||||||
|
std::vector<AVHWDeviceType> ListSupportedContexts() {
|
||||||
|
std::vector<AVHWDeviceType> contexts{};
|
||||||
|
AVHWDeviceType current_device_type = AV_HWDEVICE_TYPE_NONE;
|
||||||
|
do {
|
||||||
|
current_device_type = av_hwdevice_iterate_types(current_device_type);
|
||||||
|
contexts.push_back(current_device_type);
|
||||||
|
} while (current_device_type != AV_HWDEVICE_TYPE_NONE);
|
||||||
|
return contexts;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
void AVFrameDeleter(AVFrame* ptr) {
|
void AVFrameDeleter(AVFrame* ptr) {
|
||||||
@ -76,17 +88,6 @@ 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{};
|
|
||||||
AVHWDeviceType current_device_type = AV_HWDEVICE_TYPE_NONE;
|
|
||||||
do {
|
|
||||||
current_device_type = av_hwdevice_iterate_types(current_device_type);
|
|
||||||
contexts.push_back(current_device_type);
|
|
||||||
} while (current_device_type != AV_HWDEVICE_TYPE_NONE);
|
|
||||||
return contexts;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Codec::CreateGpuAvDevice() {
|
bool Codec::CreateGpuAvDevice() {
|
||||||
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 const auto supported_contexts = ListSupportedContexts();
|
static const auto supported_contexts = ListSupportedContexts();
|
||||||
@ -96,6 +97,8 @@ bool Codec::CreateGpuAvDevice() {
|
|||||||
LOG_DEBUG(Service_NVDRV, "{} explicitly unsupported", av_hwdevice_get_type_name(type));
|
LOG_DEBUG(Service_NVDRV, "{} explicitly unsupported", av_hwdevice_get_type_name(type));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
// Avoid memory leak from not cleaning up after av_hwdevice_ctx_create
|
||||||
|
av_buffer_unref(&av_gpu_decoder);
|
||||||
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 {}",
|
||||||
@ -127,15 +130,19 @@ bool Codec::CreateGpuAvDevice() {
|
|||||||
av_codec->name, av_hwdevice_get_type_name(type));
|
av_codec->name, av_hwdevice_get_type_name(type));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (config->methods & HW_CONFIG_METHOD && config->device_type == type) {
|
if ((config->methods & HW_CONFIG_METHOD) != 0 && config->device_type == type) {
|
||||||
av_codec_ctx->pix_fmt = config->pix_fmt;
|
#if defined(__unix__)
|
||||||
if (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX) {
|
// Some linux decoding backends are reported to crash with this config method
|
||||||
|
// TODO(ameerj): Properly support this method
|
||||||
|
if ((config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX) != 0) {
|
||||||
// skip zero-copy decoders, we don't currently support them
|
// skip zero-copy decoders, we don't currently support them
|
||||||
LOG_DEBUG(Service_NVDRV, "Skipping decoder {} with unsupported capability {}.",
|
LOG_DEBUG(Service_NVDRV, "Skipping decoder {} with unsupported capability {}.",
|
||||||
av_hwdevice_get_type_name(type), config->methods);
|
av_hwdevice_get_type_name(type), config->methods);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
LOG_INFO(Service_NVDRV, "Using {} GPU decoder", av_hwdevice_get_type_name(type));
|
LOG_INFO(Service_NVDRV, "Using {} GPU decoder", av_hwdevice_get_type_name(type));
|
||||||
|
av_codec_ctx->pix_fmt = config->pix_fmt;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user