EAnalyseLevel: rename enum values

Clement Champetier · Clement Champetier · commit 08460e72c3fe · 2014-11-12T18:47:18.000+01:00
* Rename eAnalyseLevelFast to eAnalyseLevelHeader
* Rename eAnalyseLevelFast to eAnalyseLevelFirstGop
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::eAnalyseLevelFull );
+	input.analyse( p, avtranscoder::eAnalyseLevelFirstGop );
 
 	// a simply metadata display
 	std::cout << input;
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -46,7 +46,7 @@ class AvExport InputFile
 	 *        call this function before getProperties().
 	 * @param progress callback to get analysis progression
 	 **/
-	InputFile& analyse( IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFull );
+	InputFile& analyse( IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFirstGop );
 	
 	/**
 	 * @brief Return media properties on the current InputFile.
@@ -63,7 +63,7 @@ class AvExport InputFile
 	 * @param progress callback to get analysis progression
 	 * @return structure of media metadatas
 	 **/
-	static FileProperties analyseFile( const std::string& filename, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFull );
+	static FileProperties analyseFile( const std::string& filename, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFirstGop );
 
 	/**
 	 * @brief Get stream type: video, audio, subtitle, etc.
diff --git a/src/AvTranscoder/file/util.hpp b/src/AvTranscoder/file/util.hpp
@@ -9,8 +9,9 @@ namespace avtranscoder
  */
 enum EAnalyseLevel
 {
-	eAnalyseLevelFast = 0,
-	eAnalyseLevelFull = 0,
+	eAnalyseLevelHeader = 0,
+	eAnalyseLevelFirstGop = 1,
+	//eAnalyseLevelFull = 2,
 };
 
 }
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -50,7 +50,7 @@ VideoProperties::VideoProperties( const AVFormatContext* formatContext, const si
 		_pixFmt = &av_pix_fmt_descriptors[ _codecContext->pix_fmt ];
 #endif
 
-	if( level == eAnalyseLevelFull )
+	if( level == eAnalyseLevelFirstGop )
 		analyseGopStructure( progress );
 }
 
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -30,7 +30,7 @@ class AvExport VideoProperties
 {
 public:
 	VideoProperties();
-	VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFull );
+	VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFirstGop );
 
 	std::string getCodecName() const;
 	std::string getCodecLongName() const;
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -384,7 +384,7 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 
 	// Create profile as input configuration
 	NoDisplayProgress progress;
-	referenceFile->analyse( progress, eAnalyseLevelFast );
+	referenceFile->analyse( progress, eAnalyseLevelHeader );
 	AudioProperties audioProperties = referenceFile->getProperties().getAudioProperties().at( streamIndex );
 
 	ProfileLoader::Profile profile;

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,9 @@ namespace avtranscoder`
`9`	`9`	`*/`
`10`	`10`	`enum EAnalyseLevel`
`11`	`11`	`{`
`12`		`- eAnalyseLevelFast = 0,`
`13`		`- eAnalyseLevelFull = 0,`
	`12`	`+ eAnalyseLevelHeader = 0,`
	`13`	`+ eAnalyseLevelFirstGop = 1,`
	`14`	`+ //eAnalyseLevelFull = 2,`
`14`	`15`	`};`
`15`	`16`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ VideoProperties::VideoProperties( const AVFormatContext* formatContext, const si`
`50`	`50`	`_pixFmt = &av_pix_fmt_descriptors[ _codecContext->pix_fmt ];`
`51`	`51`	`#endif`
`52`	`52`
`53`		`- if( level == eAnalyseLevelFull )`
	`53`	`+ if( level == eAnalyseLevelFirstGop )`
`54`	`54`	`analyseGopStructure( progress );`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class AvExport VideoProperties`
`30`	`30`	`{`
`31`	`31`	`public:`
`32`	`32`	`VideoProperties();`
`33`		`- VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFull );`
	`33`	`+ VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFirstGop );`
`34`	`34`
`35`	`35`	`std::string getCodecName() const;`
`36`	`36`	`std::string getCodecLongName() const;`