VideoProperties: refactor seek to the beginning of the file after analysis

Clement Champetier · Clement Champetier · commit 465af95e4652 · 2016-11-21T16:19:36.000+01:00
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -38,10 +38,16 @@ VideoProperties::VideoProperties(const FileProperties& fileProperties, const siz
         _firstGopTimeCode = _codecContext->timecode_frame_start;
     }
 
-    if(_levelAnalysis == eAnalyseLevelFirstGop)
-        analyseGopStructure(progress);
-    else if(_levelAnalysis == eAnalyseLevelFull)
-        analyseFull(progress);
+    if(_levelAnalysis > eAnalyseLevelHeader)
+    {
+        if(_levelAnalysis == eAnalyseLevelFirstGop)
+            analyseGopStructure(progress);
+        else if(_levelAnalysis == eAnalyseLevelFull)
+            analyseFull(progress);
+
+        // Returns at the beginning of the stream
+        const_cast<InputFile&>(_fileProperties->getInputFile()).seekAtFrame(0, AVSEEK_FLAG_BYTE);
+    }
 }
 
 std::string VideoProperties::getProfileName() const
@@ -557,9 +563,6 @@ size_t VideoProperties::analyseGopStructure(IProgress& progress)
         }
     }
 
-    // Returns at the beginning of the stream
-    file.seekAtFrame(0, AVSEEK_FLAG_BYTE);
-
     // Check GOP size
     if(_gopSize <= 0)
     {
@@ -594,9 +597,6 @@ size_t VideoProperties::analyseFull(IProgress& progress)
         ++_nbFrames;
     }
 
-    // Returns at the beginning of the stream
-    file.seekAtFrame(0, AVSEEK_FLAG_BYTE);
-
     // Check GOP size
     if(_nbFrames <= 0)
     {

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,16 @@ VideoProperties::VideoProperties(const FileProperties& fileProperties, const siz`
`38`	`38`	`_firstGopTimeCode = _codecContext->timecode_frame_start;`
`39`	`39`	`}`
`40`	`40`
`41`		`- if(_levelAnalysis == eAnalyseLevelFirstGop)`
`42`		`- analyseGopStructure(progress);`
`43`		`- else if(_levelAnalysis == eAnalyseLevelFull)`
`44`		`- analyseFull(progress);`
	`41`	`+ if(_levelAnalysis > eAnalyseLevelHeader)`
	`42`	`+ {`
	`43`	`+ if(_levelAnalysis == eAnalyseLevelFirstGop)`
	`44`	`+ analyseGopStructure(progress);`
	`45`	`+ else if(_levelAnalysis == eAnalyseLevelFull)`
	`46`	`+ analyseFull(progress);`
	`47`	`+`
	`48`	`+ // Returns at the beginning of the stream`
	`49`	`+ const_cast<InputFile&>(_fileProperties->getInputFile()).seekAtFrame(0, AVSEEK_FLAG_BYTE);`
	`50`	`+ }`
`45`	`51`	`}`
`46`	`52`
`47`	`53`	`std::string VideoProperties::getProfileName() const`
`@@ -557,9 +563,6 @@ size_t VideoProperties::analyseGopStructure(IProgress& progress)`
`557`	`563`	`}`
`558`	`564`	`}`
`559`	`565`
`560`		`- // Returns at the beginning of the stream`
`561`		`- file.seekAtFrame(0, AVSEEK_FLAG_BYTE);`
`562`		`-`
`563`	`566`	`// Check GOP size`
`564`	`567`	`if(_gopSize <= 0)`
`565`	`568`	`{`
`@@ -594,9 +597,6 @@ size_t VideoProperties::analyseFull(IProgress& progress)`
`594`	`597`	`++_nbFrames;`
`595`	`598`	`}`
`596`	`599`
`597`		`- // Returns at the beginning of the stream`
`598`		`- file.seekAtFrame(0, AVSEEK_FLAG_BYTE);`
`599`		`-`
`600`	`600`	`// Check GOP size`
`601`	`601`	`if(_nbFrames <= 0)`
`602`	`602`	`{`