Skip to content

Commit 6f0532f

Browse files
author
Clement Champetier
committed
mediaProperty: rename getDataMap to getPropertiesAsMap
1 parent 8d48d71 commit 6f0532f

15 files changed

+21
-22
lines changed

‎src/AvTranscoder/mediaProperty/AttachementProperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ AttachementProperties::AttachementProperties( const AVFormatContext* formatConte
1111
detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
1212
}
1313

14-
PropertiesMap AttachementProperties::getDataMap() const
14+
PropertiesMap AttachementProperties::getPropertiesAsMap() const
1515
{
1616
PropertiesMap dataMap;
1717

‎src/AvTranscoder/mediaProperty/AttachementProperties.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class AvExport AttachementProperties
2323
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
2424
#endif
2525

26-
PropertiesMap getDataMap() const;
26+
PropertiesMap getPropertiesAsMap() const; ///< Return all attachement properties as a map (name of property: value)
2727

2828
private:
2929
const AVFormatContext* _formatContext; ///< Has link (no ownership)

‎src/AvTranscoder/mediaProperty/AudioProperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ size_t AudioProperties::getBitRate() const
154154
return _codecContext->bit_rate;
155155
}
156156

157-
PropertiesMap AudioProperties::getDataMap() const
157+
PropertiesMap AudioProperties::getPropertiesAsMap() const
158158
{
159159
PropertiesMap dataMap;
160160

‎src/AvTranscoder/mediaProperty/AudioProperties.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class AvExport AudioProperties
4040
AVCodecContext& getAVCodecContext() { return *_codecContext; }
4141
#endif
4242

43-
PropertiesMap getDataMap() const;
43+
PropertiesMap getPropertiesAsMap() const; ///< Return all audio properties as a map (name of property: value)
4444

4545
private:
4646
const AVFormatContext* _formatContext; ///< Has link (no ownership)

‎src/AvTranscoder/mediaProperty/DataProperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ DataProperties::DataProperties( const AVFormatContext* formatContext, const size
2222
detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
2323
}
2424

25-
PropertiesMap DataProperties::getDataMap() const
25+
PropertiesMap DataProperties::getPropertiesAsMap() const
2626
{
2727
PropertiesMap dataMap;
2828

‎src/AvTranscoder/mediaProperty/DataProperties.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class AvExport DataProperties
2323
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
2424
#endif
2525

26-
PropertiesMap getDataMap() const;
26+
PropertiesMap getPropertiesAsMap() const; ///< Return all data properties as a map (name of property: value)
2727

2828
private:
2929
void detectAncillaryData();

‎src/AvTranscoder/mediaProperty/FileProperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ size_t FileProperties::getNbStreams() const
8181
return _formatContext->nb_streams;
8282
}
8383

84-
PropertiesMap FileProperties::getDataMap() const
84+
PropertiesMap FileProperties::getPropertiesAsMap() const
8585
{
8686
PropertiesMap dataMap;
8787

‎src/AvTranscoder/mediaProperty/FileProperties.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class AvExport FileProperties
6262
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
6363
#endif
6464

65-
PropertiesMap getDataMap() const;
65+
PropertiesMap getPropertiesAsMap() const; ///< Return all file properties as a map (name of property: value)
6666

6767
private:
6868
const AVFormatContext* _formatContext; ///< Has link (no ownership)

‎src/AvTranscoder/mediaProperty/SubtitleProperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SubtitleProperties::SubtitleProperties( const AVFormatContext* formatContext, co
1111
detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
1212
}
1313

14-
PropertiesMap SubtitleProperties::getDataMap() const
14+
PropertiesMap SubtitleProperties::getPropertiesAsMap() const
1515
{
1616
PropertiesMap dataMap;
1717

‎src/AvTranscoder/mediaProperty/SubtitleProperties.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class AvExport SubtitleProperties
2323
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
2424
#endif
2525

26-
PropertiesMap getDataMap() const;
26+
PropertiesMap getPropertiesAsMap() const; ///< Return all subtitle properties as a map (name of property: value)
2727

2828
private:
2929
const AVFormatContext* _formatContext; ///< Has link (no ownership)

‎src/AvTranscoder/mediaProperty/UnknownProperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ UnknownProperties::UnknownProperties( const AVFormatContext* formatContext, cons
1111
detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
1212
}
1313

14-
PropertiesMap UnknownProperties::getDataMap() const
14+
PropertiesMap UnknownProperties::getPropertiesAsMap() const
1515
{
1616
PropertiesMap dataMap;
1717

‎src/AvTranscoder/mediaProperty/UnknownProperties.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class AvExport UnknownProperties
2323
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
2424
#endif
2525

26-
PropertiesMap getDataMap() const;
26+
PropertiesMap getPropertiesAsMap() const; ///< Return unknown properties as a map (name of property: value)
2727

2828
private:
2929
const AVFormatContext* _formatContext; ///< Has link (no ownership)

‎src/AvTranscoder/mediaProperty/VideoProperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ std::vector<Channel> VideoProperties::getChannels() const
648648
return channels;
649649
}
650650

651-
PropertiesMap VideoProperties::getDataMap() const
651+
PropertiesMap VideoProperties::getPropertiesAsMap() const
652652
{
653653
PropertiesMap dataMap;
654654

‎src/AvTranscoder/mediaProperty/VideoProperties.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ class AvExport VideoProperties
8181

8282
//@{
8383
// Warning: Can acces these data when analyse first gop
84-
// Construct the VideoProperties with level = eAnalyseLevelFull
8584
// @see EAnalyseLevel
8685
// @see analyseGopStructure
8786
bool isInterlaced() const { return _isInterlaced; }
@@ -99,7 +98,7 @@ class AvExport VideoProperties
9998
const AVPixFmtDescriptor& getAVPixFmtDescriptor() { return *_pixFmt; }
10099
#endif
101100

102-
PropertiesMap getDataMap() const;
101+
PropertiesMap getPropertiesAsMap() const; ///< Return all video properties as a map (name of property: value)
103102

104103
private:
105104
/**

‎src/AvTranscoder/mediaProperty/print.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ std::ostream& operator<<( std::ostream& flux, const FileProperties& fileProperti
1919
flux << std::left;
2020
flux << separator << " Wrapper " << separator << std::endl;
2121

22-
PropertiesMap properties = fileProperties.getDataMap();
22+
PropertiesMap properties = fileProperties.getPropertiesAsMap();
2323
for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it )
2424
{
2525
flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -33,7 +33,7 @@ std::ostream& operator<<( std::ostream& flux, const VideoProperties& videoProper
3333
flux << std::left;
3434
flux << separator << " Video stream " << separator << std::endl;
3535

36-
PropertiesMap properties = videoProperties.getDataMap();
36+
PropertiesMap properties = videoProperties.getPropertiesAsMap();
3737
for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it )
3838
{
3939
flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -47,7 +47,7 @@ std::ostream& operator<<( std::ostream& flux, const AudioProperties& audioProper
4747
flux << std::left;
4848
flux << separator << " Audio stream " << separator << std::endl;
4949

50-
PropertiesMap properties = audioProperties.getDataMap();
50+
PropertiesMap properties = audioProperties.getPropertiesAsMap();
5151
for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it )
5252
{
5353
flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -60,7 +60,7 @@ std::ostream& operator<<( std::ostream& flux, const DataProperties& dataProperti
6060
{
6161
flux << separator << " Data stream " << separator << std::endl;
6262

63-
PropertiesMap properties = dataProperties.getDataMap();
63+
PropertiesMap properties = dataProperties.getPropertiesAsMap();
6464
for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it )
6565
{
6666
flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -73,7 +73,7 @@ std::ostream& operator<<( std::ostream& flux, const SubtitleProperties& subtitle
7373
{
7474
flux << separator << " Subtitle stream " << separator << std::endl;
7575

76-
PropertiesMap properties = subtitleProperties.getDataMap();
76+
PropertiesMap properties = subtitleProperties.getPropertiesAsMap();
7777
for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it )
7878
{
7979
flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -86,7 +86,7 @@ std::ostream& operator<<( std::ostream& flux, const AttachementProperties& attac
8686
{
8787
flux << separator << " Attachement stream " << separator << std::endl;
8888

89-
PropertiesMap properties = attachementProperties.getDataMap();
89+
PropertiesMap properties = attachementProperties.getPropertiesAsMap();
9090
for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it )
9191
{
9292
flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -99,7 +99,7 @@ std::ostream& operator<<( std::ostream& flux, const UnknownProperties& unknownPr
9999
{
100100
flux << separator << " Unknown stream " << separator << std::endl;
101101

102-
PropertiesMap properties = unknownProperties.getDataMap();
102+
PropertiesMap properties = unknownProperties.getPropertiesAsMap();
103103
for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it )
104104
{
105105
flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;

0 commit comments

Comments
 (0)