AudioVideo: up avtranscoder submodule to v0.5.5

Clement Champetier · Clement Champetier · commit da38b15568e1 · 2015-04-17T11:29:35.000+02:00
diff --git a/plugins/image/io/AudioVideo/avTranscoder b/plugins/image/io/AudioVideo/avTranscoder
@@ -1 +1 @@
-Subproject commit 05389cdbb879199159bfaa5c351c0678314c2d1b
+Subproject commit 469f4d89a2e5498cbf38d035d180b237c815d289
diff --git a/plugins/image/io/AudioVideo/src/reader/AVReaderPlugin.cpp b/plugins/image/io/AudioVideo/src/reader/AVReaderPlugin.cpp
@@ -171,6 +171,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s
 	}
 	else if( paramName == kTuttlePluginFilename )
 	{
+		typedef std::pair<std::string, std::string> PropertyPair;
 		try
 		{
 			ensureVideoIsOpen();
@@ -183,7 +184,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s
 
 			// update wrapper of Metadata tab
 			std::string wrapperValue( "" );
-			BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, inputProperties.getPropertiesAsMap() )
+			BOOST_FOREACH( const PropertyPair& pair, inputProperties.getPropertiesAsVector() )
 			{
 				wrapperValue += pair.first + ": " + pair.second + "\n";
 			}
@@ -198,7 +199,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s
 			BOOST_FOREACH( const avtranscoder::VideoProperties& videoStream, inputProperties.getVideoProperties() )
 			{
 				videoValue += "::::: VIDEO STREAM ::::: \n";
-				BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, videoStream.getPropertiesAsMap() )
+				BOOST_FOREACH( const PropertyPair& pair, videoStream.getPropertiesAsVector() )
 				{
 					videoValue += pair.first + ": " + pair.second + "\n";
 				}
@@ -215,7 +216,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s
 			BOOST_FOREACH( const avtranscoder::AudioProperties& audioStream, inputProperties.getAudioProperties() )
 			{
 				audioValue += "::::: AUDIO STREAM ::::: \n";
-				BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, audioStream.getPropertiesAsMap() )
+				BOOST_FOREACH( const PropertyPair& pair, audioStream.getPropertiesAsVector() )
 				{
 					audioValue += pair.first + ": " + pair.second + "\n";
 				}
@@ -232,7 +233,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s
 			BOOST_FOREACH( const avtranscoder::DataProperties& dataStream, inputProperties.getDataProperties() )
 			{
 				dataValue += "::::: DATA STREAM ::::: \n";
-				BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, dataStream.getPropertiesAsMap() )
+				BOOST_FOREACH( const PropertyPair& pair, dataStream.getPropertiesAsVector() )
 				{
 					dataValue += pair.first + ": " + pair.second + "\n";
 				}
@@ -249,7 +250,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s
 			BOOST_FOREACH( const avtranscoder::SubtitleProperties& subtitleStream, inputProperties.getSubtitleProperties() )
 			{
 				subtitleValue += "::::: SUBTITLE STREAM ::::: \n";
-				BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, subtitleStream.getPropertiesAsMap() )
+				BOOST_FOREACH( const PropertyPair& pair, subtitleStream.getPropertiesAsVector() )
 				{
 					subtitleValue += pair.first + ": " + pair.second + "\n";
 				}
@@ -266,7 +267,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s
 			BOOST_FOREACH( const avtranscoder::AttachementProperties& attachementStream, inputProperties.getAttachementProperties() )
 			{
 				attachementValue += "::::: ATTACHEMENT STREAM ::::: \n";
-				BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, attachementStream.getPropertiesAsMap() )
+				BOOST_FOREACH( const PropertyPair& pair, attachementStream.getPropertiesAsVector() )
 				{
 					attachementValue += pair.first + ": " + pair.second + "\n";
 				}
@@ -283,7 +284,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s
 			BOOST_FOREACH( const avtranscoder::UnknownProperties& unknownStream, inputProperties.getUnknownPropertiesProperties() )
 			{
 				unknownValue += "::::: UNKNOWN STREAM ::::: \n";
-				BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, unknownStream.getPropertiesAsMap() )
+				BOOST_FOREACH( const PropertyPair& pair, unknownStream.getPropertiesAsVector() )
 				{
 					unknownValue += pair.first + ": " + pair.second + "\n";
 				}
diff --git a/plugins/image/io/AudioVideo/src/writer/AVWriterPlugin.hpp b/plugins/image/io/AudioVideo/src/writer/AVWriterPlugin.hpp
@@ -36,7 +36,7 @@ struct AVProcessParams
 	std::string _videoPixelFormatName; /// videoPixelFormat name
 	std::string _audioSampleFormatName; /// audioSampleFormat name
 
-	avtranscoder::PropertiesMap _metadatas;
+	avtranscoder::PropertyVector _metadatas;
 };
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s`
`171`	`171`	`}`
`172`	`172`	`else if( paramName == kTuttlePluginFilename )`
`173`	`173`	`{`
	`174`	`+ typedef std::pair<std::string, std::string> PropertyPair;`
`174`	`175`	`try`
`175`	`176`	`{`
`176`	`177`	`ensureVideoIsOpen();`
`@@ -183,7 +184,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s`
`183`	`184`
`184`	`185`	`// update wrapper of Metadata tab`
`185`	`186`	`std::string wrapperValue( "" );`
`186`		`- BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, inputProperties.getPropertiesAsMap() )`
	`187`	`+ BOOST_FOREACH( const PropertyPair& pair, inputProperties.getPropertiesAsVector() )`
`187`	`188`	`{`
`188`	`189`	`wrapperValue += pair.first + ": " + pair.second + "\n";`
`189`	`190`	`}`
`@@ -198,7 +199,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s`
`198`	`199`	`BOOST_FOREACH( const avtranscoder::VideoProperties& videoStream, inputProperties.getVideoProperties() )`
`199`	`200`	`{`
`200`	`201`	`videoValue += "::::: VIDEO STREAM ::::: \n";`
`201`		`- BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, videoStream.getPropertiesAsMap() )`
	`202`	`+ BOOST_FOREACH( const PropertyPair& pair, videoStream.getPropertiesAsVector() )`
`202`	`203`	`{`
`203`	`204`	`videoValue += pair.first + ": " + pair.second + "\n";`
`204`	`205`	`}`
`@@ -215,7 +216,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s`
`215`	`216`	`BOOST_FOREACH( const avtranscoder::AudioProperties& audioStream, inputProperties.getAudioProperties() )`
`216`	`217`	`{`
`217`	`218`	`audioValue += "::::: AUDIO STREAM ::::: \n";`
`218`		`- BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, audioStream.getPropertiesAsMap() )`
	`219`	`+ BOOST_FOREACH( const PropertyPair& pair, audioStream.getPropertiesAsVector() )`
`219`	`220`	`{`
`220`	`221`	`audioValue += pair.first + ": " + pair.second + "\n";`
`221`	`222`	`}`
`@@ -232,7 +233,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s`
`232`	`233`	`BOOST_FOREACH( const avtranscoder::DataProperties& dataStream, inputProperties.getDataProperties() )`
`233`	`234`	`{`
`234`	`235`	`dataValue += "::::: DATA STREAM ::::: \n";`
`235`		`- BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, dataStream.getPropertiesAsMap() )`
	`236`	`+ BOOST_FOREACH( const PropertyPair& pair, dataStream.getPropertiesAsVector() )`
`236`	`237`	`{`
`237`	`238`	`dataValue += pair.first + ": " + pair.second + "\n";`
`238`	`239`	`}`
`@@ -249,7 +250,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s`
`249`	`250`	`BOOST_FOREACH( const avtranscoder::SubtitleProperties& subtitleStream, inputProperties.getSubtitleProperties() )`
`250`	`251`	`{`
`251`	`252`	`subtitleValue += "::::: SUBTITLE STREAM ::::: \n";`
`252`		`- BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, subtitleStream.getPropertiesAsMap() )`
	`253`	`+ BOOST_FOREACH( const PropertyPair& pair, subtitleStream.getPropertiesAsVector() )`
`253`	`254`	`{`
`254`	`255`	`subtitleValue += pair.first + ": " + pair.second + "\n";`
`255`	`256`	`}`
`@@ -266,7 +267,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s`
`266`	`267`	`BOOST_FOREACH( const avtranscoder::AttachementProperties& attachementStream, inputProperties.getAttachementProperties() )`
`267`	`268`	`{`
`268`	`269`	`attachementValue += "::::: ATTACHEMENT STREAM ::::: \n";`
`269`		`- BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, attachementStream.getPropertiesAsMap() )`
	`270`	`+ BOOST_FOREACH( const PropertyPair& pair, attachementStream.getPropertiesAsVector() )`
`270`	`271`	`{`
`271`	`272`	`attachementValue += pair.first + ": " + pair.second + "\n";`
`272`	`273`	`}`
`@@ -283,7 +284,7 @@ void AVReaderPlugin::changedParam( const OFX::InstanceChangedArgs& args, const s`
`283`	`284`	`BOOST_FOREACH( const avtranscoder::UnknownProperties& unknownStream, inputProperties.getUnknownPropertiesProperties() )`
`284`	`285`	`{`
`285`	`286`	`unknownValue += "::::: UNKNOWN STREAM ::::: \n";`
`286`		`- BOOST_FOREACH( const avtranscoder::PropertiesMap::value_type& pair, unknownStream.getPropertiesAsMap() )`
	`287`	`+ BOOST_FOREACH( const PropertyPair& pair, unknownStream.getPropertiesAsVector() )`
`287`	`288`	`{`
`288`	`289`	`unknownValue += pair.first + ": " + pair.second + "\n";`
`289`	`290`	`}`