mediaProperty: can get video and audio properties by a vector or a map

Clement Champetier · Clement Champetier · commit a5ceb7f64751 · 2015-04-01T18:34:19.000+02:00
Fix #141
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -231,4 +231,19 @@ PropertyVector AudioProperties::getPropertiesAsVector() const
 	return data;
 }
 
+PropertyMap AudioProperties::getPropertiesAsMap() const
+{
+	PropertyMap dataMap;
+
+	PropertyVector dataVector( getPropertiesAsVector() );
+	for( PropertyVector::const_iterator it = dataVector.begin();
+			it != dataVector.end();
+			++it )
+	{
+		dataMap.insert( std::make_pair( it->first, it->second ) );
+	}
+
+	return dataMap;
+}
+
 }
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -42,7 +42,8 @@ class AvExport AudioProperties
 	AVCodecContext& getAVCodecContext() { return *_codecContext; }
 #endif
 
-	PropertyVector getPropertiesAsVector() const;  ///< Return all audio properties as a vector (name of property: value)
+	PropertyMap getPropertiesAsMap() const;  ///< Return all audio properties as a map (name of property, value)
+	PropertyVector getPropertiesAsVector() const;  ///< Same data with a specific order
 
 private:
 #ifndef SWIG
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -696,4 +696,19 @@ PropertyVector VideoProperties::getPropertiesAsVector() const
 	return data;
 }
 
+PropertyMap VideoProperties::getPropertiesAsMap() const
+{
+	PropertyMap dataMap;
+
+	PropertyVector dataVector( getPropertiesAsVector() );
+	for( PropertyVector::const_iterator it = dataVector.begin();
+			it != dataVector.end();
+			++it )
+	{
+		dataMap.insert( std::make_pair( it->first, it->second ) );
+	}
+
+	return dataMap;
+}
+
 }
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -83,7 +83,8 @@ class AvExport VideoProperties
 	const PixelProperties& getPixelProperties() const { return _pixelProperties; }
 #endif
 
-	PropertyVector getPropertiesAsVector() const;  ///< Return all video and pixel properties as a vector (name of property: value)
+	PropertyMap getPropertiesAsMap() const;  ///< Return all video and pixel properties as a map (name of property, value)
+	PropertyVector getPropertiesAsVector() const;  ///< Same data with a specific order
 
 private:
 	/**
diff --git a/src/AvTranscoder/mediaProperty/util.hpp b/src/AvTranscoder/mediaProperty/util.hpp
@@ -9,6 +9,7 @@ extern "C" {
 
 #include <vector>
 #include <utility>
+#include <map>
 #include <string>
 #include <sstream>
 
@@ -19,6 +20,7 @@ namespace avtranscoder
  * @brief PropertyVector is a vector of pair, because the order of properties matters to us.
  */
 typedef std::vector< std::pair<std::string, std::string> > PropertyVector;
+typedef std::map< std::string, std::string > PropertyMap;
 
 namespace detail
 {
