mediaProperty: fillMetadataDictionnary in constructor

Clement Champetier · Clement Champetier · commit 802004d163c5 · 2014-11-17T18:52:10.000+01:00
diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.cpp b/src/AvTranscoder/mediaProperty/AttachementProperties.cpp
@@ -6,7 +6,10 @@ namespace avtranscoder
 AttachementProperties::AttachementProperties( const AVFormatContext* formatContext, const size_t index )
 	: _formatContext( formatContext )
 	, _streamId( index )
-{}
+{
+	if( formatContext )
+		detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
+}
 
 MetadatasMap AttachementProperties::getDataMap() const
 {
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -22,6 +22,9 @@ AudioProperties::AudioProperties( const AVFormatContext* formatContext, const si
 
 	if( _formatContext && _codecContext )
 		_codec = avcodec_find_decoder( _codecContext->codec_id );
+
+	if( formatContext )
+		detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
 }
 
 std::string AudioProperties::getCodecName() const
diff --git a/src/AvTranscoder/mediaProperty/DataProperties.cpp b/src/AvTranscoder/mediaProperty/DataProperties.cpp
@@ -17,6 +17,9 @@ DataProperties::DataProperties( const AVFormatContext* formatContext, const size
 	, _streamId( index )
 {
 	//detectAncillaryData( _formatContext, _streamId );
+
+	if( formatContext )
+		detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
 }
 
 MetadatasMap DataProperties::getDataMap() const
diff --git a/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp b/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp
@@ -6,7 +6,10 @@ namespace avtranscoder
 SubtitleProperties::SubtitleProperties( const AVFormatContext* formatContext, const size_t index )
 	: _formatContext( formatContext )
 	, _streamId( index )
-{}
+{
+	if( formatContext )
+		detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
+}
 
 MetadatasMap SubtitleProperties::getDataMap() const
 {
diff --git a/src/AvTranscoder/mediaProperty/UnknownProperties.cpp b/src/AvTranscoder/mediaProperty/UnknownProperties.cpp
@@ -6,7 +6,10 @@ namespace avtranscoder
 UnknownProperties::UnknownProperties( const AVFormatContext* formatContext, const size_t index )
 	: _formatContext( formatContext )
 	, _streamId( index )
-{}
+{
+	if( formatContext )
+		detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
+}
 
 MetadatasMap UnknownProperties::getDataMap() const
 {
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -35,6 +35,9 @@ VideoProperties::VideoProperties( const AVFormatContext* formatContext, const si
 
 	if( _formatContext && _codecContext )
 		_codec = avcodec_find_decoder( _codecContext->codec_id );
+	
+	if( formatContext )
+		detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
 
 	// Skip decoding for selected frames
 	_codecContext->skip_frame = AVDISCARD_NONE;

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ AudioProperties::AudioProperties( const AVFormatContext* formatContext, const si`
`22`	`22`
`23`	`23`	`if( _formatContext && _codecContext )`
`24`	`24`	`_codec = avcodec_find_decoder( _codecContext->codec_id );`
	`25`	`+`
	`26`	`+ if( formatContext )`
	`27`	`+ detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`std::string AudioProperties::getCodecName() const`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ DataProperties::DataProperties( const AVFormatContext* formatContext, const size`
`17`	`17`	`, _streamId( index )`
`18`	`18`	`{`
`19`	`19`	`//detectAncillaryData( _formatContext, _streamId );`
	`20`	`+`
	`21`	`+ if( formatContext )`
	`22`	`+ detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`MetadatasMap DataProperties::getDataMap() const`