FileProperties: fixed analysis of first GOP on raw format

Clement Champetier · Clement Champetier · commit edc9345bc762 · 2016-05-13T13:26:01.000+02:00
* When extractStreamProperties, seek at the beginning of the file only
if analyse gop on none raw format.
* Tested with avc (h264 codec) and mp3 files.
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -29,12 +29,14 @@ FileProperties::FileProperties(const FormatContext& formatContext)
 
 void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyseLevel level)
 {
-    clearStreamProperties();
-
     // if the analysis level wiil decode some streams parts, seek at the beginning
-    if(level > eAnalyseLevelHeader)
+    if(level > eAnalyseLevelHeader && ! isRawFormat())
         const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);
 
+    // clear properties
+    clearStreamProperties();
+
+    // reload properties
     for(size_t streamIndex = 0; streamIndex < _formatContext->getNbStreams(); ++streamIndex)
     {
         switch(_formatContext->getAVStream(streamIndex).codec->codec_type)
@@ -120,7 +122,7 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
     }
 
     // if the analysis level has decoded some streams parts, return at the beginning
-    if(level > eAnalyseLevelHeader)
+    if(level > eAnalyseLevelHeader && ! isRawFormat())
         const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,14 @@ FileProperties::FileProperties(const FormatContext& formatContext)`
`29`	`29`
`30`	`30`	`void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyseLevel level)`
`31`	`31`	`{`
`32`		`- clearStreamProperties();`
`33`		`-`
`34`	`32`	`// if the analysis level wiil decode some streams parts, seek at the beginning`
`35`		`- if(level > eAnalyseLevelHeader)`
	`33`	`+ if(level > eAnalyseLevelHeader && ! isRawFormat())`
`36`	`34`	`const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);`
`37`	`35`
	`36`	`+ // clear properties`
	`37`	`+ clearStreamProperties();`
	`38`	`+`
	`39`	`+ // reload properties`
`38`	`40`	`for(size_t streamIndex = 0; streamIndex < _formatContext->getNbStreams(); ++streamIndex)`
`39`	`41`	`{`
`40`	`42`	`switch(_formatContext->getAVStream(streamIndex).codec->codec_type)`
`@@ -120,7 +122,7 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`// if the analysis level has decoded some streams parts, return at the beginning`
`123`		`- if(level > eAnalyseLevelHeader)`
	`125`	`+ if(level > eAnalyseLevelHeader && ! isRawFormat())`
`124`	`126`	`const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);`
`125`	`127`	`}`
`126`	`128`