Skip to content

Commit 8d48d71

Browse files
author
Clement Champetier
committed
mediaProperty: rename type MetadatasMap to PropertiesMap
This type is not only used for metadatas, so the new name avoid confusion.
1 parent ec7852c commit 8d48d71

20 files changed

+67
-67
lines changed

‎src/AvTranscoder/file/OutputFile.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ bool OutputFile::endWrap( )
216216
return true;
217217
}
218218

219-
void OutputFile::addMetadata( const MetadatasMap& dataMap )
219+
void OutputFile::addMetadata( const PropertiesMap& dataMap )
220220
{
221-
for( MetadatasMap::const_iterator it = dataMap.begin(); it != dataMap.end(); ++it )
221+
for( PropertiesMap::const_iterator it = dataMap.begin(); it != dataMap.end(); ++it )
222222
{
223223
addMetadata( it->first, it->second );
224224
}

‎src/AvTranscoder/file/OutputFile.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class AvExport OutputFile
104104
* @brief Add metadata to the output file.
105105
* @note Depending on the format, you are not sure to find your metadata after the transcode.
106106
*/
107-
virtual void addMetadata( const MetadatasMap& dataMap );
107+
virtual void addMetadata( const PropertiesMap& dataMap );
108108
virtual void addMetadata( const std::string& key, const std::string& value );
109109

110110
virtual void setVerbose( bool verbose = false ){ _verbose = verbose; }

‎src/AvTranscoder/mediaProperty/AttachementProperties.cpp

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

14-
MetadatasMap AttachementProperties::getDataMap() const
14+
PropertiesMap AttachementProperties::getDataMap() const
1515
{
16-
MetadatasMap dataMap;
16+
PropertiesMap dataMap;
1717

1818
detail::add( dataMap, "streamId", _streamId );
1919

‎src/AvTranscoder/mediaProperty/AttachementProperties.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ class AvExport AttachementProperties
1717
AttachementProperties( const AVFormatContext* formatContext, const size_t index );
1818

1919
size_t getStreamId() const { return _streamId; }
20-
MetadatasMap& getMetadatas() { return _metadatas; }
20+
PropertiesMap& getMetadatas() { return _metadatas; }
2121

2222
#ifndef SWIG
2323
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
2424
#endif
2525

26-
MetadatasMap getDataMap() const;
26+
PropertiesMap getDataMap() const;
2727

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

3131
size_t _streamId;
32-
MetadatasMap _metadatas;
32+
PropertiesMap _metadatas;
3333
};
3434

3535
}

‎src/AvTranscoder/mediaProperty/AudioProperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ size_t AudioProperties::getBitRate() const
154154
return _codecContext->bit_rate;
155155
}
156156

157-
MetadatasMap AudioProperties::getDataMap() const
157+
PropertiesMap AudioProperties::getDataMap() const
158158
{
159-
MetadatasMap dataMap;
159+
PropertiesMap dataMap;
160160

161161
detail::add( dataMap, "streamId", getStreamId() );
162162
detail::add( dataMap, "codecId", getCodecId() );

‎src/AvTranscoder/mediaProperty/AudioProperties.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ class AvExport AudioProperties
3333
size_t getSampleRate() const;
3434
size_t getChannels() const;
3535
size_t getBitRate() const;
36-
MetadatasMap& getMetadatas() { return _metadatas; }
36+
PropertiesMap& getMetadatas() { return _metadatas; }
3737

3838
#ifndef SWIG
3939
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
4040
AVCodecContext& getAVCodecContext() { return *_codecContext; }
4141
#endif
4242

43-
MetadatasMap getDataMap() const;
43+
PropertiesMap getDataMap() const;
4444

4545
private:
4646
const AVFormatContext* _formatContext; ///< Has link (no ownership)
4747
AVCodecContext* _codecContext; ///< Has link (no ownership)
4848
AVCodec* _codec; ///< Has link (no ownership)
4949

5050
size_t _streamId;
51-
MetadatasMap _metadatas;
51+
PropertiesMap _metadatas;
5252
};
5353

5454
}

‎src/AvTranscoder/mediaProperty/DataProperties.cpp

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

25-
MetadatasMap DataProperties::getDataMap() const
25+
PropertiesMap DataProperties::getDataMap() const
2626
{
27-
MetadatasMap dataMap;
27+
PropertiesMap dataMap;
2828

2929
detail::add( dataMap, "streamId", _streamId );
3030

‎src/AvTranscoder/mediaProperty/DataProperties.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ class AvExport DataProperties
1717
DataProperties( const AVFormatContext* formatContext, const size_t index );
1818

1919
size_t getStreamId() const { return _streamId; }
20-
MetadatasMap& getMetadatas() { return _metadatas; }
20+
PropertiesMap& getMetadatas() { return _metadatas; }
2121

2222
#ifndef SWIG
2323
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
2424
#endif
2525

26-
MetadatasMap getDataMap() const;
26+
PropertiesMap getDataMap() const;
2727

2828
private:
2929
void detectAncillaryData();
@@ -32,7 +32,7 @@ class AvExport DataProperties
3232
const AVFormatContext* _formatContext; ///< Has link (no ownership)
3333

3434
size_t _streamId;
35-
MetadatasMap _metadatas;
35+
PropertiesMap _metadatas;
3636
};
3737

3838
}

‎src/AvTranscoder/mediaProperty/FileProperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ size_t FileProperties::getNbStreams() const
8181
return _formatContext->nb_streams;
8282
}
8383

84-
MetadatasMap FileProperties::getDataMap() const
84+
PropertiesMap FileProperties::getDataMap() const
8585
{
86-
MetadatasMap dataMap;
86+
PropertiesMap dataMap;
8787

8888
detail::add( dataMap, "filename", getFilename() );
8989
detail::add( dataMap, "formatName", getFormatName() );

‎src/AvTranscoder/mediaProperty/FileProperties.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class AvExport FileProperties
3535
size_t getBitRate() const;
3636
size_t getPacketSize() const;
3737

38-
MetadatasMap& getMetadatas() { return _metadatas; }
38+
PropertiesMap& getMetadatas() { return _metadatas; }
3939

4040
size_t getNbStreams() const;
4141
size_t getNbVideoStreams() const { return _videoStreams.size(); }
@@ -62,7 +62,7 @@ class AvExport FileProperties
6262
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
6363
#endif
6464

65-
MetadatasMap getDataMap() const;
65+
PropertiesMap getDataMap() const;
6666

6767
private:
6868
const AVFormatContext* _formatContext; ///< Has link (no ownership)
@@ -74,7 +74,7 @@ class AvExport FileProperties
7474
std::vector< AttachementProperties > _attachementStreams; ///< Array of properties per attachement stream
7575
std::vector< UnknownProperties > _unknownStreams; ///< Array of properties per unknown stream
7676

77-
MetadatasMap _metadatas;
77+
PropertiesMap _metadatas;
7878
};
7979

8080
}

‎src/AvTranscoder/mediaProperty/SubtitleProperties.cpp

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

14-
MetadatasMap SubtitleProperties::getDataMap() const
14+
PropertiesMap SubtitleProperties::getDataMap() const
1515
{
16-
MetadatasMap dataMap;
16+
PropertiesMap dataMap;
1717

1818
detail::add( dataMap, "streamId", _streamId );
1919

‎src/AvTranscoder/mediaProperty/SubtitleProperties.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ class AvExport SubtitleProperties
1717
SubtitleProperties( const AVFormatContext* formatContext, const size_t index );
1818

1919
size_t getStreamId() const { return _streamId; }
20-
MetadatasMap& getMetadatas() { return _metadatas; }
20+
PropertiesMap& getMetadatas() { return _metadatas; }
2121

2222
#ifndef SWIG
2323
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
2424
#endif
2525

26-
MetadatasMap getDataMap() const;
26+
PropertiesMap getDataMap() const;
2727

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

3131
size_t _streamId;
32-
MetadatasMap _metadatas;
32+
PropertiesMap _metadatas;
3333
};
3434

3535
}

‎src/AvTranscoder/mediaProperty/UnknownProperties.cpp

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

14-
MetadatasMap UnknownProperties::getDataMap() const
14+
PropertiesMap UnknownProperties::getDataMap() const
1515
{
16-
MetadatasMap dataMap;
16+
PropertiesMap dataMap;
1717

1818
detail::add( dataMap, "streamId", _streamId );
1919

‎src/AvTranscoder/mediaProperty/UnknownProperties.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ class AvExport UnknownProperties
1717
UnknownProperties( const AVFormatContext* formatContext, const size_t index );
1818

1919
size_t getStreamId() const { return _streamId; }
20-
MetadatasMap& getMetadatas() { return _metadatas; }
20+
PropertiesMap& getMetadatas() { return _metadatas; }
2121

2222
#ifndef SWIG
2323
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
2424
#endif
2525

26-
MetadatasMap getDataMap() const;
26+
PropertiesMap getDataMap() const;
2727

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

3131
size_t _streamId;
32-
MetadatasMap _metadatas;
32+
PropertiesMap _metadatas;
3333
};
3434

3535
}

‎src/AvTranscoder/mediaProperty/VideoProperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,9 +648,9 @@ std::vector<Channel> VideoProperties::getChannels() const
648648
return channels;
649649
}
650650

651-
MetadatasMap VideoProperties::getDataMap() const
651+
PropertiesMap VideoProperties::getDataMap() const
652652
{
653-
MetadatasMap dataMap;
653+
PropertiesMap dataMap;
654654

655655
detail::add( dataMap, "streamId", getStreamId() );
656656
detail::add( dataMap, "codecId", getCodecId() );

‎src/AvTranscoder/mediaProperty/VideoProperties.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ class AvExport VideoProperties
9191

9292
std::vector<Channel> getChannels() const;
9393

94-
MetadatasMap& getMetadatas() { return _metadatas; }
94+
PropertiesMap& getMetadatas() { return _metadatas; }
9595

9696
#ifndef SWIG
9797
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
9898
AVCodecContext& getAVCodecContext() { return *_codecContext; }
9999
const AVPixFmtDescriptor& getAVPixFmtDescriptor() { return *_pixFmt; }
100100
#endif
101101

102-
MetadatasMap getDataMap() const;
102+
PropertiesMap getDataMap() const;
103103

104104
private:
105105
/**
@@ -121,7 +121,7 @@ class AvExport VideoProperties
121121
bool _isTopFieldFirst;
122122
std::vector< std::pair< char, bool > > _gopStructure;
123123
//@}
124-
MetadatasMap _metadatas;
124+
PropertiesMap _metadatas;
125125
};
126126

127127
}

‎src/AvTranscoder/mediaProperty/mediaProperty.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ namespace std {
3434
%template(AttachementVector) vector< avtranscoder::AttachementProperties >;
3535
%template(UnknownVector) vector< avtranscoder::UnknownProperties >;
3636

37-
%template(MetadataPair) pair< string, string >;
38-
%template(MetadatasVector) vector< pair< string, string > >;
37+
%template(PropertyPair) pair< string, string >;
38+
%template(PropertyVector) vector< pair< string, string > >;
3939

4040
%template(GopPair) pair< char, bool >;
4141
%template(GopVector) vector< pair< char, bool > >;

‎src/AvTranscoder/mediaProperty/print.hpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ namespace avtranscoder
1414
static const size_t keyWidth = 32;
1515
static const std::string separator = "====================";
1616

17-
std::ostream& operator<<( std::ostream& flux, const FileProperties& properties )
17+
std::ostream& operator<<( std::ostream& flux, const FileProperties& fileProperties )
1818
{
1919
flux << std::left;
2020
flux << separator << " Wrapper " << separator << std::endl;
2121

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

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

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

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

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

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

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

‎src/AvTranscoder/mediaProperty/util.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ namespace detail
1111
{
1212

1313
template<>
14-
void add( MetadatasMap& dataMap, const std::string& key, const std::string& value )
14+
void add( PropertiesMap& propertiesMap, const std::string& key, const std::string& value )
1515
{
16-
dataMap.push_back( std::make_pair( key, value ) );
16+
propertiesMap.push_back( std::make_pair( key, value ) );
1717
}
1818

1919
template<>
20-
void add( MetadatasMap& dataMap, const std::string& key, const bool& value )
20+
void add( PropertiesMap& propertiesMap, const std::string& key, const bool& value )
2121
{
22-
add( dataMap, key, value ? "True" : "False" );
22+
add( propertiesMap, key, value ? "True" : "False" );
2323
}
2424

25-
void fillMetadataDictionnary( AVDictionary* avdictionnary, MetadatasMap& metadata )
25+
void fillMetadataDictionnary( AVDictionary* avdictionnary, PropertiesMap& metadata )
2626
{
2727
AVDictionaryEntry* tag = NULL;
2828
while( ( tag = av_dict_get( avdictionnary, "", tag, AV_DICT_IGNORE_SUFFIX ) ) )

0 commit comments

Comments
 (0)