mediaProperty: rename 'getPropertiesAsVector/Map/Json' methods to 'asVector/Map/Json'

Clement Champetier · Clement Champetier · commit 8c335265790d · 2015-12-03T10:07:13.000+01:00
diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp
@@ -50,7 +50,7 @@ int main( int argc, char** argv )
 
 	// display file properties
 	if( toJson )
-		std::cout << input.getProperties().getPropertiesAsJson() << std::endl;
+		std::cout << input.getProperties().asJson() << std::endl;
 	else
 		std::cout << input;
 }
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -173,12 +173,12 @@ size_t AudioProperties::getTicksPerFrame() const
 	return _codecContext->ticks_per_frame;
 }
 
-PropertyVector AudioProperties::getPropertiesAsVector() const
+PropertyVector AudioProperties::asVector() const
 {
 	PropertyVector data;
 
 	// Add properties of base class
-	PropertyVector basedProperty = StreamProperties::getPropertiesAsVector();
+	PropertyVector basedProperty = StreamProperties::asVector();
 	data.insert( data.begin(), basedProperty.begin(), basedProperty.end() );
 
 	addProperty( data, "codecId", &AudioProperties::getCodecId );
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -33,7 +33,7 @@ class AvExport AudioProperties : public StreamProperties
 	AVCodecContext& getAVCodecContext() { return *_codecContext; }
 #endif
 
-	PropertyVector getPropertiesAsVector() const;
+	PropertyVector asVector() const;
 
 private:
 #ifndef SWIG
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -207,7 +207,7 @@ size_t FileProperties::getNbStreams() const
 	return _avFormatContext->nb_streams;
 }
 
-PropertyVector FileProperties::getPropertiesAsVector() const
+PropertyVector FileProperties::asVector() const
 {
 	PropertyVector data;
 
@@ -236,11 +236,11 @@ PropertyVector FileProperties::getPropertiesAsVector() const
 	return data;
 }
 
-PropertyMap FileProperties::getPropertiesAsMap() const
+PropertyMap FileProperties::asMap() const
 {
 	PropertyMap dataMap;
 
-	PropertyVector dataVector( getPropertiesAsVector() );
+	PropertyVector dataVector( asVector() );
 	for( PropertyVector::const_iterator it = dataVector.begin();
 			it != dataVector.end();
 			++it )
@@ -251,13 +251,13 @@ PropertyMap FileProperties::getPropertiesAsMap() const
 	return dataMap;
 }
 
-std::string FileProperties::getPropertiesAsJson() const
+std::string FileProperties::asJson() const
 {
 	json::JsonObjectStreamWriter writer;
 	{
 		// format
 		json::JsonArrayStreamWriter array;
-		PropertyMap properties = getPropertiesAsMap();
+		PropertyMap properties = asMap();
 		json::JsonObjectStreamWriter format;
 		for(PropertyMap::iterator it = properties.begin(); it != properties.end(); ++it)
 			format << std::make_pair(it->first.c_str(), it->second.c_str());
@@ -269,7 +269,7 @@ std::string FileProperties::getPropertiesAsJson() const
 		json::JsonArrayStreamWriter video;
 		for( std::vector< avtranscoder::VideoProperties >::const_iterator it = _videoStreams.begin(); it != _videoStreams.end(); ++it )
 		{
-			video << it->getPropertiesAsJson();
+			video << it->asJson();
 		}
 		writer << std::make_pair("video", video.build());
 	}
@@ -278,7 +278,7 @@ std::string FileProperties::getPropertiesAsJson() const
 		json::JsonArrayStreamWriter audio;
 		for( std::vector< avtranscoder::AudioProperties >::const_iterator it = _audioStreams.begin(); it != _audioStreams.end(); ++it )
 		{
-			audio << it->getPropertiesAsJson();
+			audio << it->asJson();
 		}
 		writer << std::make_pair("audio", audio.build());
 	}
@@ -287,7 +287,7 @@ std::string FileProperties::getPropertiesAsJson() const
 		json::JsonArrayStreamWriter data;
 		for( std::vector< avtranscoder::DataProperties >::const_iterator it = _dataStreams.begin(); it != _dataStreams.end(); ++it )
 		{
-			data << it->getPropertiesAsJson();
+			data << it->asJson();
 		}
 		writer << std::make_pair("data", data.build());
 	}
@@ -296,7 +296,7 @@ std::string FileProperties::getPropertiesAsJson() const
 		json::JsonArrayStreamWriter subtitle;
 		for( std::vector< avtranscoder::SubtitleProperties >::const_iterator it = _subtitleStreams.begin(); it != _subtitleStreams.end(); ++it )
 		{
-			subtitle << it->getPropertiesAsJson();
+			subtitle << it->asJson();
 		}
 		writer << std::make_pair("subtitle", subtitle.build());
 	}
@@ -305,7 +305,7 @@ std::string FileProperties::getPropertiesAsJson() const
 		json::JsonArrayStreamWriter attachement;
 		for( std::vector< avtranscoder::AttachementProperties >::const_iterator it = _attachementStreams.begin(); it != _attachementStreams.end(); ++it )
 		{
-			attachement << it->getPropertiesAsJson();
+			attachement << it->asJson();
 		}
 		writer << std::make_pair("attachement", attachement.build());
 	}
@@ -314,7 +314,7 @@ std::string FileProperties::getPropertiesAsJson() const
 		json::JsonArrayStreamWriter unknown;
 		for( std::vector< avtranscoder::UnknownProperties >::const_iterator it = _unknownStreams.begin(); it != _unknownStreams.end(); ++it )
 		{
-			unknown << it->getPropertiesAsJson();
+			unknown << it->asJson();
 		}
 		writer << std::make_pair("unknown", unknown.build());
 	}
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -81,9 +81,9 @@ class AvExport FileProperties
 	const AVFormatContext& getAVFormatContext() { return *_avFormatContext; }
 #endif
 
-	std::string getPropertiesAsJson() const;  ///< Return all properties as a json format.
-	PropertyMap getPropertiesAsMap() const;  ///< Return format properties as a map (name of property, value)
-	PropertyVector getPropertiesAsVector() const;  ///< Return format properties as a vector (name of property: value)
+	std::string asJson() const;  ///< Return all properties as a json format.
+	PropertyMap asMap() const;  ///< Return format properties as a map (name of property, value)
+	PropertyVector asVector() const;  ///< Return format properties as a vector (name of property: value)
 
 private:
 #ifndef SWIG
diff --git a/src/AvTranscoder/mediaProperty/PixelProperties.cpp b/src/AvTranscoder/mediaProperty/PixelProperties.cpp
@@ -238,7 +238,7 @@ std::vector<Channel> PixelProperties::getChannels() const
 	return channels;
 }
 
-PropertyVector PixelProperties::getPropertiesAsVector() const
+PropertyVector PixelProperties::asVector() const
 {
 	PropertyVector data;
 
diff --git a/src/AvTranscoder/mediaProperty/PixelProperties.hpp b/src/AvTranscoder/mediaProperty/PixelProperties.hpp
@@ -80,7 +80,7 @@ class AvExport PixelProperties
 	const AVPixFmtDescriptor* getAVPixFmtDescriptor() const { return _pixelDesc; }
 #endif
 
-	PropertyVector getPropertiesAsVector() const;  ///< Return all pixel properties as a vector (name of property: value)
+	PropertyVector asVector() const;  ///< Return all pixel properties as a vector (name of property: value)
 
 private:
 	void init( const AVPixelFormat avPixelFormat );
diff --git a/src/AvTranscoder/mediaProperty/StreamProperties.cpp b/src/AvTranscoder/mediaProperty/StreamProperties.cpp
@@ -47,7 +47,7 @@ AVMediaType StreamProperties::getStreamType() const
 	return _formatContext->streams[_streamIndex]->codec->codec_type;
 }
 
-PropertyVector StreamProperties::getPropertiesAsVector() const
+PropertyVector StreamProperties::asVector() const
 {
 	PropertyVector data;
 
@@ -64,11 +64,11 @@ PropertyVector StreamProperties::getPropertiesAsVector() const
 	return data;
 }
 
-PropertyMap StreamProperties::getPropertiesAsMap() const
+PropertyMap StreamProperties::asMap() const
 {
 	PropertyMap dataMap;
 
-	PropertyVector dataVector( getPropertiesAsVector() );
+	PropertyVector dataVector( asVector() );
 	for( PropertyVector::const_iterator it = dataVector.begin();
 			it != dataVector.end();
 			++it )
@@ -79,10 +79,10 @@ PropertyMap StreamProperties::getPropertiesAsMap() const
 	return dataMap;
 }
 
-std::string StreamProperties::getPropertiesAsJson() const
+std::string StreamProperties::asJson() const
 {
 	json::JsonObjectStreamWriter writer;
-	PropertyMap properties = getPropertiesAsMap();
+	PropertyMap properties = asMap();
 	for(PropertyMap::iterator it = properties.begin(); it != properties.end(); ++it)
 		writer << std::make_pair(it->first.c_str(), it->second.c_str());
 	return writer.build();
diff --git a/src/AvTranscoder/mediaProperty/StreamProperties.hpp b/src/AvTranscoder/mediaProperty/StreamProperties.hpp
@@ -26,9 +26,9 @@ class AvExport StreamProperties
 	const AVFormatContext& getAVFormatContext() const { return *_formatContext; }
 #endif
 
-	std::string getPropertiesAsJson() const;  ///< Return all properties as a json format.
-	PropertyMap getPropertiesAsMap() const;  ///< Return all properties as a map (name of property, value)
-	virtual PropertyVector getPropertiesAsVector() const;  ///< Same data with a specific order
+	std::string asJson() const;  ///< Return all properties as a json format.
+	PropertyMap asMap() const;  ///< Return all properties as a map (name of property, value)
+	virtual PropertyVector asVector() const;  ///< Same data with a specific order
 
 private:
 #ifndef SWIG
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -598,12 +598,12 @@ void VideoProperties::analyseGopStructure( IProgress& progress )
 	}
 }
 
-PropertyVector VideoProperties::getPropertiesAsVector() const
+PropertyVector VideoProperties::asVector() const
 {
 	PropertyVector data;
 
 	// Add properties of base class
-	PropertyVector basedProperty = StreamProperties::getPropertiesAsVector();
+	PropertyVector basedProperty = StreamProperties::asVector();
 	data.insert( data.begin(), basedProperty.begin(), basedProperty.end() );
 
 	addProperty( data, "codecId", &VideoProperties::getCodecId );
@@ -647,7 +647,7 @@ PropertyVector VideoProperties::getPropertiesAsVector() const
 	addProperty( data, "referencesFrames", &VideoProperties::getReferencesFrames );
 
 	// Add properties of the pixel
-	PropertyVector pixelProperties = _pixelProperties.getPropertiesAsVector();
+	PropertyVector pixelProperties = _pixelProperties.asVector();
 	data.insert( data.end(), pixelProperties.begin(), pixelProperties.end() );
 
 	return data;
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -81,7 +81,7 @@ class AvExport VideoProperties : public StreamProperties
 	const PixelProperties& getPixelProperties() const { return _pixelProperties; }
 #endif
 
-	PropertyVector getPropertiesAsVector() const;
+	PropertyVector asVector() const;
 
 private:
 	/**
diff --git a/src/AvTranscoder/mediaProperty/print.cpp b/src/AvTranscoder/mediaProperty/print.cpp
@@ -15,7 +15,7 @@ std::ostream& operator<<( std::ostream& flux, const FileProperties& fileProperti
 	flux << std::left;
 	flux << separator << " Wrapper " << separator << std::endl;
 
-	PropertyVector properties = fileProperties.getPropertiesAsVector();
+	PropertyVector properties = fileProperties.asVector();
 	for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -29,7 +29,7 @@ std::ostream& operator<<( std::ostream& flux, const StreamProperties& streamProp
 	flux << std::left;
 	flux << separator << " Stream " << separator << std::endl;
 
-	PropertyVector properties = streamProperties.getPropertiesAsVector();
+	PropertyVector properties = streamProperties.asVector();
 	for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -43,7 +43,7 @@ std::ostream& operator<<( std::ostream& flux, const VideoProperties& videoProper
 	flux << std::left;
 	flux << separator << " Video stream " << separator << std::endl;
 
-	PropertyVector properties = videoProperties.getPropertiesAsVector();
+	PropertyVector properties = videoProperties.asVector();
 	for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -57,7 +57,7 @@ std::ostream& operator<<( std::ostream& flux, const AudioProperties& audioProper
 	flux << std::left;
 	flux << separator << " Audio stream " << separator << std::endl;
 
-	PropertyVector properties = audioProperties.getPropertiesAsVector();
+	PropertyVector properties = audioProperties.asVector();
 	for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -70,7 +70,7 @@ std::ostream& operator<<( std::ostream& flux, const DataProperties& dataProperti
 {
 	flux << separator << " Data stream " << separator << std::endl;
 
-	PropertyVector properties = dataProperties.getPropertiesAsVector();
+	PropertyVector properties = dataProperties.asVector();
 	for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -83,7 +83,7 @@ std::ostream& operator<<( std::ostream& flux, const SubtitleProperties& subtitle
 {
 	flux << separator << " Subtitle stream " << separator << std::endl;
 
-	PropertyVector properties = subtitleProperties.getPropertiesAsVector();
+	PropertyVector properties = subtitleProperties.asVector();
 	for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -96,7 +96,7 @@ std::ostream& operator<<( std::ostream& flux, const AttachementProperties& attac
 {
 	flux << separator << " Attachement stream " << separator << std::endl;
 
-	PropertyVector properties = attachementProperties.getPropertiesAsVector();
+	PropertyVector properties = attachementProperties.asVector();
 	for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
@@ -109,7 +109,7 @@ std::ostream& operator<<( std::ostream& flux, const UnknownProperties& unknownPr
 {
 	flux << separator << " Unknown stream " << separator << std::endl;
 
-	PropertyVector properties = unknownProperties.getPropertiesAsVector();
+	PropertyVector properties = unknownProperties.asVector();
 	for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
diff --git a/test/pyTest/testProperties.py b/test/pyTest/testProperties.py
@@ -139,6 +139,6 @@ def testCheckFilePropertiesAsJson():
 
     import json
     # throw exception if it is not a valid JSON
-    json.loads(inputFile.getProperties().getPropertiesAsJson())
+    json.loads(inputFile.getProperties().asJson())
 
 
diff --git a/test/pyTest/testTranscoderRewrap.py b/test/pyTest/testTranscoderRewrap.py
@@ -31,8 +31,8 @@ def checkStream(src_stream, dst_stream):
     """
     Check the values of the given streams properties.
     """
-    src_propertiesMap = src_stream.getPropertiesAsMap()
-    dst_propertiesMap = dst_stream.getPropertiesAsMap()
+    src_propertiesMap = src_stream.asMap()
+    dst_propertiesMap = dst_stream.asMap()
     for key in dst_propertiesMap:
         # skip metadata of stream
         if key in [x[0] for x in src_stream.getMetadatas()]:

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ int main( int argc, char** argv )`
`50`	`50`
`51`	`51`	`// display file properties`
`52`	`52`	`if( toJson )`
`53`		`- std::cout << input.getProperties().getPropertiesAsJson() << std::endl;`
	`53`	`+ std::cout << input.getProperties().asJson() << std::endl;`
`54`	`54`	`else`
`55`	`55`	`std::cout << input;`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,12 +173,12 @@ size_t AudioProperties::getTicksPerFrame() const`
`173`	`173`	`return _codecContext->ticks_per_frame;`
`174`	`174`	`}`
`175`	`175`
`176`		`-PropertyVector AudioProperties::getPropertiesAsVector() const`
	`176`	`+PropertyVector AudioProperties::asVector() const`
`177`	`177`	`{`
`178`	`178`	`PropertyVector data;`
`179`	`179`
`180`	`180`	`// Add properties of base class`
`181`		`- PropertyVector basedProperty = StreamProperties::getPropertiesAsVector();`
	`181`	`+ PropertyVector basedProperty = StreamProperties::asVector();`
`182`	`182`	`data.insert( data.begin(), basedProperty.begin(), basedProperty.end() );`
`183`	`183`
`184`	`184`	`addProperty( data, "codecId", &AudioProperties::getCodecId );`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ size_t FileProperties::getNbStreams() const`
`207`	`207`	`return _avFormatContext->nb_streams;`
`208`	`208`	`}`
`209`	`209`
`210`		`-PropertyVector FileProperties::getPropertiesAsVector() const`
	`210`	`+PropertyVector FileProperties::asVector() const`
`211`	`211`	`{`
`212`	`212`	`PropertyVector data;`
`213`	`213`
`@@ -236,11 +236,11 @@ PropertyVector FileProperties::getPropertiesAsVector() const`
`236`	`236`	`return data;`
`237`	`237`	`}`
`238`	`238`
`239`		`-PropertyMap FileProperties::getPropertiesAsMap() const`
	`239`	`+PropertyMap FileProperties::asMap() const`
`240`	`240`	`{`
`241`	`241`	`PropertyMap dataMap;`
`242`	`242`
`243`		`- PropertyVector dataVector( getPropertiesAsVector() );`
	`243`	`+ PropertyVector dataVector( asVector() );`
`244`	`244`	`for( PropertyVector::const_iterator it = dataVector.begin();`
`245`	`245`	`it != dataVector.end();`
`246`	`246`	`++it )`
`@@ -251,13 +251,13 @@ PropertyMap FileProperties::getPropertiesAsMap() const`
`251`	`251`	`return dataMap;`
`252`	`252`	`}`
`253`	`253`
`254`		`-std::string FileProperties::getPropertiesAsJson() const`
	`254`	`+std::string FileProperties::asJson() const`
`255`	`255`	`{`
`256`	`256`	`json::JsonObjectStreamWriter writer;`
`257`	`257`	`{`
`258`	`258`	`// format`
`259`	`259`	`json::JsonArrayStreamWriter array;`
`260`		`- PropertyMap properties = getPropertiesAsMap();`
	`260`	`+ PropertyMap properties = asMap();`
`261`	`261`	`json::JsonObjectStreamWriter format;`
`262`	`262`	`for(PropertyMap::iterator it = properties.begin(); it != properties.end(); ++it)`
`263`	`263`	`format << std::make_pair(it->first.c_str(), it->second.c_str());`
`@@ -269,7 +269,7 @@ std::string FileProperties::getPropertiesAsJson() const`
`269`	`269`	`json::JsonArrayStreamWriter video;`
`270`	`270`	`for( std::vector< avtranscoder::VideoProperties >::const_iterator it = _videoStreams.begin(); it != _videoStreams.end(); ++it )`
`271`	`271`	`{`
`272`		`- video << it->getPropertiesAsJson();`
	`272`	`+ video << it->asJson();`
`273`	`273`	`}`
`274`	`274`	`writer << std::make_pair("video", video.build());`
`275`	`275`	`}`
`@@ -278,7 +278,7 @@ std::string FileProperties::getPropertiesAsJson() const`
`278`	`278`	`json::JsonArrayStreamWriter audio;`
`279`	`279`	`for( std::vector< avtranscoder::AudioProperties >::const_iterator it = _audioStreams.begin(); it != _audioStreams.end(); ++it )`
`280`	`280`	`{`
`281`		`- audio << it->getPropertiesAsJson();`
	`281`	`+ audio << it->asJson();`
`282`	`282`	`}`
`283`	`283`	`writer << std::make_pair("audio", audio.build());`
`284`	`284`	`}`
`@@ -287,7 +287,7 @@ std::string FileProperties::getPropertiesAsJson() const`
`287`	`287`	`json::JsonArrayStreamWriter data;`
`288`	`288`	`for( std::vector< avtranscoder::DataProperties >::const_iterator it = _dataStreams.begin(); it != _dataStreams.end(); ++it )`
`289`	`289`	`{`
`290`		`- data << it->getPropertiesAsJson();`
	`290`	`+ data << it->asJson();`
`291`	`291`	`}`
`292`	`292`	`writer << std::make_pair("data", data.build());`
`293`	`293`	`}`
`@@ -296,7 +296,7 @@ std::string FileProperties::getPropertiesAsJson() const`
`296`	`296`	`json::JsonArrayStreamWriter subtitle;`
`297`	`297`	`for( std::vector< avtranscoder::SubtitleProperties >::const_iterator it = _subtitleStreams.begin(); it != _subtitleStreams.end(); ++it )`
`298`	`298`	`{`
`299`		`- subtitle << it->getPropertiesAsJson();`
	`299`	`+ subtitle << it->asJson();`
`300`	`300`	`}`
`301`	`301`	`writer << std::make_pair("subtitle", subtitle.build());`
`302`	`302`	`}`
`@@ -305,7 +305,7 @@ std::string FileProperties::getPropertiesAsJson() const`
`305`	`305`	`json::JsonArrayStreamWriter attachement;`
`306`	`306`	`for( std::vector< avtranscoder::AttachementProperties >::const_iterator it = _attachementStreams.begin(); it != _attachementStreams.end(); ++it )`
`307`	`307`	`{`
`308`		`- attachement << it->getPropertiesAsJson();`
	`308`	`+ attachement << it->asJson();`
`309`	`309`	`}`
`310`	`310`	`writer << std::make_pair("attachement", attachement.build());`
`311`	`311`	`}`
`@@ -314,7 +314,7 @@ std::string FileProperties::getPropertiesAsJson() const`
`314`	`314`	`json::JsonArrayStreamWriter unknown;`
`315`	`315`	`for( std::vector< avtranscoder::UnknownProperties >::const_iterator it = _unknownStreams.begin(); it != _unknownStreams.end(); ++it )`
`316`	`316`	`{`
`317`		`- unknown << it->getPropertiesAsJson();`
	`317`	`+ unknown << it->asJson();`
`318`	`318`	`}`
`319`	`319`	`writer << std::make_pair("unknown", unknown.build());`
`320`	`320`	`}`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ std::vector<Channel> PixelProperties::getChannels() const`
`238`	`238`	`return channels;`
`239`	`239`	`}`
`240`	`240`
`241`		`-PropertyVector PixelProperties::getPropertiesAsVector() const`
	`241`	`+PropertyVector PixelProperties::asVector() const`
`242`	`242`	`{`
`243`	`243`	`PropertyVector data;`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ AVMediaType StreamProperties::getStreamType() const`
`47`	`47`	`return _formatContext->streams[_streamIndex]->codec->codec_type;`
`48`	`48`	`}`
`49`	`49`
`50`		`-PropertyVector StreamProperties::getPropertiesAsVector() const`
	`50`	`+PropertyVector StreamProperties::asVector() const`
`51`	`51`	`{`
`52`	`52`	`PropertyVector data;`
`53`	`53`
`@@ -64,11 +64,11 @@ PropertyVector StreamProperties::getPropertiesAsVector() const`
`64`	`64`	`return data;`
`65`	`65`	`}`
`66`	`66`
`67`		`-PropertyMap StreamProperties::getPropertiesAsMap() const`
	`67`	`+PropertyMap StreamProperties::asMap() const`
`68`	`68`	`{`
`69`	`69`	`PropertyMap dataMap;`
`70`	`70`
`71`		`- PropertyVector dataVector( getPropertiesAsVector() );`
	`71`	`+ PropertyVector dataVector( asVector() );`
`72`	`72`	`for( PropertyVector::const_iterator it = dataVector.begin();`
`73`	`73`	`it != dataVector.end();`
`74`	`74`	`++it )`
`@@ -79,10 +79,10 @@ PropertyMap StreamProperties::getPropertiesAsMap() const`
`79`	`79`	`return dataMap;`
`80`	`80`	`}`
`81`	`81`
`82`		`-std::string StreamProperties::getPropertiesAsJson() const`
	`82`	`+std::string StreamProperties::asJson() const`
`83`	`83`	`{`
`84`	`84`	`json::JsonObjectStreamWriter writer;`
`85`		`- PropertyMap properties = getPropertiesAsMap();`
	`85`	`+ PropertyMap properties = asMap();`
`86`	`86`	`for(PropertyMap::iterator it = properties.begin(); it != properties.end(); ++it)`
`87`	`87`	`writer << std::make_pair(it->first.c_str(), it->second.c_str());`
`88`	`88`	`return writer.build();`
Original file line number	Diff line number	Diff line change
`@@ -598,12 +598,12 @@ void VideoProperties::analyseGopStructure( IProgress& progress )`
`598`	`598`	`}`
`599`	`599`	`}`
`600`	`600`
`601`		`-PropertyVector VideoProperties::getPropertiesAsVector() const`
	`601`	`+PropertyVector VideoProperties::asVector() const`
`602`	`602`	`{`
`603`	`603`	`PropertyVector data;`
`604`	`604`
`605`	`605`	`// Add properties of base class`
`606`		`- PropertyVector basedProperty = StreamProperties::getPropertiesAsVector();`
	`606`	`+ PropertyVector basedProperty = StreamProperties::asVector();`
`607`	`607`	`data.insert( data.begin(), basedProperty.begin(), basedProperty.end() );`
`608`	`608`
`609`	`609`	`addProperty( data, "codecId", &VideoProperties::getCodecId );`
`@@ -647,7 +647,7 @@ PropertyVector VideoProperties::getPropertiesAsVector() const`
`647`	`647`	`addProperty( data, "referencesFrames", &VideoProperties::getReferencesFrames );`
`648`	`648`
`649`	`649`	`// Add properties of the pixel`
`650`		`- PropertyVector pixelProperties = _pixelProperties.getPropertiesAsVector();`
	`650`	`+ PropertyVector pixelProperties = _pixelProperties.asVector();`
`651`	`651`	`data.insert( data.end(), pixelProperties.begin(), pixelProperties.end() );`
`652`	`652`
`653`	`653`	`return data;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ std::ostream& operator<<( std::ostream& flux, const FileProperties& fileProperti`
`15`	`15`	`flux << std::left;`
`16`	`16`	`flux << separator << " Wrapper " << separator << std::endl;`
`17`	`17`
`18`		`- PropertyVector properties = fileProperties.getPropertiesAsVector();`
	`18`	`+ PropertyVector properties = fileProperties.asVector();`
`19`	`19`	`for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )`
`20`	`20`	`{`
`21`	`21`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`@@ -29,7 +29,7 @@ std::ostream& operator<<( std::ostream& flux, const StreamProperties& streamProp`
`29`	`29`	`flux << std::left;`
`30`	`30`	`flux << separator << " Stream " << separator << std::endl;`
`31`	`31`
`32`		`- PropertyVector properties = streamProperties.getPropertiesAsVector();`
	`32`	`+ PropertyVector properties = streamProperties.asVector();`
`33`	`33`	`for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )`
`34`	`34`	`{`
`35`	`35`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`@@ -43,7 +43,7 @@ std::ostream& operator<<( std::ostream& flux, const VideoProperties& videoProper`
`43`	`43`	`flux << std::left;`
`44`	`44`	`flux << separator << " Video stream " << separator << std::endl;`
`45`	`45`
`46`		`- PropertyVector properties = videoProperties.getPropertiesAsVector();`
	`46`	`+ PropertyVector properties = videoProperties.asVector();`
`47`	`47`	`for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )`
`48`	`48`	`{`
`49`	`49`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`@@ -57,7 +57,7 @@ std::ostream& operator<<( std::ostream& flux, const AudioProperties& audioProper`
`57`	`57`	`flux << std::left;`
`58`	`58`	`flux << separator << " Audio stream " << separator << std::endl;`
`59`	`59`
`60`		`- PropertyVector properties = audioProperties.getPropertiesAsVector();`
	`60`	`+ PropertyVector properties = audioProperties.asVector();`
`61`	`61`	`for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )`
`62`	`62`	`{`
`63`	`63`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`@@ -70,7 +70,7 @@ std::ostream& operator<<( std::ostream& flux, const DataProperties& dataProperti`
`70`	`70`	`{`
`71`	`71`	`flux << separator << " Data stream " << separator << std::endl;`
`72`	`72`
`73`		`- PropertyVector properties = dataProperties.getPropertiesAsVector();`
	`73`	`+ PropertyVector properties = dataProperties.asVector();`
`74`	`74`	`for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )`
`75`	`75`	`{`
`76`	`76`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`@@ -83,7 +83,7 @@ std::ostream& operator<<( std::ostream& flux, const SubtitleProperties& subtitle`
`83`	`83`	`{`
`84`	`84`	`flux << separator << " Subtitle stream " << separator << std::endl;`
`85`	`85`
`86`		`- PropertyVector properties = subtitleProperties.getPropertiesAsVector();`
	`86`	`+ PropertyVector properties = subtitleProperties.asVector();`
`87`	`87`	`for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )`
`88`	`88`	`{`
`89`	`89`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`@@ -96,7 +96,7 @@ std::ostream& operator<<( std::ostream& flux, const AttachementProperties& attac`
`96`	`96`	`{`
`97`	`97`	`flux << separator << " Attachement stream " << separator << std::endl;`
`98`	`98`
`99`		`- PropertyVector properties = attachementProperties.getPropertiesAsVector();`
	`99`	`+ PropertyVector properties = attachementProperties.asVector();`
`100`	`100`	`for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )`
`101`	`101`	`{`
`102`	`102`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`@@ -109,7 +109,7 @@ std::ostream& operator<<( std::ostream& flux, const UnknownProperties& unknownPr`
`109`	`109`	`{`
`110`	`110`	`flux << separator << " Unknown stream " << separator << std::endl;`
`111`	`111`
`112`		`- PropertyVector properties = unknownProperties.getPropertiesAsVector();`
	`112`	`+ PropertyVector properties = unknownProperties.asVector();`
`113`	`113`	`for( PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it )`
`114`	`114`	`{`
`115`	`115`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`