properties: used FileProperties instead of FormatContext to instanciate stream properties

Clement Champetier · Clement Champetier · commit 3b32e2159c17 · 2016-06-20T16:58:21.000+02:00
With the FileProperties class, we have access to several conveniant
methods.
diff --git a/src/AvTranscoder/properties/AttachementProperties.hpp b/src/AvTranscoder/properties/AttachementProperties.hpp
@@ -9,8 +9,8 @@ namespace avtranscoder
 class AvExport AttachementProperties : public StreamProperties
 {
 public:
-    AttachementProperties(const FormatContext& formatContext, const size_t index)
-        : StreamProperties(formatContext, index)
+    AttachementProperties(const FileProperties& fileProperties, const size_t index)
+        : StreamProperties(fileProperties, index)
     {
     }
 };
diff --git a/src/AvTranscoder/properties/AudioProperties.cpp b/src/AvTranscoder/properties/AudioProperties.cpp
@@ -15,8 +15,8 @@ extern "C" {
 namespace avtranscoder
 {
 
-AudioProperties::AudioProperties(const FormatContext& formatContext, const size_t index)
-    : StreamProperties(formatContext, index)
+AudioProperties::AudioProperties(const FileProperties& fileProperties, const size_t index)
+    : StreamProperties(fileProperties, index)
 {
 }
 
diff --git a/src/AvTranscoder/properties/AudioProperties.hpp b/src/AvTranscoder/properties/AudioProperties.hpp
@@ -11,7 +11,7 @@ namespace avtranscoder
 class AvExport AudioProperties : public StreamProperties
 {
 public:
-    AudioProperties(const FormatContext& formatContext, const size_t index);
+    AudioProperties(const FileProperties& fileProperties, const size_t index);
 
     std::string getSampleFormatName() const;
     std::string getSampleFormatLongName() const;
diff --git a/src/AvTranscoder/properties/DataProperties.hpp b/src/AvTranscoder/properties/DataProperties.hpp
@@ -9,8 +9,8 @@ namespace avtranscoder
 class AvExport DataProperties : public StreamProperties
 {
 public:
-    DataProperties(const FormatContext& formatContext, const size_t index)
-        : StreamProperties(formatContext, index)
+    DataProperties(const FileProperties& fileProperties, const size_t index)
+        : StreamProperties(fileProperties, index)
     {
     }
 
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -44,37 +44,37 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
         {
             case AVMEDIA_TYPE_VIDEO:
             {
-                VideoProperties properties(*_formatContext, streamIndex, progress, level);
+                VideoProperties properties(*this, streamIndex, progress, level);
                 _videoStreams.push_back(properties);
                 break;
             }
             case AVMEDIA_TYPE_AUDIO:
             {
-                AudioProperties properties(*_formatContext, streamIndex);
+                AudioProperties properties(*this, streamIndex);
                 _audioStreams.push_back(properties);
                 break;
             }
             case AVMEDIA_TYPE_DATA:
             {
-                DataProperties properties(*_formatContext, streamIndex);
+                DataProperties properties(*this, streamIndex);
                 _dataStreams.push_back(properties);
                 break;
             }
             case AVMEDIA_TYPE_SUBTITLE:
             {
-                SubtitleProperties properties(*_formatContext, streamIndex);
+                SubtitleProperties properties(*this, streamIndex);
                 _subtitleStreams.push_back(properties);
                 break;
             }
             case AVMEDIA_TYPE_ATTACHMENT:
             {
-                AttachementProperties properties(*_formatContext, streamIndex);
+                AttachementProperties properties(*this, streamIndex);
                 _attachementStreams.push_back(properties);
                 break;
             }
             case AVMEDIA_TYPE_UNKNOWN:
             {
-                UnknownProperties properties(*_formatContext, streamIndex);
+                UnknownProperties properties(*this, streamIndex);
                 _unknownStreams.push_back(properties);
                 break;
             }
diff --git a/src/AvTranscoder/properties/StreamProperties.cpp b/src/AvTranscoder/properties/StreamProperties.cpp
@@ -2,14 +2,16 @@
 
 #include <AvTranscoder/properties/util.hpp>
 #include <AvTranscoder/properties/JsonWriter.hpp>
+#include <AvTranscoder/properties/FileProperties.hpp>
 
 #include <stdexcept>
 
 namespace avtranscoder
 {
 
-StreamProperties::StreamProperties(const FormatContext& formatContext, const size_t index)
-    : _formatContext(&formatContext.getAVFormatContext())
+StreamProperties::StreamProperties(const FileProperties& fileProperties, const size_t index)
+    : _fileProperties(&fileProperties)
+    , _formatContext(&fileProperties.getAVFormatContext())
     , _codecContext(NULL)
     , _codec(NULL)
     , _streamIndex(index)
diff --git a/src/AvTranscoder/properties/StreamProperties.hpp b/src/AvTranscoder/properties/StreamProperties.hpp
@@ -9,11 +9,13 @@
 namespace avtranscoder
 {
 
+class FileProperties;
+
 /// Virtual based class of properties for all types of stream
 class AvExport StreamProperties
 {
 public:
-    StreamProperties(const FormatContext& formatContext, const size_t index);
+    StreamProperties(const FileProperties& fileProperties, const size_t index);
     virtual ~StreamProperties() = 0;
 
     size_t getStreamIndex() const { return _streamIndex; }
@@ -65,6 +67,7 @@ class AvExport StreamProperties
 #endif
 
 protected:
+    const FileProperties* _fileProperties; ///< Has link (no ownership)
     const AVFormatContext* _formatContext; ///< Has link (no ownership)
     AVCodecContext* _codecContext;         ///< Has link (no ownership)
     AVCodec* _codec;                       ///< Has link (no ownership)
diff --git a/src/AvTranscoder/properties/SubtitleProperties.hpp b/src/AvTranscoder/properties/SubtitleProperties.hpp
@@ -9,8 +9,8 @@ namespace avtranscoder
 class AvExport SubtitleProperties : public StreamProperties
 {
 public:
-    SubtitleProperties(const FormatContext& formatContext, const size_t index)
-        : StreamProperties(formatContext, index)
+    SubtitleProperties(const FileProperties& fileProperties, const size_t index)
+        : StreamProperties(fileProperties, index)
     {
     }
 };
diff --git a/src/AvTranscoder/properties/UnknownProperties.hpp b/src/AvTranscoder/properties/UnknownProperties.hpp
@@ -9,8 +9,8 @@ namespace avtranscoder
 class AvExport UnknownProperties : public StreamProperties
 {
 public:
-    UnknownProperties(const FormatContext& formatContext, const size_t index)
-        : StreamProperties(formatContext, index)
+    UnknownProperties(const FileProperties& fileProperties, const size_t index)
+        : StreamProperties(fileProperties, index)
     {
     }
 };
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -17,9 +17,9 @@ extern "C" {
 namespace avtranscoder
 {
 
-VideoProperties::VideoProperties(const FormatContext& formatContext, const size_t index, IProgress& progress,
+VideoProperties::VideoProperties(const FileProperties& fileProperties, const size_t index, IProgress& progress,
                                  const EAnalyseLevel level)
-    : StreamProperties(formatContext, index)
+    : StreamProperties(fileProperties, index)
     , _levelAnalysis(level)
     , _pixelProperties()
     , _isInterlaced(false)
diff --git a/src/AvTranscoder/properties/VideoProperties.hpp b/src/AvTranscoder/properties/VideoProperties.hpp
@@ -21,7 +21,7 @@ namespace avtranscoder
 class AvExport VideoProperties : public StreamProperties
 {
 public:
-    VideoProperties(const FormatContext& formatContext, const size_t index, IProgress& progress,
+    VideoProperties(const FileProperties& fileProperties, const size_t index, IProgress& progress,
                     const EAnalyseLevel level = eAnalyseLevelFirstGop);
 
     std::string getProfileName() const;

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ namespace avtranscoder`
`9`	`9`	`class AvExport AttachementProperties : public StreamProperties`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`		`- AttachementProperties(const FormatContext& formatContext, const size_t index)`
`13`		`- : StreamProperties(formatContext, index)`
	`12`	`+ AttachementProperties(const FileProperties& fileProperties, const size_t index)`
	`13`	`+ : StreamProperties(fileProperties, index)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`	`};`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ extern "C" {`
`15`	`15`	`namespace avtranscoder`
`16`	`16`	`{`
`17`	`17`
`18`		`-AudioProperties::AudioProperties(const FormatContext& formatContext, const size_t index)`
`19`		`- : StreamProperties(formatContext, index)`
	`18`	`+AudioProperties::AudioProperties(const FileProperties& fileProperties, const size_t index)`
	`19`	`+ : StreamProperties(fileProperties, index)`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace avtranscoder`
`11`	`11`	`class AvExport AudioProperties : public StreamProperties`
`12`	`12`	`{`
`13`	`13`	`public:`
`14`		`- AudioProperties(const FormatContext& formatContext, const size_t index);`
	`14`	`+ AudioProperties(const FileProperties& fileProperties, const size_t index);`
`15`	`15`
`16`	`16`	`std::string getSampleFormatName() const;`
`17`	`17`	`std::string getSampleFormatLongName() const;`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ namespace avtranscoder`
`9`	`9`	`class AvExport DataProperties : public StreamProperties`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`		`- DataProperties(const FormatContext& formatContext, const size_t index)`
`13`		`- : StreamProperties(formatContext, index)`
	`12`	`+ DataProperties(const FileProperties& fileProperties, const size_t index)`
	`13`	`+ : StreamProperties(fileProperties, index)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -44,37 +44,37 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse`
`44`	`44`	`{`
`45`	`45`	`case AVMEDIA_TYPE_VIDEO:`
`46`	`46`	`{`
`47`		`- VideoProperties properties(*_formatContext, streamIndex, progress, level);`
	`47`	`+ VideoProperties properties(*this, streamIndex, progress, level);`
`48`	`48`	`_videoStreams.push_back(properties);`
`49`	`49`	`break;`
`50`	`50`	`}`
`51`	`51`	`case AVMEDIA_TYPE_AUDIO:`
`52`	`52`	`{`
`53`		`- AudioProperties properties(*_formatContext, streamIndex);`
	`53`	`+ AudioProperties properties(*this, streamIndex);`
`54`	`54`	`_audioStreams.push_back(properties);`
`55`	`55`	`break;`
`56`	`56`	`}`
`57`	`57`	`case AVMEDIA_TYPE_DATA:`
`58`	`58`	`{`
`59`		`- DataProperties properties(*_formatContext, streamIndex);`
	`59`	`+ DataProperties properties(*this, streamIndex);`
`60`	`60`	`_dataStreams.push_back(properties);`
`61`	`61`	`break;`
`62`	`62`	`}`
`63`	`63`	`case AVMEDIA_TYPE_SUBTITLE:`
`64`	`64`	`{`
`65`		`- SubtitleProperties properties(*_formatContext, streamIndex);`
	`65`	`+ SubtitleProperties properties(*this, streamIndex);`
`66`	`66`	`_subtitleStreams.push_back(properties);`
`67`	`67`	`break;`
`68`	`68`	`}`
`69`	`69`	`case AVMEDIA_TYPE_ATTACHMENT:`
`70`	`70`	`{`
`71`		`- AttachementProperties properties(*_formatContext, streamIndex);`
	`71`	`+ AttachementProperties properties(*this, streamIndex);`
`72`	`72`	`_attachementStreams.push_back(properties);`
`73`	`73`	`break;`
`74`	`74`	`}`
`75`	`75`	`case AVMEDIA_TYPE_UNKNOWN:`
`76`	`76`	`{`
`77`		`- UnknownProperties properties(*_formatContext, streamIndex);`
	`77`	`+ UnknownProperties properties(*this, streamIndex);`
`78`	`78`	`_unknownStreams.push_back(properties);`
`79`	`79`	`break;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ namespace avtranscoder`
`9`	`9`	`class AvExport SubtitleProperties : public StreamProperties`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`		`- SubtitleProperties(const FormatContext& formatContext, const size_t index)`
`13`		`- : StreamProperties(formatContext, index)`
	`12`	`+ SubtitleProperties(const FileProperties& fileProperties, const size_t index)`
	`13`	`+ : StreamProperties(fileProperties, index)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`	`};`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ namespace avtranscoder`
`9`	`9`	`class AvExport UnknownProperties : public StreamProperties`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`		`- UnknownProperties(const FormatContext& formatContext, const size_t index)`
`13`		`- : StreamProperties(formatContext, index)`
	`12`	`+ UnknownProperties(const FileProperties& fileProperties, const size_t index)`
	`13`	`+ : StreamProperties(fileProperties, index)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`	`};`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace avtranscoder`
`21`	`21`	`class AvExport VideoProperties : public StreamProperties`
`22`	`22`	`{`
`23`	`23`	`public:`
`24`		`- VideoProperties(const FormatContext& formatContext, const size_t index, IProgress& progress,`
	`24`	`+ VideoProperties(const FileProperties& fileProperties, const size_t index, IProgress& progress,`
`25`	`25`	`const EAnalyseLevel level = eAnalyseLevelFirstGop);`
`26`	`26`
`27`	`27`	`std::string getProfileName() const;`