Move functions from common to util

Clement Champetier · Clement Champetier · commit 668109ee5afd · 2015-02-03T15:08:10.000+01:00
diff --git a/src/AvTranscoder/codec/ICodec.hpp b/src/AvTranscoder/codec/ICodec.hpp
@@ -4,6 +4,10 @@
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/Option.hpp>
 
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
+
 #include <string>
 
 namespace avtranscoder
diff --git a/src/AvTranscoder/common.cpp b/src/AvTranscoder/common.cpp
@@ -1,9 +1,7 @@
 #include "common.hpp"
 
 extern "C" {
-#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavutil/error.h>
 }
 
 namespace avtranscoder
@@ -19,25 +17,4 @@ void setLogLevel( const int level )
 	av_log_set_level( level );
 }
 
-std::string getFormat( const std::string& filename )
-{
-	std::string format( "" );
-	
-	AVOutputFormat* avOutputFormat = av_guess_format( NULL, filename.c_str(), NULL);
-	if( avOutputFormat )
-	{
-		if( avOutputFormat->name )
-			format = std::string( avOutputFormat->name );
-	}
-	
-	return format;
-}
-
-bool matchFormat( const std::string& format, const std::string& filename )
-{
-	AVOutputFormat* avOutputFormat = av_guess_format( format.c_str(), filename.c_str(), NULL);
-	return avOutputFormat != NULL;
-}
-
-
 }
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -9,9 +9,8 @@ extern "C" {
 	#define INT64_C(c) (c ## LL)
 	#define UINT64_C(c) (c ## ULL)
 #endif
-#include <libavformat/version.h>
 #include <libavcodec/version.h>
-#include <libavcodec/avcodec.h>
+#include <libavutil/error.h>
 #include <libavutil/rational.h>
 #include <libavutil/log.h>
 }
@@ -65,9 +64,6 @@ void AvExport preloadCodecsAndFormats();
  */
 void AvExport setLogLevel( const int level );
 
-std::string AvExport getFormat( const std::string& filename );
-bool AvExport matchFormat( const std::string& format, const std::string& filename );
-
 }
 
 #endif
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -1,5 +1,7 @@
 #include "OutputFile.hpp"
 
+#include <AvTranscoder/util.hpp>
+
 #include <iostream>
 #include <stdexcept>
 
diff --git a/src/AvTranscoder/frame/VideoFrame.hpp b/src/AvTranscoder/frame/VideoFrame.hpp
@@ -5,6 +5,7 @@
 #include <AvTranscoder/ProfileLoader.hpp>
 
 extern "C" {
+#include <libavcodec/avcodec.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/pixdesc.h>
 }
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -8,6 +8,7 @@ extern "C" {
 
 #include <stdexcept>
 #include <iomanip>
+#include <sstream>
 
 #ifdef _MSC_VER
 #include <float.h>
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -1,8 +1,9 @@
 #ifndef _AV_TRANSCODER_MEDIA_PROPERTY_VIDEO_PROPERTIES_HPP
 #define _AV_TRANSCODER_MEDIA_PROPERTY_VIDEO_PROPERTIES_HPP
 
-#include <AvTranscoder/common.hpp>
 #include "PixelProperties.hpp"
+
+#include <AvTranscoder/common.hpp>
 #include <AvTranscoder/mediaProperty/util.hpp>
 #include <AvTranscoder/file/util.hpp>
 #include <AvTranscoder/file/FormatContext.hpp>
diff --git a/src/AvTranscoder/mediaProperty/util.cpp b/src/AvTranscoder/mediaProperty/util.cpp
@@ -1,8 +1,6 @@
 #include "util.hpp"
 
-extern "C" {
-#include <libavutil/dict.h>
-}
+#include <sstream>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/mediaProperty/util.hpp b/src/AvTranscoder/mediaProperty/util.hpp
@@ -3,6 +3,10 @@
 
 #include <AvTranscoder/common.hpp>
 
+extern "C" {
+#include <libavutil/dict.h>
+}
+
 #include <vector>
 #include <utility>
 #include <string>
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -9,6 +9,26 @@ extern "C" {
 namespace avtranscoder
 {
 
+std::string getFormat( const std::string& filename )
+{
+	std::string format( "" );
+	
+	AVOutputFormat* avOutputFormat = av_guess_format( NULL, filename.c_str(), NULL);
+	if( avOutputFormat )
+	{
+		if( avOutputFormat->name )
+			format = std::string( avOutputFormat->name );
+	}
+	
+	return format;
+}
+
+bool matchFormat( const std::string& format, const std::string& filename )
+{
+	AVOutputFormat* avOutputFormat = av_guess_format( format.c_str(), filename.c_str(), NULL);
+	return avOutputFormat != NULL;
+}
+
 std::vector<std::string> getPixelFormats( const std::string& videoCodecName )
 {
 	std::vector<std::string> pixelFormats;
diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
@@ -18,6 +18,16 @@ namespace avtranscoder
 
 typedef std::map<std::string, OptionArray> OptionArrayMap;
 
+/**
+ * @brief Get format name from a given filename 
+ */
+std::string AvExport getFormat( const std::string& filename );
+
+/**
+ * @brief Check if a format name corresponds to the format of a given filename
+ */
+bool AvExport matchFormat( const std::string& format, const std::string& filename );
+
 /**
 *  @brief Get pixel format supported by a video codec.
 *  @param videoCodecName: the video codec name (empty if not indicated, and so get all pixel formats supported by all video codecs).

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#include <AvTranscoder/ProfileLoader.hpp>`
`6`	`6`
`7`	`7`	`extern "C" {`
	`8`	`+#include <libavcodec/avcodec.h>`
`8`	`9`	`#include <libavutil/pixfmt.h>`
`9`	`10`	`#include <libavutil/pixdesc.h>`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`#include "util.hpp"`
`2`	`2`
`3`		`-extern "C" {`
`4`		`-#include <libavutil/dict.h>`
`5`		`-}`
	`3`	`+#include <sstream>`
`6`	`4`
`7`	`5`	`namespace avtranscoder`
`8`	`6`	`{`