MediaMetadatasStructures: add fillMetadataDictionnary

Clement Champetier · Clement Champetier · commit 3d99fa5b3bfd · 2014-08-12T11:03:20.000+02:00
* This functions fills metadata parameter with the given AVDictionary.
* Use it when add metadata of AVFormatContext in InputFile::analyse
function.
diff --git a/src/AvTranscoder/File/InputFile.cpp b/src/AvTranscoder/File/InputFile.cpp
@@ -80,11 +80,7 @@ InputFile& InputFile::analyse( ProgressListener& progress, const EAnalyseLevel l
 	_properties.bitRate = _formatContext->bit_rate;
 	_properties.packetSize = _formatContext->packet_size;
 
-	AVDictionaryEntry *tag = NULL;
-	while( ( tag = av_dict_get( _formatContext->metadata, "", tag, AV_DICT_IGNORE_SUFFIX ) ) )
-	{
-		_properties.metadatas.push_back( std::pair<std::string, std::string>( tag->key, tag->value ) );
-	}
+	detail::fillMetadataDictionnary( _formatContext->metadata, _properties.metadatas );
 
 	for( size_t streamId = 0; streamId < _formatContext->nb_streams; streamId++ )
 	{
diff --git a/src/AvTranscoder/Metadatas/MediaMetadatasStructures.cpp b/src/AvTranscoder/Metadatas/MediaMetadatasStructures.cpp
@@ -1,5 +1,12 @@
 #include "MediaMetadatasStructures.hpp"
 
+extern "C" {
+#ifndef __STDC_CONSTANT_MACROS
+    #define __STDC_CONSTANT_MACROS
+#endif
+#include <libavutil/dict.h>
+}
+
 #include <sstream>
 #include <utility>
 
@@ -28,6 +35,14 @@ void add( MetadatasMap& dataMap, const std::string& key, const bool& value )
 {
 	add( dataMap, key, value ? "True" : "False" );
 }
+
+void fillMetadataDictionnary( AVDictionary* avdictionnary, MetadatasMap& metadata )
+{
+	AVDictionaryEntry* tag = NULL;
+	while( ( tag = av_dict_get( avdictionnary, "", tag, AV_DICT_IGNORE_SUFFIX ) ) )
+	{
+		metadata.push_back( std::pair<std::string, std::string>( tag->key, tag->value ) );
+	}
 }
 
 }
diff --git a/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp b/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp
@@ -15,6 +15,14 @@ namespace avtranscoder
  */
 typedef std::vector< std::pair<std::string, std::string> > MetadatasMap;
 
+namespace detail
+{
+	/**
+	 * @brief Fill metadata parameter with the given AVDictionary.
+     */
+	void fillMetadataDictionnary( AVDictionary* avdictionnary, MetadatasMap& metadata );
+}
+
 struct Channel
 {
 	size_t id;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,12 @@`
`1`	`1`	`#include "MediaMetadatasStructures.hpp"`
`2`	`2`
	`3`	`+extern "C" {`
	`4`	`+#ifndef __STDC_CONSTANT_MACROS`
	`5`	`+ #define __STDC_CONSTANT_MACROS`
	`6`	`+#endif`
	`7`	`+#include <libavutil/dict.h>`
	`8`	`+}`
	`9`	`+`
`3`	`10`	`#include <sstream>`
`4`	`11`	`#include <utility>`
`5`	`12`
`@@ -28,6 +35,14 @@ void add( MetadatasMap& dataMap, const std::string& key, const bool& value )`
`28`	`35`	`{`
`29`	`36`	`add( dataMap, key, value ? "True" : "False" );`
`30`	`37`	`}`
	`38`	`+`
	`39`	`+void fillMetadataDictionnary( AVDictionary* avdictionnary, MetadatasMap& metadata )`
	`40`	`+{`
	`41`	`+ AVDictionaryEntry* tag = NULL;`
	`42`	`+ while( ( tag = av_dict_get( avdictionnary, "", tag, AV_DICT_IGNORE_SUFFIX ) ) )`
	`43`	`+ {`
	`44`	`+ metadata.push_back( std::pair<std::string, std::string>( tag->key, tag->value ) );`
	`45`	`+ }`
`31`	`46`	`}`
`32`	`47`
`33`	`48`	`}`