dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-20 17:35:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix hardware decoding for VP8 video codec

Browse source
This commit is contained in:
MaranBr 2025-07-16 17:14:27 -04:00 • committed by crueter
parent 215367b129
commit 62c8d71ee4
1 changed files with 41 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/video_core/host1x/ffmpeg/ffmpeg.cpp
View file

@ -23,8 +23,6 @@ namespace FFmpeg {
namespace { namespace {
constexpr AVPixelFormat PreferredGpuFormat = AV_PIX_FMT_NV12;
constexpr AVPixelFormat PreferredCpuFormat = AV_PIX_FMT_YUV420P;
constexpr std::array PreferredGpuDecoders = { constexpr std::array PreferredGpuDecoders = {
#if defined (_WIN32) #if defined (_WIN32)
AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_CUDA,
@ -41,17 +39,34 @@ constexpr std::array PreferredGpuDecoders = {
}; };
AVPixelFormat GetGpuFormat(AVCodecContext* codec_context, const AVPixelFormat* pix_fmts) { AVPixelFormat GetGpuFormat(AVCodecContext* codec_context, const AVPixelFormat* pix_fmts) {
for (int i = 0;; i++) {
const AVCodecHWConfig* config = avcodec_get_hw_config(codec_context->codec, i);
if (!config) {
break;
}
if (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX) {
if (config->device_type == AV_HWDEVICE_TYPE_CUDA) {
return AV_PIX_FMT_CUDA;
} else if (config->device_type == AV_HWDEVICE_TYPE_VAAPI) {
return AV_PIX_FMT_VAAPI;
}
}
}
const auto desc = av_pix_fmt_desc_get(codec_context->pix_fmt);
if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL) {
for (const AVPixelFormat* p = pix_fmts; *p != AV_PIX_FMT_NONE; ++p) { for (const AVPixelFormat* p = pix_fmts; *p != AV_PIX_FMT_NONE; ++p) {
if (*p == codec_context->pix_fmt) { if (*p == codec_context->pix_fmt) {
return codec_context->pix_fmt; return codec_context->pix_fmt;
} }
} }
}
LOG_INFO(HW_GPU, "Could not find compatible GPU AV format, falling back to CPU"); LOG_INFO(HW_GPU, "Could not find compatible GPU AV format, falling back to CPU");
av_buffer_unref(&codec_context->hw_device_ctx); av_buffer_unref(&codec_context->hw_device_ctx);
codec_context->pix_fmt = PreferredCpuFormat; return AV_PIX_FMT_YUV420P;
return codec_context->pix_fmt;
} }
std::string AVError(int errnum) { std::string AVError(int errnum) {
@ -60,7 +75,7 @@ std::string AVError(int errnum) {
return errbuf; return errbuf;
} }
} // namespace }
Packet::Packet(std::span<const u8> data) { Packet::Packet(std::span<const u8> data) {
m_packet = av_packet_alloc(); m_packet = av_packet_alloc();
@ -218,8 +233,6 @@ bool DecoderContext::OpenContext(const Decoder& decoder) {
} }
bool DecoderContext::SendPacket(const Packet& packet) { bool DecoderContext::SendPacket(const Packet& packet) {
m_temp_frame = std::make_shared<Frame>();
if (const int ret = avcodec_send_packet(m_codec_context, packet.GetPacket()); ret < 0 && ret != AVERROR_EOF) { if (const int ret = avcodec_send_packet(m_codec_context, packet.GetPacket()); ret < 0 && ret != AVERROR_EOF) {
LOG_ERROR(HW_GPU, "avcodec_send_packet error: {}", AVError(ret)); LOG_ERROR(HW_GPU, "avcodec_send_packet error: {}", AVError(ret));
return false; return false;
@ -229,6 +242,8 @@ bool DecoderContext::SendPacket(const Packet& packet) {
} }
std::shared_ptr<Frame> DecoderContext::ReceiveFrame() { std::shared_ptr<Frame> DecoderContext::ReceiveFrame() {
m_temp_frame = std::make_shared<Frame>();
auto ReceiveImpl = [&](AVFrame* frame) -> bool { auto ReceiveImpl = [&](AVFrame* frame) -> bool {
if (const int ret = avcodec_receive_frame(m_codec_context, frame); ret < 0 && ret != AVERROR_EOF) { if (const int ret = avcodec_receive_frame(m_codec_context, frame); ret < 0 && ret != AVERROR_EOF) {
LOG_ERROR(HW_GPU, "avcodec_receive_frame error: {}", AVError(ret)); LOG_ERROR(HW_GPU, "avcodec_receive_frame error: {}", AVError(ret));
@ -242,9 +257,8 @@ std::shared_ptr<Frame> DecoderContext::ReceiveFrame() {
return {}; return {};
} }
const auto desc = av_pix_fmt_desc_get(intermediate_frame->GetPixelFormat()); if (m_codec_context->hw_device_ctx) {
if (m_codec_context->hw_device_ctx && desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL) { m_temp_frame->SetFormat(AV_PIX_FMT_NV12);
m_temp_frame->SetFormat(PreferredGpuFormat);
if (int ret = av_hwframe_transfer_data(m_temp_frame->GetFrame(), intermediate_frame->GetFrame(), 0); ret < 0) { if (int ret = av_hwframe_transfer_data(m_temp_frame->GetFrame(), intermediate_frame->GetFrame(), 0); ret < 0) {
LOG_ERROR(HW_GPU, "av_hwframe_transfer_data error: {}", AVError(ret)); LOG_ERROR(HW_GPU, "av_hwframe_transfer_data error: {}", AVError(ret));
return {}; return {};
@ -292,4 +306,4 @@ std::shared_ptr<Frame> DecodeApi::ReceiveFrame() {
return m_decoder_context->ReceiveFrame(); return m_decoder_context->ReceiveFrame();
} }
} // namespace FFmpeg }