common: add log functions to use ffmpeg/libav log system

Clement Champetier · Clement Champetier · commit 7a648e307ca4 · 2015-02-27T13:46:45.000+01:00
* Functions are encapsulate in Logger class. * Fix #100
diff --git a/app/avProcessor/avProcessor.cpp b/app/avProcessor/avProcessor.cpp
@@ -140,9 +140,9 @@ int main( int argc, char** argv )
 		return( -1 );
 	}
 
-	avtranscoder::setLogLevel( AV_LOG_QUIET );
+	avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );
 	if( verbose )
-		avtranscoder::setLogLevel( AV_LOG_DEBUG );
+		avtranscoder::Logger::setLogLevel( AV_LOG_DEBUG );
 
 	try
 	{
diff --git a/app/avThumbnail/avThumbnail.cpp b/app/avThumbnail/avThumbnail.cpp
@@ -54,7 +54,7 @@ int main( int argc, char** argv )
 		return( -1 );
 	}
 
-	avtranscoder::setLogLevel( AV_LOG_QUIET );
+	avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );
 	avtranscoder::preloadCodecsAndFormats();
 
 	// input file
diff --git a/src/AvTranscoder/common.cpp b/src/AvTranscoder/common.cpp
@@ -2,6 +2,7 @@
 
 extern "C" {
 #include <libavformat/avformat.h>
+#include <libavutil/log.h>
 }
 
 namespace avtranscoder
@@ -12,9 +13,39 @@ void preloadCodecsAndFormats()
 	av_register_all();
 }
 
-void setLogLevel( const int level )
+void Logger::setLogLevel( const int level )
 {
 	av_log_set_level( level );
 }
 
+void Logger::debug( const std::string msg )
+{
+	log( AV_LOG_DEBUG, "debug", msg );
+}
+
+void Logger::info( const std::string msg )
+{
+	log( AV_LOG_INFO, "info", msg );
+}
+
+void Logger::warn( const std::string msg )
+{
+	log( AV_LOG_WARNING, "warning", msg );
+}
+
+void Logger::error( const std::string msg )
+{
+	log( AV_LOG_ERROR, "error", msg );
+}
+
+void Logger::log( int level, const std::string& levelStr, const std::string& msg )
+{
+	std::string avTranscoderMsg( "[avTranscoder - " );
+	avTranscoderMsg += levelStr;
+	avTranscoderMsg += "] ";
+	avTranscoderMsg += msg;
+	avTranscoderMsg += "\n";
+	av_log( NULL, level, avTranscoderMsg.c_str() );
+}
+
 }
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -12,7 +12,6 @@ extern "C" {
 #include <libavcodec/version.h>
 #include <libavutil/error.h>
 #include <libavutil/rational.h>
-#include <libavutil/log.h>
 }
 
 #include <string>
@@ -58,12 +57,31 @@ typedef AVRational Rational;
 /// Register all the codecs and formats which are enabled at configuration time.
 void AvExport preloadCodecsAndFormats();
 
-/**
- * @brief Set the log level of ffmpeg/libav.
- * @param level: refer to define AV_LOG_xxx (from AV_LOG_QUIET to AV_LOG_DEBUG)
- * @see SWIG interface avLogLevel.i
- */
-void AvExport setLogLevel( const int level );
+/// Logger class which contains static functions to use ffmpeg/libav log system
+class AvExport Logger
+{
+public:
+	/**
+	 * @brief Set the log level of ffmpeg/libav.
+	 * @param level: refer to define AV_LOG_xxx (from AV_LOG_QUIET to AV_LOG_DEBUG)
+	 * @see SWIG interface avLogLevel.i
+	 */
+	static void setLogLevel( const int level );
+
+	///@{
+	/// @brief Log with the ffmpeg/libav log system
+	/// @note use shortcuts to log at debug/info/warning/error level
+	/// @param msg: the message will be prefix by '[avTranscoder - <level>]'
+	///
+	static void debug( const std::string msg );
+	static void info( const std::string msg );
+	static void warn( const std::string msg );
+	static void error( const std::string msg );
+	///@}
+
+private:
+	static void log( int level, const std::string& levelStr, const std::string& msg );
+};
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,9 @@ int main( int argc, char** argv )`
`140`	`140`	`return( -1 );`
`141`	`141`	`}`
`142`	`142`
`143`		`- avtranscoder::setLogLevel( AV_LOG_QUIET );`
	`143`	`+ avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );`
`144`	`144`	`if( verbose )`
`145`		`- avtranscoder::setLogLevel( AV_LOG_DEBUG );`
	`145`	`+ avtranscoder::Logger::setLogLevel( AV_LOG_DEBUG );`
`146`	`146`
`147`	`147`	`try`
`148`	`148`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ int main( int argc, char** argv )`
`54`	`54`	`return( -1 );`
`55`	`55`	`}`
`56`	`56`
`57`		`- avtranscoder::setLogLevel( AV_LOG_QUIET );`
	`57`	`+ avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );`
`58`	`58`	`avtranscoder::preloadCodecsAndFormats();`
`59`	`59`
`60`	`60`	`// input file`