FileProperties: added seek to the beginning of the stream before/after any deep analysis

Clement Champetier · Clement Champetier · commit 39ebb6c7d5db · 2016-06-22T16:55:07.000+02:00
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -30,6 +30,10 @@ FileProperties::FileProperties(const FormatContext& formatContext)
 
 void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyseLevel level)
 {
+    // Returns at the beginning of the stream before any deep analysis
+    if(level > eAnalyseLevelHeader && ! isRawFormat())
+        const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);
+
     // clear properties
     clearStreamProperties();
 
@@ -117,6 +121,10 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
         const size_t unknownStreamIndex = _unknownStreams.at(streamIndex).getStreamIndex();
         _streams[unknownStreamIndex] = &_unknownStreams.at(streamIndex);
     }
+
+    // Returns at the beginning of the stream after any deep analysis
+    if(level > eAnalyseLevelHeader && ! isRawFormat())
+        const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);
 }
 
 std::string FileProperties::getFilename() const

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ FileProperties::FileProperties(const FormatContext& formatContext)`
`30`	`30`
`31`	`31`	`void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyseLevel level)`
`32`	`32`	`{`
	`33`	`+ // Returns at the beginning of the stream before any deep analysis`
	`34`	`+ if(level > eAnalyseLevelHeader && ! isRawFormat())`
	`35`	`+ const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);`
	`36`	`+`
`33`	`37`	`// clear properties`
`34`	`38`	`clearStreamProperties();`
`35`	`39`
`@@ -117,6 +121,10 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse`
`117`	`121`	`const size_t unknownStreamIndex = _unknownStreams.at(streamIndex).getStreamIndex();`
`118`	`122`	`_streams[unknownStreamIndex] = &_unknownStreams.at(streamIndex);`
`119`	`123`	`}`
	`124`	`+`
	`125`	`+ // Returns at the beginning of the stream after any deep analysis`
	`126`	`+ if(level > eAnalyseLevelHeader && ! isRawFormat())`
	`127`	`+ const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);`
`120`	`128`	`}`
`121`	`129`
`122`	`130`	`std::string FileProperties::getFilename() const`