FileProperties: fix InputFile analysis

Clement Champetier · Clement Champetier · commit 294aa0342aa9 · 2016-11-07T15:53:41.000+01:00
* When manually analyse an InputFile, the previous StreamProperties created are used to access the codec (if decoding is needed).
* So in that cases, the _streams vector should be cleared after the new analysis.
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -36,7 +36,12 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
         const_cast<InputFile&>(_file).seekAtFrame(0, AVSEEK_FLAG_BACKWARD);
 
     // clear properties
-    clearStreamProperties();
+    _videoStreams.clear();
+    _audioStreams.clear();
+    _dataStreams.clear();
+    _subtitleStreams.clear();
+    _attachementStreams.clear();
+    _unknownStreams.clear();
 
     // reload properties
     for(size_t streamIndex = 0; streamIndex < _formatContext->getNbStreams(); ++streamIndex)
@@ -86,6 +91,9 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
         }
     }
 
+    // clear streams
+    _streams.clear();
+
     // once the streams vectors are filled, add their references the base streams vector
     for(size_t streamIndex = 0; streamIndex < _videoStreams.size(); ++streamIndex)
     {
@@ -373,18 +381,6 @@ std::string FileProperties::allPropertiesAsJson() const
     return writer.build();
 }
 
-void FileProperties::clearStreamProperties()
-{
-    _streams.clear();
-
-    _videoStreams.clear();
-    _audioStreams.clear();
-    _dataStreams.clear();
-    _subtitleStreams.clear();
-    _attachementStreams.clear();
-    _unknownStreams.clear();
-}
-
 std::ostream& operator<<(std::ostream& flux, const FileProperties& fileProperties)
 {
     flux << std::left;
diff --git a/src/AvTranscoder/properties/FileProperties.hpp b/src/AvTranscoder/properties/FileProperties.hpp
@@ -107,8 +107,6 @@ class AvExport FileProperties
     }
 #endif
 
-    void clearStreamProperties(); ///< Clear all array of stream properties
-
 private:
     const InputFile& _file; ///< Has link (no ownership)
     const FormatContext* _formatContext;     ///< Has link (no ownership)

Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,6 @@ class AvExport FileProperties`
`107`	`107`	`}`
`108`	`108`	`#endif`
`109`	`109`
`110`		`- void clearStreamProperties(); ///< Clear all array of stream properties`
`111`		`-`
`112`	`110`	`private:`
`113`	`111`	`const InputFile& _file; ///< Has link (no ownership)`
`114`	`112`	`const FormatContext* _formatContext; ///< Has link (no ownership)`