file: add file util.hpp

Clement Champetier · Clement Champetier · commit d59701cd57b5 · 2014-11-12T18:47:11.000+01:00
* util contains enum EAnalyseLevel.
* Use level of analyse when create VideoProperties while input file
analysis.
diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp
@@ -16,7 +16,7 @@ int main( int argc, char** argv )
 	avtranscoder::NoDisplayProgress p;
 
 	avtranscoder::InputFile input( argv[1] );
-	input.analyse( p, avtranscoder::InputFile::eAnalyseLevelFull );
+	input.analyse( p, avtranscoder::eAnalyseLevelFull );
 
 	// a simply metadata display
 	std::cout << input;
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -79,7 +79,7 @@ InputFile& InputFile::analyse( IProgress& progress, const EAnalyseLevel level )
 		{
 			case AVMEDIA_TYPE_VIDEO:
 			{
-				_properties.getVideoProperties().push_back( VideoProperties( _formatContext, streamId, progress ) );
+				_properties.getVideoProperties().push_back( VideoProperties( _formatContext, streamId, progress, level ) );
 				break;
 			}
 			case AVMEDIA_TYPE_AUDIO:
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -3,6 +3,8 @@
 
 #include <AvTranscoder/common.hpp>
 
+#include <AvTranscoder/file/util.hpp>
+
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/codec/VideoCodec.hpp>
 
@@ -34,12 +36,6 @@ class AvExport InputFile
 
 	virtual ~InputFile();
 
-	enum EAnalyseLevel
-	{
-		eAnalyseLevelFast = 0,
-		eAnalyseLevelFull = 0,
-	};
-
 	/**
 	 * @return Return the resource to access
 	**/
diff --git a/src/AvTranscoder/file/util.hpp b/src/AvTranscoder/file/util.hpp
@@ -0,0 +1,19 @@
+#ifndef _AV_TRANSCODER_FILE_UTIL_HPP_
+#define _AV_TRANSCODER_FILE_UTIL_HPP_
+
+namespace avtranscoder
+{
+
+/**
+ * @brief Level of file analysis.
+ */
+enum EAnalyseLevel
+{
+	eAnalyseLevelFast = 0,
+	eAnalyseLevelFull = 0,
+};
+
+}
+
+#endif
+
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -29,7 +29,7 @@ VideoProperties::VideoProperties()
 	, _gopStructure()
 {}
 
-VideoProperties::VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress )
+VideoProperties::VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress, const EAnalyseLevel level )
 	: _formatContext( formatContext )
 	, _codecContext( formatContext->streams[index]->codec )
 	, _pixFmt( NULL )
@@ -50,9 +50,8 @@ VideoProperties::VideoProperties( const AVFormatContext* formatContext, const si
 		_pixFmt = &av_pix_fmt_descriptors[ _codecContext->pix_fmt ];
 #endif
 
-	// Analyse GOP
-	//if( level == eAnalyseLevelFull )
-	analyseGopStructure( progress );
+	if( level == eAnalyseLevelFull )
+		analyseGopStructure( progress );
 }
 
 std::string VideoProperties::getCodecName() const
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -3,6 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/mediaProperty/util.hpp>
+#include <AvTranscoder/file/util.hpp>
 #include <AvTranscoder/progress/IProgress.hpp>
 
 extern "C" {
@@ -29,7 +30,7 @@ class AvExport VideoProperties
 {
 public:
 	VideoProperties();
-	VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress );
+	VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFull );
 
 	std::string getCodecName() const;
 	std::string getCodecLongName() const;
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -1,5 +1,6 @@
 #include "Transcoder.hpp"
 
+#include <AvTranscoder/file/util.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
 #include <limits>
@@ -383,7 +384,7 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 
 	// Create profile as input configuration
 	NoDisplayProgress progress;
-	referenceFile->analyse( progress, InputFile::eAnalyseLevelFast );
+	referenceFile->analyse( progress, eAnalyseLevelFast );
 	AudioProperties audioProperties = referenceFile->getProperties().getAudioProperties().at( streamIndex );
 
 	ProfileLoader::Profile profile;

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ InputFile& InputFile::analyse( IProgress& progress, const EAnalyseLevel level )`
`79`	`79`	`{`
`80`	`80`	`case AVMEDIA_TYPE_VIDEO:`
`81`	`81`	`{`
`82`		`- _properties.getVideoProperties().push_back( VideoProperties( _formatContext, streamId, progress ) );`
	`82`	`+ _properties.getVideoProperties().push_back( VideoProperties( _formatContext, streamId, progress, level ) );`
`83`	`83`	`break;`
`84`	`84`	`}`
`85`	`85`	`case AVMEDIA_TYPE_AUDIO:`