FileProperties: rename attribute _streams to _streamsProperties

Clement Champetier · Clement Champetier · commit bc67a2fcd27e · 2016-11-07T20:18:04.000+01:00
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -15,6 +15,7 @@ FileProperties::FileProperties(const InputFile& file)
     : _file(file)
     , _formatContext(&file.getFormatContext())
     , _avFormatContext(&file.getFormatContext().getAVFormatContext())
+    , _streamsProperties()
     , _videoStreams()
     , _audioStreams()
     , _dataStreams()
@@ -92,43 +93,43 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
     }
 
     // clear streams
-    _streams.clear();
+    _streamsProperties.clear();
 
     // once the streams vectors are filled, add their references the base streams vector
     for(size_t streamIndex = 0; streamIndex < _videoStreams.size(); ++streamIndex)
     {
         const size_t videoStreamIndex = _videoStreams.at(streamIndex).getStreamIndex();
-        _streams[videoStreamIndex] = &_videoStreams.at(streamIndex);
+        _streamsProperties[videoStreamIndex] = &_videoStreams.at(streamIndex);
     }
 
     for(size_t streamIndex = 0; streamIndex < _audioStreams.size(); ++streamIndex)
     {
         const size_t audioStreamIndex = _audioStreams.at(streamIndex).getStreamIndex();
-        _streams[audioStreamIndex] = &_audioStreams.at(streamIndex);
+        _streamsProperties[audioStreamIndex] = &_audioStreams.at(streamIndex);
     }
 
     for(size_t streamIndex = 0; streamIndex < _dataStreams.size(); ++streamIndex)
     {
         const size_t dataStreamIndex = _dataStreams.at(streamIndex).getStreamIndex();
-        _streams[dataStreamIndex] = &_dataStreams.at(streamIndex);
+        _streamsProperties[dataStreamIndex] = &_dataStreams.at(streamIndex);
     }
 
     for(size_t streamIndex = 0; streamIndex < _subtitleStreams.size(); ++streamIndex)
     {
         const size_t subtitleStreamIndex = _subtitleStreams.at(streamIndex).getStreamIndex();
-        _streams[subtitleStreamIndex] = &_subtitleStreams.at(streamIndex);
+        _streamsProperties[subtitleStreamIndex] = &_subtitleStreams.at(streamIndex);
     }
 
     for(size_t streamIndex = 0; streamIndex < _attachementStreams.size(); ++streamIndex)
     {
         const size_t attachementStreamIndex = _attachementStreams.at(streamIndex).getStreamIndex();
-        _streams[attachementStreamIndex] = &_attachementStreams.at(streamIndex);
+        _streamsProperties[attachementStreamIndex] = &_attachementStreams.at(streamIndex);
     }
 
     for(size_t streamIndex = 0; streamIndex < _unknownStreams.size(); ++streamIndex)
     {
         const size_t unknownStreamIndex = _unknownStreams.at(streamIndex).getStreamIndex();
-        _streams[unknownStreamIndex] = &_unknownStreams.at(streamIndex);
+        _streamsProperties[unknownStreamIndex] = &_unknownStreams.at(streamIndex);
     }
 
     // Returns at the beginning of the stream after any deep analysis
@@ -224,7 +225,7 @@ size_t FileProperties::getPacketSize() const
 
 const avtranscoder::StreamProperties& FileProperties::getStreamPropertiesWithIndex(const size_t streamIndex) const
 {
-    avtranscoder::StreamProperties* properties = _streams.find(streamIndex)->second;
+    avtranscoder::StreamProperties* properties = _streamsProperties.find(streamIndex)->second;
     if(properties)
         return *properties;
     std::stringstream os;
@@ -236,7 +237,7 @@ const avtranscoder::StreamProperties& FileProperties::getStreamPropertiesWithInd
 const std::vector<avtranscoder::StreamProperties*> FileProperties::getStreamProperties() const
 {
     std::vector<avtranscoder::StreamProperties*> streams;
-    for(std::map<size_t, StreamProperties*>::const_iterator it = _streams.begin(); it != _streams.end(); ++it)
+    for(std::map<size_t, StreamProperties*>::const_iterator it = _streamsProperties.begin(); it != _streamsProperties.end(); ++it)
     {
         streams.push_back(it->second);
     }
diff --git a/src/AvTranscoder/properties/FileProperties.hpp b/src/AvTranscoder/properties/FileProperties.hpp
@@ -113,7 +113,7 @@ class AvExport FileProperties
     const AVFormatContext* _avFormatContext; ///< Has link (no ownership)
 
     std::map<size_t, StreamProperties*>
-        _streams; ///< Map of properties per stream index (of all types) - only references to the following properties
+        _streamsProperties; ///< Map of properties per stream index (of all types) - only references to the following properties
 
     std::vector<VideoProperties> _videoStreams;             ///< Array of properties per video stream
     std::vector<AudioProperties> _audioStreams;             ///< Array of properties per audio stream

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ FileProperties::FileProperties(const InputFile& file)`
`15`	`15`	`: _file(file)`
`16`	`16`	`, _formatContext(&file.getFormatContext())`
`17`	`17`	`, _avFormatContext(&file.getFormatContext().getAVFormatContext())`
	`18`	`+ , _streamsProperties()`
`18`	`19`	`, _videoStreams()`
`19`	`20`	`, _audioStreams()`
`20`	`21`	`, _dataStreams()`
`@@ -92,43 +93,43 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`// clear streams`
`95`		`- _streams.clear();`
	`96`	`+ _streamsProperties.clear();`
`96`	`97`
`97`	`98`	`// once the streams vectors are filled, add their references the base streams vector`
`98`	`99`	`for(size_t streamIndex = 0; streamIndex < _videoStreams.size(); ++streamIndex)`
`99`	`100`	`{`
`100`	`101`	`const size_t videoStreamIndex = _videoStreams.at(streamIndex).getStreamIndex();`
`101`		`- _streams[videoStreamIndex] = &_videoStreams.at(streamIndex);`
	`102`	`+ _streamsProperties[videoStreamIndex] = &_videoStreams.at(streamIndex);`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`for(size_t streamIndex = 0; streamIndex < _audioStreams.size(); ++streamIndex)`
`105`	`106`	`{`
`106`	`107`	`const size_t audioStreamIndex = _audioStreams.at(streamIndex).getStreamIndex();`
`107`		`- _streams[audioStreamIndex] = &_audioStreams.at(streamIndex);`
	`108`	`+ _streamsProperties[audioStreamIndex] = &_audioStreams.at(streamIndex);`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`for(size_t streamIndex = 0; streamIndex < _dataStreams.size(); ++streamIndex)`
`111`	`112`	`{`
`112`	`113`	`const size_t dataStreamIndex = _dataStreams.at(streamIndex).getStreamIndex();`
`113`		`- _streams[dataStreamIndex] = &_dataStreams.at(streamIndex);`
	`114`	`+ _streamsProperties[dataStreamIndex] = &_dataStreams.at(streamIndex);`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`for(size_t streamIndex = 0; streamIndex < _subtitleStreams.size(); ++streamIndex)`
`117`	`118`	`{`
`118`	`119`	`const size_t subtitleStreamIndex = _subtitleStreams.at(streamIndex).getStreamIndex();`
`119`		`- _streams[subtitleStreamIndex] = &_subtitleStreams.at(streamIndex);`
	`120`	`+ _streamsProperties[subtitleStreamIndex] = &_subtitleStreams.at(streamIndex);`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`for(size_t streamIndex = 0; streamIndex < _attachementStreams.size(); ++streamIndex)`
`123`	`124`	`{`
`124`	`125`	`const size_t attachementStreamIndex = _attachementStreams.at(streamIndex).getStreamIndex();`
`125`		`- _streams[attachementStreamIndex] = &_attachementStreams.at(streamIndex);`
	`126`	`+ _streamsProperties[attachementStreamIndex] = &_attachementStreams.at(streamIndex);`
`126`	`127`	`}`
`127`	`128`
`128`	`129`	`for(size_t streamIndex = 0; streamIndex < _unknownStreams.size(); ++streamIndex)`
`129`	`130`	`{`
`130`	`131`	`const size_t unknownStreamIndex = _unknownStreams.at(streamIndex).getStreamIndex();`
`131`		`- _streams[unknownStreamIndex] = &_unknownStreams.at(streamIndex);`
	`132`	`+ _streamsProperties[unknownStreamIndex] = &_unknownStreams.at(streamIndex);`
`132`	`133`	`}`
`133`	`134`
`134`	`135`	`// Returns at the beginning of the stream after any deep analysis`
`@@ -224,7 +225,7 @@ size_t FileProperties::getPacketSize() const`
`224`	`225`
`225`	`226`	`const avtranscoder::StreamProperties& FileProperties::getStreamPropertiesWithIndex(const size_t streamIndex) const`
`226`	`227`	`{`
`227`		`- avtranscoder::StreamProperties* properties = _streams.find(streamIndex)->second;`
	`228`	`+ avtranscoder::StreamProperties* properties = _streamsProperties.find(streamIndex)->second;`
`228`	`229`	`if(properties)`
`229`	`230`	`return *properties;`
`230`	`231`	`std::stringstream os;`
`@@ -236,7 +237,7 @@ const avtranscoder::StreamProperties& FileProperties::getStreamPropertiesWithInd`
`236`	`237`	`const std::vector<avtranscoder::StreamProperties*> FileProperties::getStreamProperties() const`
`237`	`238`	`{`
`238`	`239`	`std::vector<avtranscoder::StreamProperties*> streams;`
`239`		`- for(std::map<size_t, StreamProperties*>::const_iterator it = _streams.begin(); it != _streams.end(); ++it)`
	`240`	`+ for(std::map<size_t, StreamProperties*>::const_iterator it = _streamsProperties.begin(); it != _streamsProperties.end(); ++it)`
`240`	`241`	`{`
`241`	`242`	`streams.push_back(it->second);`
`242`	`243`	`}`