MediaMetadatasStructures: add metadata for each stream

Clement Champetier · Clement Champetier · commit e3518165f357 · 2014-08-12T11:20:28.000+02:00
* All type of stream can have metadata!
* Fill these data when add metadata of AVFormatContext of the stream in
InputFile::analyse function.
* Get these data with getDataMap function corresponding to the structure
you want.
diff --git a/src/AvTranscoder/File/InputFile.cpp b/src/AvTranscoder/File/InputFile.cpp
@@ -89,31 +89,37 @@ InputFile& InputFile::analyse( ProgressListener& progress, const EAnalyseLevel l
 			case AVMEDIA_TYPE_VIDEO:
 			{
 				_properties.videoStreams.push_back( videoStreamInfo( _formatContext, streamId, progress, level ) );
+				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.videoStreams.back().metadatas );
 				break;
 			}
 			case AVMEDIA_TYPE_AUDIO:
 			{
 				_properties.audioStreams.push_back( audioStreamInfo( _formatContext, streamId ) );
+				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.audioStreams.back().metadatas );
 				break;
 			}
 			case AVMEDIA_TYPE_DATA:
 			{
 				_properties.dataStreams.push_back( dataStreamInfo( _formatContext, streamId ) );
+				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.dataStreams.back().metadatas );
 				break;
 			}
 			case AVMEDIA_TYPE_SUBTITLE:
 			{
 				_properties.subtitleStreams.push_back( subtitleStreamInfo( _formatContext, streamId ) );
+				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.subtitleStreams.back().metadatas );
 				break;
 			}
 			case AVMEDIA_TYPE_ATTACHMENT:
 			{
 				_properties.attachementStreams.push_back( attachementStreamInfo( _formatContext, streamId ) );
+				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.attachementStreams.back().metadatas );
 				break;
 			}
 			case AVMEDIA_TYPE_UNKNOWN:
 			{
 				_properties.unknownStreams.push_back( unknownStreamInfo( _formatContext, streamId ) );
+				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.unknownStreams.back().metadatas );
 				break;
 			}
 			case AVMEDIA_TYPE_NB:
diff --git a/src/AvTranscoder/Metadatas/MediaMetadatasStructures.cpp b/src/AvTranscoder/Metadatas/MediaMetadatasStructures.cpp
@@ -101,6 +101,11 @@ MetadatasMap VideoProperties::getDataMap() const
 	detail::add( dataMap, "has B frames", hasBFrames );
 	detail::add( dataMap, "references frames", referencesFrames );
 
+	for( size_t metadataIndex = 0; metadataIndex < metadatas.size(); ++metadataIndex )
+	{
+		detail::add( dataMap, metadatas.at( metadataIndex ).first, metadatas.at( metadataIndex ).second );
+	}
+
 	return dataMap;
 }
 
@@ -120,6 +125,10 @@ MetadatasMap AudioProperties::getDataMap() const
 	detail::add( dataMap, "channel name", channelName );
 	detail::add( dataMap, "channel description", channelDescription );
 
+	for( size_t metadataIndex = 0; metadataIndex < metadatas.size(); ++metadataIndex )
+	{
+		detail::add( dataMap, metadatas.at( metadataIndex ).first, metadatas.at( metadataIndex ).second );
+	}
 
 	return dataMap;
 }
@@ -130,6 +139,11 @@ MetadatasMap DataProperties::getDataMap() const
 
 	detail::add( dataMap, "streamId", streamId );
 
+	for( size_t metadataIndex = 0; metadataIndex < metadatas.size(); ++metadataIndex )
+	{
+		detail::add( dataMap, metadatas.at( metadataIndex ).first, metadatas.at( metadataIndex ).second );
+	}
+
 	return dataMap;
 }
 
@@ -139,6 +153,11 @@ MetadatasMap SubtitleProperties::getDataMap() const
 
 	detail::add( dataMap, "streamId", streamId );
 
+	for( size_t metadataIndex = 0; metadataIndex < metadatas.size(); ++metadataIndex )
+	{
+		detail::add( dataMap, metadatas.at( metadataIndex ).first, metadatas.at( metadataIndex ).second );
+	}
+
 	return dataMap;
 }
 
@@ -148,6 +167,11 @@ MetadatasMap AttachementProperties::getDataMap() const
 
 	detail::add( dataMap, "streamId", streamId );
 
+	for( size_t metadataIndex = 0; metadataIndex < metadatas.size(); ++metadataIndex )
+	{
+		detail::add( dataMap, metadatas.at( metadataIndex ).first, metadatas.at( metadataIndex ).second );
+	}
+
 	return dataMap;
 }
 
@@ -157,6 +181,11 @@ MetadatasMap UnknownProperties::getDataMap() const
 
 	detail::add( dataMap, "streamId", streamId );
 
+	for( size_t metadataIndex = 0; metadataIndex < metadatas.size(); ++metadataIndex )
+	{
+		detail::add( dataMap, metadatas.at( metadataIndex ).first, metadatas.at( metadataIndex ).second );
+	}
+
 	return dataMap;
 }
 
diff --git a/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp b/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp
@@ -85,6 +85,8 @@ struct VideoProperties
 	std::vector< std::pair< char, bool > > gopStructure;
 	std::vector<Channel> channels;
 
+	MetadatasMap metadatas;
+
 public:
 	MetadatasMap getDataMap() const;
 };
@@ -103,13 +105,16 @@ struct AudioProperties
 	size_t      channels;
 	size_t      bit_rate;
 
+	MetadatasMap metadatas;
+
 public:
 	MetadatasMap getDataMap() const;
 };
 
 struct DataProperties
 {
 	size_t      streamId;
+	MetadatasMap metadatas;
 
 public:
 	MetadatasMap getDataMap() const;
@@ -118,6 +123,7 @@ struct DataProperties
 struct SubtitleProperties
 {
 	size_t      streamId;
+	MetadatasMap metadatas;
 
 public:
 	MetadatasMap getDataMap() const;
@@ -126,6 +132,7 @@ struct SubtitleProperties
 struct AttachementProperties
 {
 	size_t      streamId;
+	MetadatasMap metadatas;
 
 public:
 	MetadatasMap getDataMap() const;
@@ -134,6 +141,7 @@ struct AttachementProperties
 struct UnknownProperties
 {
 	size_t      streamId;
+	MetadatasMap metadatas;
 
 public:
 	MetadatasMap getDataMap() const;

Original file line number	Diff line number	Diff line change
`@@ -89,31 +89,37 @@ InputFile& InputFile::analyse( ProgressListener& progress, const EAnalyseLevel l`
`89`	`89`	`case AVMEDIA_TYPE_VIDEO:`
`90`	`90`	`{`
`91`	`91`	`_properties.videoStreams.push_back( videoStreamInfo( _formatContext, streamId, progress, level ) );`
	`92`	`+ detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.videoStreams.back().metadatas );`
`92`	`93`	`break;`
`93`	`94`	`}`
`94`	`95`	`case AVMEDIA_TYPE_AUDIO:`
`95`	`96`	`{`
`96`	`97`	`_properties.audioStreams.push_back( audioStreamInfo( _formatContext, streamId ) );`
	`98`	`+ detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.audioStreams.back().metadatas );`
`97`	`99`	`break;`
`98`	`100`	`}`
`99`	`101`	`case AVMEDIA_TYPE_DATA:`
`100`	`102`	`{`
`101`	`103`	`_properties.dataStreams.push_back( dataStreamInfo( _formatContext, streamId ) );`
	`104`	`+ detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.dataStreams.back().metadatas );`
`102`	`105`	`break;`
`103`	`106`	`}`
`104`	`107`	`case AVMEDIA_TYPE_SUBTITLE:`
`105`	`108`	`{`
`106`	`109`	`_properties.subtitleStreams.push_back( subtitleStreamInfo( _formatContext, streamId ) );`
	`110`	`+ detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.subtitleStreams.back().metadatas );`
`107`	`111`	`break;`
`108`	`112`	`}`
`109`	`113`	`case AVMEDIA_TYPE_ATTACHMENT:`
`110`	`114`	`{`
`111`	`115`	`_properties.attachementStreams.push_back( attachementStreamInfo( _formatContext, streamId ) );`
	`116`	`+ detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.attachementStreams.back().metadatas );`
`112`	`117`	`break;`
`113`	`118`	`}`
`114`	`119`	`case AVMEDIA_TYPE_UNKNOWN:`
`115`	`120`	`{`
`116`	`121`	`_properties.unknownStreams.push_back( unknownStreamInfo( _formatContext, streamId ) );`
	`122`	`+ detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.unknownStreams.back().metadatas );`
`117`	`123`	`break;`
`118`	`124`	`}`
`119`	`125`	`case AVMEDIA_TYPE_NB:`