FileProperties: update how to construct the properties

Clement Champetier · Clement Champetier · commit 42f78c9d6cd7 · 2016-11-02T17:58:08.000+01:00
* Keep a reference to the InputFile.
* This new reference will be used to refactor the decoding in case of
deep analysis.
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -30,7 +30,7 @@ InputFile::InputFile(const std::string& filename)
     _formatContext.findStreamInfo();
 
     // Get the stream information as properties
-    _properties = new FileProperties(_formatContext);
+    _properties = new FileProperties(*this);
 
     // Create streams
     for(size_t streamIndex = 0; streamIndex < _formatContext.getNbStreams(); ++streamIndex)
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -79,7 +79,7 @@ class AvExport InputFile
 
     std::string getFilename() const { return _filename; }
 
-    FormatContext& getFormatContext() { return _formatContext; }
+    const FormatContext& getFormatContext() const { return _formatContext; }
 
     /**
      * @brief Set the format of the input file
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -11,9 +11,10 @@
 namespace avtranscoder
 {
 
-FileProperties::FileProperties(const FormatContext& formatContext)
-    : _formatContext(&formatContext)
-    , _avFormatContext(&formatContext.getAVFormatContext())
+FileProperties::FileProperties(const InputFile& file)
+    : _file(file)
+    , _formatContext(&file.getFormatContext())
+    , _avFormatContext(&file.getFormatContext().getAVFormatContext())
     , _videoStreams()
     , _audioStreams()
     , _dataStreams()
@@ -31,8 +32,8 @@ 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);
+    if(level > eAnalyseLevelHeader && ! isRawFormat())
+        const_cast<InputFile&>(_file).seekAtFrame(0, AVSEEK_FLAG_BACKWARD);
 
     // clear properties
     clearStreamProperties();
@@ -123,8 +124,8 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
     }
 
     // Returns at the beginning of the stream after any deep analysis
-    if(level > eAnalyseLevelHeader && !isRawFormat())
-        const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);
+    if(level > eAnalyseLevelHeader && ! isRawFormat())
+        const_cast<InputFile&>(_file).seekAtFrame(0, AVSEEK_FLAG_BACKWARD);
 }
 
 std::string FileProperties::getFilename() const
diff --git a/src/AvTranscoder/properties/FileProperties.hpp b/src/AvTranscoder/properties/FileProperties.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/properties/util.hpp>
-#include <AvTranscoder/file/FormatContext.hpp>
+#include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/progress/IProgress.hpp>
 
 #include <AvTranscoder/properties/StreamProperties.hpp>
@@ -29,7 +29,7 @@ class AvExport FileProperties
      * @note The default streams analyse level is eAnalyseLevelHeader
      * @see FormatContext
      */
-    FileProperties(const FormatContext& formatContext);
+    FileProperties(const InputFile& file);
 
     /**
      * @brief Relaunch streams analysis with a specific level.
@@ -62,7 +62,7 @@ class AvExport FileProperties
     size_t getNbAttachementStreams() const { return _attachementStreams.size(); }
     size_t getNbUnknownStreams() const { return _unknownStreams.size(); }
 
-    const FormatContext& getFormatContext() const { return *_formatContext; }
+    const InputFile& getInputFile() const { return _file; }
 
     //@{
     // @brief Get the properties at the indicated stream index
@@ -110,6 +110,7 @@ class AvExport FileProperties
     void clearStreamProperties(); ///< Clear all array of stream properties
 
 private:
+    const InputFile& _file; ///< Has link (no ownership)
     const FormatContext* _formatContext;     ///< Has link (no ownership)
     const AVFormatContext* _avFormatContext; ///< Has link (no ownership)
 
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -559,7 +559,7 @@ void VideoProperties::analyseGopStructure(IProgress& progress)
     avcodec_close(_codecContext);
 
     // Returns at the beginning of the stream
-    const_cast<FormatContext*>(&_fileProperties->getFormatContext())->seek(0, AVSEEK_FLAG_BYTE);
+    const_cast<InputFile&>(_fileProperties->getInputFile()).seekAtFrame(0, AVSEEK_FLAG_BYTE);
 
     // Check GOP size
     if(_gopSize <= 0)
