InputFile: fixed filled of properties when create a new InputFile

Clement Champetier · Clement Champetier · commit 77f311ea5749 · 2015-12-22T14:56:59.000+01:00
* Need to find stream info before get them as properties.
* Need to have FileProperties attribute as pointer, because we want to
create it only once (after _formatContext.findStreamInfo()).
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -22,12 +22,16 @@ namespace avtranscoder
 
 InputFile::InputFile(const std::string& filename)
     : _formatContext(filename, AV_OPT_FLAG_DECODING_PARAM)
-    , _properties(_formatContext)
+    , _properties(NULL)
     , _filename(filename)
     , _inputStreams()
 {
+    // Fill the FormatContext with the stream information
     _formatContext.findStreamInfo();
 
+    // Get the stream information as properties
+    _properties = new FileProperties(_formatContext);
+
     // Create streams
     for(size_t streamIndex = 0; streamIndex < _formatContext.getNbStreams(); ++streamIndex)
     {
@@ -37,6 +41,7 @@ InputFile::InputFile(const std::string& filename)
 
 InputFile::~InputFile()
 {
+    delete _properties;
     for(std::vector<InputStream*>::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it)
     {
         delete(*it);
@@ -45,7 +50,7 @@ InputFile::~InputFile()
 
 void InputFile::analyse(IProgress& progress, const EAnalyseLevel level)
 {
-    _properties.extractStreamProperties(progress, level);
+    _properties->extractStreamProperties(progress, level);
 }
 
 FileProperties InputFile::analyseFile(const std::string& filename, IProgress& progress, const EAnalyseLevel level)
@@ -160,8 +165,8 @@ std::string InputFile::getFormatMimeType() const
 double InputFile::getFps()
 {
     double fps = 1;
-    if(_properties.getNbVideoStreams())
-        fps = _properties.getVideoProperties().at(0).getFps();
+    if(_properties->getNbVideoStreams())
+        fps = _properties->getVideoProperties().at(0).getFps();
     return fps;
 }
 
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -68,7 +68,7 @@ class AvExport InputFile
      * @note require to launch analyse() before to fill the property struture
      * @return structure of media metadatas
      **/
-    const FileProperties& getProperties() const { return _properties; }
+    const FileProperties& getProperties() const { return *_properties; }
 
     /**
      * @brief Get stream type: video, audio, subtitle, etc.
@@ -121,7 +121,7 @@ class AvExport InputFile
 
 protected:
     FormatContext _formatContext;
-    FileProperties _properties;
+    FileProperties* _properties;
     std::string _filename;
     std::vector<InputStream*> _inputStreams; ///< Has ownership
 };

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,16 @@ namespace avtranscoder`
`22`	`22`
`23`	`23`	`InputFile::InputFile(const std::string& filename)`
`24`	`24`	`: _formatContext(filename, AV_OPT_FLAG_DECODING_PARAM)`
`25`		`- , _properties(_formatContext)`
	`25`	`+ , _properties(NULL)`
`26`	`26`	`, _filename(filename)`
`27`	`27`	`, _inputStreams()`
`28`	`28`	`{`
	`29`	`+ // Fill the FormatContext with the stream information`
`29`	`30`	`_formatContext.findStreamInfo();`
`30`	`31`
	`32`	`+ // Get the stream information as properties`
	`33`	`+ _properties = new FileProperties(_formatContext);`
	`34`	`+`
`31`	`35`	`// Create streams`
`32`	`36`	`for(size_t streamIndex = 0; streamIndex < _formatContext.getNbStreams(); ++streamIndex)`
`33`	`37`	`{`
`@@ -37,6 +41,7 @@ InputFile::InputFile(const std::string& filename)`
`37`	`41`
`38`	`42`	`InputFile::~InputFile()`
`39`	`43`	`{`
	`44`	`+ delete _properties;`
`40`	`45`	`for(std::vector<InputStream*>::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it)`
`41`	`46`	`{`
`42`	`47`	`delete(*it);`
`@@ -45,7 +50,7 @@ InputFile::~InputFile()`
`45`	`50`
`46`	`51`	`void InputFile::analyse(IProgress& progress, const EAnalyseLevel level)`
`47`	`52`	`{`
`48`		`- _properties.extractStreamProperties(progress, level);`
	`53`	`+ _properties->extractStreamProperties(progress, level);`
`49`	`54`	`}`
`50`	`55`
`51`	`56`	`FileProperties InputFile::analyseFile(const std::string& filename, IProgress& progress, const EAnalyseLevel level)`
`@@ -160,8 +165,8 @@ std::string InputFile::getFormatMimeType() const`
`160`	`165`	`double InputFile::getFps()`
`161`	`166`	`{`
`162`	`167`	`double fps = 1;`
`163`		`- if(_properties.getNbVideoStreams())`
`164`		`- fps = _properties.getVideoProperties().at(0).getFps();`
	`168`	`+ if(_properties->getNbVideoStreams())`
	`169`	`+ fps = _properties->getVideoProperties().at(0).getFps();`
`165`	`170`	`return fps;`
`166`	`171`	`}`
`167`	`172`