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

media_info: improve error logging

Browse source
This commit is contained in:
Megamouse 2021-06-24 22:00:43 +02:00 • committed by Ivan
parent b6128c5dfa
commit fad79a96a2
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/util/media_utils.cpp
View file

@ -49,6 +49,13 @@ namespace utils
return def; return def;
} }
std::string error_to_string(int error)
{
char av_error[AV_ERROR_MAX_STRING_SIZE];
av_make_error_string(av_error, AV_ERROR_MAX_STRING_SIZE, error);
return av_error;
}
std::pair<bool, media_info> get_media_info(const std::string& path, s32 av_media_type) std::pair<bool, media_info> get_media_info(const std::string& path, s32 av_media_type)
{ {
media_info info; media_info info;
@ -59,7 +66,7 @@ namespace utils
AVDictionary* av_dict_opts = nullptr; AVDictionary* av_dict_opts = nullptr;
if (int err = av_dict_set(&av_dict_opts, "probesize", "96", 0); err < 0) if (int err = av_dict_set(&av_dict_opts, "probesize", "96", 0); err < 0)
{ {
media_log.error("av_dict_set: returned with error=%d", err); media_log.error("av_dict_set: returned with error=%d='%s'", err, error_to_string(err));
return { false, std::move(info) }; return { false, std::move(info) };
} }
@ -71,7 +78,7 @@ namespace utils
// Failed to open file // Failed to open file
av_dict_free(&av_dict_opts); av_dict_free(&av_dict_opts);
avformat_free_context(av_format_ctx); avformat_free_context(av_format_ctx);
media_log.notice("avformat_open_input: could not open file. error=%d file='%s'", err, path); media_log.notice("avformat_open_input: could not open file. error=%d='%s' file='%s'", err, error_to_string(err), path);
return { false, std::move(info) }; return { false, std::move(info) };
} }
av_dict_free(&av_dict_opts); av_dict_free(&av_dict_opts);
@ -82,7 +89,7 @@ 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); avformat_free_context(av_format_ctx);
media_log.notice("avformat_find_stream_info: could not load stream information. error=%d file='%s'", err, path); media_log.notice("avformat_find_stream_info: could not load stream information. error=%d='%s' file='%s'", err, error_to_string(err), path);
return { false, std::move(info) }; return { false, std::move(info) };
} }