From a998b4cf2c3f9fd7a186b5d70d956f62c486ef85 Mon Sep 17 00:00:00 2001 From: max_10 Date: Tue, 5 Apr 2016 20:33:23 +0200 Subject: [PATCH] fix input avlog thx DboxOldie Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c340015ab2a4f4d281956d36694e35eea2f0f5be Author: max_10 Date: 2016-04-05 (Tue, 05 Apr 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/input.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libeplayer3/input.cpp b/libeplayer3/input.cpp index afc77e3..dd7d477 100644 --- a/libeplayer3/input.cpp +++ b/libeplayer3/input.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#define ENABLE_LOGGING 0 +#define ENABLE_LOGGING 1 #include #include @@ -378,8 +378,13 @@ bool Input::Init(const char *filename, std::string headers) abortPlayback = false; av_lockmgr_register(lock_callback); #if ENABLE_LOGGING + av_log_set_flags(AV_LOG_SKIP_REPEATED); av_log_set_level(AV_LOG_INFO); - av_log_set_callback(log_callback); + /* out commented here for using ffmpeg default: av_log_default_callback + because of better log level handling */ + //av_log_set_callback(log_callback); +#else + av_log_set_level(AV_LOG_PANIC); #endif if (!filename) { @@ -419,7 +424,13 @@ again: { av_dict_set(&options, "headers", headers.c_str(), 0); } +#if ENABLE_LOGGING + av_log_set_level(AV_LOG_DEBUG); +#endif int err = avformat_open_input(&avfc, filename, NULL, &options); +#if ENABLE_LOGGING + av_log_set_level(AV_LOG_INFO); +#endif av_dict_free(&options); if (averror(err, avformat_open_input)) { avformat_free_context(avfc); @@ -610,6 +621,8 @@ bool Input::Stop() while (hasPlayThreadStarted != 0) usleep(100000); + av_log(NULL, AV_LOG_QUIET, "%s", ""); + if (avfc) { ScopedLock lock(mutex); for (unsigned int i = 0; i < avfc->nb_streams; i++)