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

[host1x] Simplify the FFmpeg code a bit more (#243)
All checks were successful
eden-build / source (push) Successful in 5m58s
Details
eden-build / linux (push) Successful in 24m31s
Details
eden-build / android (push) Successful in 25m11s
Details
eden-build / windows (msvc) (push) Successful in 27m28s
Details

Browse source 
This simplifies the FFmpeg code a bit more and removes unused variables left in the code.

Co-authored-by: MaranBr <maranbr@outlook.com>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/243
This commit is contained in:
MaranBr 2025-07-02 00:42:55 +00:00
parent 94c66f98bf
commit c4a26be180
No known key found for this signature in database
GPG key ID: BA8734FD0EE46976
2 changed files with 27 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -214,10 +214,9 @@ bool DecoderContext::OpenContext(const Decoder& decoder) {
}
bool DecoderContext::SendPacket(const Packet& packet) {
m_temp_frame = std::make_shared<Frame>();
m_got_frame = 0;
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) {
LOG_ERROR(HW_GPU, "avcodec_send_packet error: {}", AVError(ret));
return false;
}
@ -226,42 +225,31 @@ bool DecoderContext::SendPacket(const Packet& packet) {
}
std::shared_ptr<Frame> DecoderContext::ReceiveFrame() {
auto receive = [&](AVFrame* dst) -> bool {
if (const int ret = avcodec_receive_frame(m_codec_context, dst); ret < 0) {
LOG_ERROR(HW_GPU, "avcodec_receive_frame error: {}", AVError(ret));
return false;
}
return true;
};
if (m_codec_context->hw_device_ctx) {
// If we have a hardware context, make a separate frame here to receive the
// hardware result before sending it to the output.
std::shared_ptr<Frame> intermediate_frame = std::make_shared<Frame>();
if (!receive(intermediate_frame->GetFrame())) {
return {};
auto ReceiveImpl = [&](AVFrame* frame) -> bool {
if (const int ret = avcodec_receive_frame(m_codec_context, frame); ret < 0) {
LOG_ERROR(HW_GPU, "avcodec_receive_frame error: {}", AVError(ret));
return false;
}
return true;
};
const auto fmt = intermediate_frame->GetPixelFormat();
const auto desc = av_pix_fmt_desc_get(fmt);
if (desc && (desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
m_temp_frame->SetFormat(PreferredGpuFormat);
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));
return {};
}
} else {
m_temp_frame = std::move(intermediate_frame);
}
} else {
// Otherwise, decode the frame as normal.
if (!receive(m_temp_frame->GetFrame())) {
return {};
}
}
std::shared_ptr<Frame> intermediate_frame = std::make_shared<Frame>();
if (!ReceiveImpl(intermediate_frame->GetFrame())) {
return {};
}
return std::move(m_temp_frame);
const auto desc = av_pix_fmt_desc_get(intermediate_frame->GetPixelFormat());
if (m_codec_context->hw_device_ctx && (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
m_temp_frame->SetFormat(PreferredGpuFormat);
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));
return {};
}
} else {
m_temp_frame = std::move(intermediate_frame);
}
return std::move(m_temp_frame);
}
void DecodeApi::Reset() {

1
src/video_core/host1x/ffmpeg/ffmpeg.h
View file

@ -191,7 +191,6 @@ public:
private:
const Decoder& m_decoder;
AVCodecContext* m_codec_context{};
s32 m_got_frame{};
std::shared_ptr<Frame> m_temp_frame{};
bool m_decode_order{};
};