N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-22 06:42:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

video_core/codecs: skip decoders that use hw frames ...

Browse source 
... this would resolve some edge-cases where multiple devices are
present and ffmpeg is unable to auto-supply the hw surfaces
This commit is contained in:
liushuyu 2021-12-12 17:43:10 -07:00
parent 37f1c76613
commit a2d73eaa10
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,6 +130,12 @@ bool Codec::CreateGpuAvDevice() {
} }
if (config->methods & HW_CONFIG_METHOD && config->device_type == type) { if (config->methods & HW_CONFIG_METHOD && config->device_type == type) {
av_codec_ctx->pix_fmt = config->pix_fmt; av_codec_ctx->pix_fmt = config->pix_fmt;
if (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX) {
// skip zero-copy decoders, we don't currently support them
LOG_DEBUG(Service_NVDRV, "Skipping decoder {} with unsupported capability {}.",
av_hwdevice_get_type_name(type), config->methods);
continue;
}
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));
return true; return true;
} }
@ -251,6 +257,9 @@ void Codec::Decode() {
final_frame->format = PREFERRED_GPU_FMT; final_frame->format = PREFERRED_GPU_FMT;
const int ret = av_hwframe_transfer_data(final_frame.get(), initial_frame.get(), 0); const int ret = av_hwframe_transfer_data(final_frame.get(), initial_frame.get(), 0);
ASSERT_MSG(!ret, "av_hwframe_transfer_data error {}", ret); ASSERT_MSG(!ret, "av_hwframe_transfer_data error {}", ret);
// null the hw frame context to prevent the buffer from being deleted
// and leaving a dangling reference in the av_codec_ctx
initial_frame->hw_frames_ctx = nullptr;
} else { } else {
final_frame = std::move(initial_frame); final_frame = std::move(initial_frame);
} }