archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

media_utils: fix segfault when stopping a recording

Browse source
This commit is contained in:
Megamouse 2024-01-12 18:34:39 +01:00
parent 17aeefe1b0
commit f7fa5aab70
3 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/Modules/cellAdec.cpp
View file

@ -371,7 +371,6 @@ public:
} }
if (ctx) if (ctx)
{ {
avcodec_close(ctx);
avcodec_free_context(&ctx); avcodec_free_context(&ctx);
} }
if (io_buf) if (io_buf)
@ -382,7 +381,6 @@ public:
{ {
if (fmt->pb) av_freep(&fmt->pb); if (fmt->pb) av_freep(&fmt->pb);
avformat_close_input(&fmt); avformat_close_input(&fmt);
avformat_free_context(fmt);
} }
} }

1
rpcs3/Emu/Cell/Modules/cellVdec.cpp
View file

@ -280,7 +280,6 @@ struct vdec_context final
~vdec_context() ~vdec_context()
{ {
avcodec_close(ctx);
avcodec_free_context(&ctx); avcodec_free_context(&ctx);
sws_freeContext(sws); sws_freeContext(sws);
} }

20
rpcs3/util/media_utils.cpp
View file

@ -195,7 +195,6 @@ namespace utils
{ {
// Failed to load stream information // Failed to load stream information
avformat_close_input(&av_format_ctx); avformat_close_input(&av_format_ctx);
avformat_free_context(av_format_ctx);
media_log.notice("get_media_info: avformat_find_stream_info: could not load stream information. error=%d='%s' file='%s'", err, av_error_to_string(err), path); media_log.notice("get_media_info: avformat_find_stream_info: could not load stream information. error=%d='%s' file='%s'", err, av_error_to_string(err), path);
return { false, std::move(info) }; return { false, std::move(info) };
} }
@ -227,7 +226,6 @@ namespace utils
{ {
// Failed to find a stream // Failed to find a stream
avformat_close_input(&av_format_ctx); avformat_close_input(&av_format_ctx);
avformat_free_context(av_format_ctx);
media_log.notice("get_media_info: Failed to match stream of type %d in file='%s'", av_media_type, path); media_log.notice("get_media_info: Failed to match stream of type %d in file='%s'", av_media_type, path);
return { false, std::move(info) }; return { false, std::move(info) };
} }
@ -258,7 +256,6 @@ namespace utils
} }
avformat_close_input(&av_format_ctx); avformat_close_input(&av_format_ctx);
avformat_free_context(av_format_ctx);
return { true, std::move(info) }; return { true, std::move(info) };
} }
@ -302,22 +299,13 @@ namespace utils
if (sws) if (sws)
sws_freeContext(sws); sws_freeContext(sws);
if (audio.context) if (audio.context)
{
avcodec_close(audio.context);
avcodec_free_context(&audio.context); avcodec_free_context(&audio.context);
}
if (video.context) if (video.context)
{
avcodec_close(video.context);
avcodec_free_context(&video.context); avcodec_free_context(&video.context);
}
// AVCodec is managed by libavformat, no need to free it // AVCodec is managed by libavformat, no need to free it
// see: https://stackoverflow.com/a/18047320 // see: https://stackoverflow.com/a/18047320
if (format_context) if (format_context)
{
avformat_close_input(&format_context); avformat_close_input(&format_context);
avformat_free_context(format_context);
}
//if (stream) //if (stream)
// av_free(stream); // av_free(stream);
if (kill_callback) if (kill_callback)
@ -1266,9 +1254,9 @@ namespace utils
{ {
media_log.error("video_encoder: avformat_write_header failed. Error: %d='%s'", err, av_error_to_string(err)); media_log.error("video_encoder: avformat_write_header failed. Error: %d='%s'", err, av_error_to_string(err));
if (int err = avio_close(av.format_context->pb); err != 0) if (int err = avio_closep(&av.format_context->pb); err != 0)
{ {
media_log.error("video_encoder: avio_close failed. Error: %d='%s'", err, av_error_to_string(err)); media_log.error("video_encoder: avio_closep failed. Error: %d='%s'", err, av_error_to_string(err));
} }
has_error = true; has_error = true;
@ -1645,9 +1633,9 @@ namespace utils
media_log.error("video_encoder: av_write_trailer failed. Error: %d='%s'", err, av_error_to_string(err)); media_log.error("video_encoder: av_write_trailer failed. Error: %d='%s'", err, av_error_to_string(err));
} }
if (int err = avio_close(av.format_context->pb); err != 0) if (int err = avio_closep(&av.format_context->pb); err != 0)
{ {
media_log.error("video_encoder: avio_close failed. Error: %d='%s'", err, av_error_to_string(err)); media_log.error("video_encoder: avio_closep failed. Error: %d='%s'", err, av_error_to_string(err));
} }
}); });
} }