properties: seek at the beginning of the stream in the corresponding methods

Clement Champetier · Clement Champetier · commit 5e6e05a60fdf · 2016-06-21T11:58:29.000+02:00
Instead of a 'global' seek in FileProperties.
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -30,10 +30,6 @@ FileProperties::FileProperties(const FormatContext& formatContext)
 
 void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyseLevel level)
 {
-    // if the analysis level wiil decode some streams parts, seek at the beginning
-    if(level > eAnalyseLevelHeader && ! isRawFormat())
-        const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);
-
     // clear properties
     clearStreamProperties();
 
@@ -121,10 +117,6 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
         const size_t unknownStreamIndex = _unknownStreams.at(streamIndex).getStreamIndex();
         _streams[unknownStreamIndex] = &_unknownStreams.at(streamIndex);
     }
-
-    // if the analysis level has decoded some streams parts, return at the beginning
-    if(level > eAnalyseLevelHeader && ! isRawFormat())
-        const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);
 }
 
 std::string FileProperties::getFilename() const
diff --git a/src/AvTranscoder/properties/StreamProperties.cpp b/src/AvTranscoder/properties/StreamProperties.cpp
@@ -139,8 +139,12 @@ size_t StreamProperties::getBitRate() const
             if(positionOfFirstKeyFrame != -1 && positionOfLastKeyFrame != -1)
                 break;
         }
+        // Close a given AVCodecContext and free all the data associated with it (but not the AVCodecContext itself)
         avcodec_close(_codecContext);
 
+        // Returns at the beginning of the stream
+        const_cast<FormatContext*>(&_fileProperties->getFormatContext())->seek(0, AVSEEK_FLAG_BYTE);
+
         const size_t gopSize = positionOfLastKeyFrame - positionOfFirstKeyFrame;
         if(gopSize > 0)
         {
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -484,6 +484,9 @@ void VideoProperties::analyseGopStructure(IProgress& progress)
 
             // Close a given AVCodecContext and free all the data associated with it (but not the AVCodecContext itself)
             avcodec_close(_codecContext);
+
+            // Returns at the beginning of the stream
+            const_cast<FormatContext*>(&_fileProperties->getFormatContext())->seek(0, AVSEEK_FLAG_BYTE);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,6 @@ FileProperties::FileProperties(const FormatContext& formatContext)`
`30`	`30`
`31`	`31`	`void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyseLevel level)`
`32`	`32`	`{`
`33`		`- // if the analysis level wiil decode some streams parts, seek at the beginning`
`34`		`- if(level > eAnalyseLevelHeader && ! isRawFormat())`
`35`		`- const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);`
`36`		`-`
`37`	`33`	`// clear properties`
`38`	`34`	`clearStreamProperties();`
`39`	`35`
`@@ -121,10 +117,6 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse`
`121`	`117`	`const size_t unknownStreamIndex = _unknownStreams.at(streamIndex).getStreamIndex();`
`122`	`118`	`_streams[unknownStreamIndex] = &_unknownStreams.at(streamIndex);`
`123`	`119`	`}`
`124`		`-`
`125`		`- // if the analysis level has decoded some streams parts, return at the beginning`
`126`		`- if(level > eAnalyseLevelHeader && ! isRawFormat())`
`127`		`- const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);`
`128`	`120`	`}`
`129`	`121`
`130`	`122`	`std::string FileProperties::getFilename() const`
Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,12 @@ size_t StreamProperties::getBitRate() const`
`139`	`139`	`if(positionOfFirstKeyFrame != -1 && positionOfLastKeyFrame != -1)`
`140`	`140`	`break;`
`141`	`141`	`}`
	`142`	`+ // Close a given AVCodecContext and free all the data associated with it (but not the AVCodecContext itself)`
`142`	`143`	`avcodec_close(_codecContext);`
`143`	`144`
	`145`	`+ // Returns at the beginning of the stream`
	`146`	`+ const_cast<FormatContext*>(&_fileProperties->getFormatContext())->seek(0, AVSEEK_FLAG_BYTE);`
	`147`	`+`
`144`	`148`	`const size_t gopSize = positionOfLastKeyFrame - positionOfFirstKeyFrame;`
`145`	`149`	`if(gopSize > 0)`
`146`	`150`	`{`
Original file line number	Diff line number	Diff line change
`@@ -484,6 +484,9 @@ void VideoProperties::analyseGopStructure(IProgress& progress)`
`484`	`484`
`485`	`485`	`// Close a given AVCodecContext and free all the data associated with it (but not the AVCodecContext itself)`
`486`	`486`	`avcodec_close(_codecContext);`
	`487`	`+`
	`488`	`+ // Returns at the beginning of the stream`
	`489`	`+ const_cast<FormatContext*>(&_fileProperties->getFormatContext())->seek(0, AVSEEK_FLAG_BYTE);`
`487`	`490`	`}`
`488`	`491`	`}`
`489`	`492`	`}`