mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-07 03:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio_decoder: properly free packets

Browse Source
This commit is contained in:
Megamouse 2024-01-08 21:29:03 +01:00
parent 45c89030ac
commit bad7756af2
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/Cell/Modules/cellAdec.cpp
View File

@ -451,7 +451,11 @@ public:
} }
AVPacket* packet = av_packet_alloc(); AVPacket* packet = av_packet_alloc();
std::unique_ptr<AVPacket, decltype([](AVPacket* p){av_packet_unref(p);})> packet_(packet); std::unique_ptr<AVPacket, decltype([](AVPacket* p)
{
av_packet_unref(p);
av_packet_free(&p);
})> packet_(packet);
if (just_started && just_finished) if (just_started && just_finished)
{ {

23
rpcs3/util/media_utils.cpp
View File

@ -54,6 +54,15 @@ namespace utils
} }
} }
const auto free_packet = [](AVPacket* p)
{
if (p)
{
av_packet_unref(p);
av_packet_free(&p);
}
};
template <> template <>
std::string media_info::get_metadata(const std::string& key, const std::string& def) const std::string media_info::get_metadata(const std::string& key, const std::string& def) const
{ {
@ -256,16 +265,8 @@ namespace utils
av_frame_unref(video.frame); av_frame_unref(video.frame);
av_frame_free(&video.frame); av_frame_free(&video.frame);
} }
if (audio.packet) free_packet(audio.packet);
{ free_packet(video.packet);
av_packet_unref(audio.packet);
av_packet_free(&audio.packet);
}
if (video.packet)
{
av_packet_unref(video.packet);
av_packet_free(&video.packet);
}
if (swr) if (swr)
swr_free(&swr); swr_free(&swr);
if (sws) if (sws)
@ -552,7 +553,7 @@ namespace utils
return; return;
} }
std::unique_ptr<AVPacket, decltype([](AVPacket* p){av_packet_unref(p);})> packet_(packet); std::unique_ptr<AVPacket, decltype(free_packet)> packet_(packet);
// Iterate through frames // Iterate through frames
while (thread_ctrl::state() != thread_state::aborting && av_read_frame(av.format_context, packet) >= 0) while (thread_ctrl::state() != thread_state::aborting && av_read_frame(av.format_context, packet) >= 0)