mikrosimage · valnoel · Apr 8, 2015 · Apr 1, 2015 · Apr 1, 2015 · Apr 3, 2015
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -132,9 +132,9 @@ bool OutputFile::endWrap( )
 	return true;
 }
 
-void OutputFile::addMetadata( const PropertiesMap& dataMap )
+void OutputFile::addMetadata( const PropertyVector& data )
 {
-	for( PropertiesMap::const_iterator it = dataMap.begin(); it != dataMap.end(); ++it )
+	for( PropertyVector::const_iterator it = data.begin(); it != data.end(); ++it )
 	{
 		addMetadata( it->first, it->second );
 	}

diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -41,7 +41,7 @@ class AvExport OutputFile : public IOutputFile
 	 * @brief Add metadata to the output file.
 	 * @note Depending on the format, you are not sure to find your metadata after the transcode.
 	 */
-	void addMetadata( const PropertiesMap& dataMap );
+	void addMetadata( const PropertyVector& data );
 	void addMetadata( const std::string& key, const std::string& value );
 
 	IOutputStream& getStream( const size_t streamId );

diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.cpp b/src/AvTranscoder/mediaProperty/AttachementProperties.cpp
diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp
@@ -1,33 +1,17 @@
 #ifndef _AV_TRANSCODER_MEDIA_PROPERTY_ATTACHEMENT_PROPERTIES_HPP
 #define _AV_TRANSCODER_MEDIA_PROPERTY_ATTACHEMENT_PROPERTIES_HPP
 
-#include <AvTranscoder/common.hpp>
-#include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/file/FormatContext.hpp>
+#include <AvTranscoder/mediaProperty/StreamProperties.hpp>
 
 namespace avtranscoder
 {
 
-class AvExport AttachementProperties
+class AvExport AttachementProperties: public StreamProperties
 {
 public:
-	AttachementProperties( const FormatContext& formatContext, const size_t index );
-
-	size_t getStreamIndex() const { return _streamIndex; }
-	size_t getStreamId() const;
-	PropertiesMap& getMetadatas() { return _metadatas; }
-
-#ifndef SWIG
-	const AVFormatContext& getAVFormatContext() { return *_formatContext; }
-#endif
-
-	PropertiesMap getPropertiesAsMap() const;  ///< Return all attachement properties as a map (name of property: value)
-
-private:
-	const AVFormatContext* _formatContext;  ///< Has link (no ownership)
-
-	size_t _streamIndex;
-	PropertiesMap _metadatas;
+	AttachementProperties( const FormatContext& formatContext, const size_t index )
+	    : StreamProperties( formatContext, index )
+	{}
 };
 
 }

diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -14,10 +14,7 @@ namespace avtranscoder
 {
 
 AudioProperties::AudioProperties( const FormatContext& formatContext, const size_t index )
-	: _formatContext( &formatContext.getAVFormatContext() )
-	, _codecContext( NULL )
-	, _codec( NULL )
-	, _streamIndex( index )
+	: StreamProperties( formatContext, index )
 {
 	if( _formatContext )
 		_codecContext = _formatContext->streams[index]->codec;
@@ -202,33 +199,34 @@ double AudioProperties::getDuration() const
 	return duration;
 }
 
-PropertiesMap AudioProperties::getPropertiesAsMap() const
-{
-	PropertiesMap dataMap;
-
-	addProperty( dataMap, "streamId", &AudioProperties::getStreamId );
-	addProperty( dataMap, "codecId", &AudioProperties::getCodecId );
-	addProperty( dataMap, "codecName", &AudioProperties::getCodecName );
-	addProperty( dataMap, "codecLongName", &AudioProperties::getCodecLongName );
-	addProperty( dataMap, "sampleFormatName", &AudioProperties::getSampleFormatName );
-	addProperty( dataMap, "sampleFormatLongName", &AudioProperties::getSampleFormatLongName );
-	addProperty( dataMap, "sampleRate", &AudioProperties::getSampleRate );
-	addProperty( dataMap, "bitRate", &AudioProperties::getBitRate );
-	addProperty( dataMap, "nbSamples", &AudioProperties::getNbSamples );
-	addProperty( dataMap, "channels", &AudioProperties::getChannels );
-	addProperty( dataMap, "channelLayout", &AudioProperties::getChannelLayout );
-	addProperty( dataMap, "channelName", &AudioProperties::getChannelName );
-	addProperty( dataMap, "channelDescription", &AudioProperties::getChannelDescription );
-	addProperty( dataMap, "ticksPerFrame", &AudioProperties::getTicksPerFrame );
-	addProperty( dataMap, "timeBase", &AudioProperties::getTimeBase );
-	addProperty( dataMap, "duration", &AudioProperties::getDuration );
+PropertyVector AudioProperties::getPropertiesAsVector() const
+{
+	PropertyVector data;
+
+	addProperty( data, "streamId", &AudioProperties::getStreamId );
+	detail::add( data, "streamIndex", getStreamIndex() );
+	addProperty( data, "codecId", &AudioProperties::getCodecId );
+	addProperty( data, "codecName", &AudioProperties::getCodecName );
+	addProperty( data, "codecLongName", &AudioProperties::getCodecLongName );
+	addProperty( data, "sampleFormatName", &AudioProperties::getSampleFormatName );
+	addProperty( data, "sampleFormatLongName", &AudioProperties::getSampleFormatLongName );
+	addProperty( data, "sampleRate", &AudioProperties::getSampleRate );
+	addProperty( data, "bitRate", &AudioProperties::getBitRate );
+	addProperty( data, "nbSamples", &AudioProperties::getNbSamples );
+	addProperty( data, "channels", &AudioProperties::getChannels );
+	addProperty( data, "channelLayout", &AudioProperties::getChannelLayout );
+	addProperty( data, "channelName", &AudioProperties::getChannelName );
+	addProperty( data, "channelDescription", &AudioProperties::getChannelDescription );
+	addProperty( data, "ticksPerFrame", &AudioProperties::getTicksPerFrame );
+	addProperty( data, "timeBase", &AudioProperties::getTimeBase );
+	addProperty( data, "duration", &AudioProperties::getDuration );
 
 	for( size_t metadataIndex = 0; metadataIndex < _metadatas.size(); ++metadataIndex )
 	{
-		detail::add( dataMap, _metadatas.at( metadataIndex ).first, _metadatas.at( metadataIndex ).second );
+		detail::add( data, _metadatas.at( metadataIndex ).first, _metadatas.at( metadataIndex ).second );
 	}
 
-	return dataMap;
+	return data;
 }
 
 }
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -1,16 +1,14 @@
 #ifndef _AV_TRANSCODER_MEDIA_PROPERTY_AUDIO_PROPERTIES_HPP
 #define _AV_TRANSCODER_MEDIA_PROPERTY_AUDIO_PROPERTIES_HPP
 
-#include <AvTranscoder/common.hpp>
-#include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/file/FormatContext.hpp>
+#include <AvTranscoder/mediaProperty/StreamProperties.hpp>
 
 #include <string>
 
 namespace avtranscoder
 {
 
-class AvExport AudioProperties
+class AvExport AudioProperties : public StreamProperties
 {
 public:
 	AudioProperties( const FormatContext& formatContext, const size_t index );
@@ -23,7 +21,6 @@ class AvExport AudioProperties
 	std::string getChannelName() const;
 	std::string getChannelDescription() const;
 
-	size_t getStreamIndex() const { return _streamIndex; }
 	size_t getStreamId() const;
 	size_t getCodecId() const;
 	size_t getSampleRate() const;
@@ -35,38 +32,31 @@ class AvExport AudioProperties
 	Rational getTimeBase() const;
 	double getDuration() const;
 
-	PropertiesMap& getMetadatas() { return _metadatas; }
-
 #ifndef SWIG
-	const AVFormatContext& getAVFormatContext() { return *_formatContext; }
 	AVCodecContext& getAVCodecContext() { return *_codecContext; }
 #endif
 
-	PropertiesMap getPropertiesAsMap() const;  ///< Return all audio properties as a map (name of property: value)
+	PropertyVector getPropertiesAsVector() const;
 
 private:
 #ifndef SWIG
 	template<typename T>
-	void addProperty( PropertiesMap& dataMap, const std::string& key, T (AudioProperties::*getter)(void) const ) const
+	void addProperty( PropertyVector& data, const std::string& key, T (AudioProperties::*getter)(void) const ) const
 	{
 		try
 		{
-		    detail::add( dataMap, key, (this->*getter)() );
+		    detail::add( data, key, (this->*getter)() );
 		}
 		catch( const std::exception& e )
 		{
-		    detail::add( dataMap, key, e.what() );
+		    detail::add( data, key, e.what() );
 		}
 	}
 #endif
 
 private:
-	const AVFormatContext* _formatContext;  ///< Has link (no ownership)
 	AVCodecContext* _codecContext;  ///< Has link (no ownership)
 	AVCodec* _codec; ///< Has link (no ownership)
-
-	size_t _streamIndex;
-	PropertiesMap _metadatas;
 };
 
 }

diff --git a/src/AvTranscoder/mediaProperty/DataProperties.cpp b/src/AvTranscoder/mediaProperty/DataProperties.cpp
@@ -2,54 +2,13 @@
 
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libavutil/avutil.h>
-#include <libavutil/pixdesc.h>
 }
 
 #include <bitset>
-#include <stdexcept>
 
 namespace avtranscoder
 {
 
-DataProperties::DataProperties( const FormatContext& formatContext, const size_t index )
-	: _formatContext( &formatContext.getAVFormatContext() )
-	, _streamIndex( index )
-{
-	//detectAncillaryData( _formatContext, _streamIndex );
-
-	if( _formatContext )
-		detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
-}
-
-size_t DataProperties::getStreamId() const
-{
-	if( ! _formatContext )
-		throw std::runtime_error( "unknown format context" );
-	return _formatContext->streams[_streamIndex]->id;
-}
-
-PropertiesMap DataProperties::getPropertiesAsMap() const
-{
-	PropertiesMap dataMap;
-
-	try
-	{
-		detail::add( dataMap, "streamId", getStreamId() );
-	}
-	catch( const std::exception& e )
-	{
-		detail::add( dataMap, "streamId", e.what() );
-	}
-
-	for( size_t metadataIndex = 0; metadataIndex < _metadatas.size(); ++metadataIndex )
-	{
-		detail::add( dataMap, _metadatas.at( metadataIndex ).first, _metadatas.at( metadataIndex ).second );
-	}
-
-	return dataMap;
-}
-
 void DataProperties::detectAncillaryData()
 {
 	AVPacket pkt;

diff --git a/src/AvTranscoder/mediaProperty/DataProperties.hpp b/src/AvTranscoder/mediaProperty/DataProperties.hpp
@@ -1,36 +1,20 @@
 #ifndef _AV_TRANSCODER_MEDIA_PROPERTY_DATA_PROPERTIES_HPP
 #define _AV_TRANSCODER_MEDIA_PROPERTY_DATA_PROPERTIES_HPP
 
-#include <AvTranscoder/common.hpp>
-#include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/file/FormatContext.hpp>
+#include <AvTranscoder/mediaProperty/StreamProperties.hpp>
 
 namespace avtranscoder
 {
 
-class AvExport DataProperties
+class AvExport DataProperties : public StreamProperties
 {
 public:
-	DataProperties( const FormatContext& formatContext, const size_t index );
-
-	size_t getStreamIndex() const { return _streamIndex; }
-	size_t getStreamId() const;
-	PropertiesMap& getMetadatas() { return _metadatas; }
-
-#ifndef SWIG
-	const AVFormatContext& getAVFormatContext() { return *_formatContext; }
-#endif
-
-	PropertiesMap getPropertiesAsMap() const;  ///< Return all data properties as a map (name of property: value)
+	DataProperties( const FormatContext& formatContext, const size_t index )
+	    : StreamProperties( formatContext, index )
+	{}
 
 private:
 	void detectAncillaryData();
-
-private:
-	const AVFormatContext* _formatContext;  ///< Has link (no ownership)
-
-	size_t _streamIndex;
-	PropertiesMap _metadatas;
 };
 
 }

diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -129,33 +129,33 @@ size_t FileProperties::getNbStreams() const
 	return _formatContext->nb_streams;
 }
 
-PropertiesMap FileProperties::getPropertiesAsMap() const
+PropertyVector FileProperties::getPropertiesAsVector() const
 {
-	PropertiesMap dataMap;
+	PropertyVector data;
 
-	addProperty( dataMap, "filename", &FileProperties::getFilename );
-	addProperty( dataMap, "formatName", &FileProperties::getFormatName );
-	addProperty( dataMap, "formatLongName", &FileProperties::getFormatLongName );
+	addProperty( data, "filename", &FileProperties::getFilename );
+	addProperty( data, "formatName", &FileProperties::getFormatName );
+	addProperty( data, "formatLongName", &FileProperties::getFormatLongName );
 
-	addProperty( dataMap, "startTime", &FileProperties::getStartTime );
-	addProperty( dataMap, "duration", &FileProperties::getDuration );
-	addProperty( dataMap, "bitrate", &FileProperties::getBitRate );
-	addProperty( dataMap, "numberOfStreams", &FileProperties::getNbStreams );
-	addProperty( dataMap, "numberOfPrograms", &FileProperties::getProgramsCount );
+	addProperty( data, "startTime", &FileProperties::getStartTime );
+	addProperty( data, "duration", &FileProperties::getDuration );
+	addProperty( data, "bitrate", &FileProperties::getBitRate );
+	addProperty( data, "numberOfStreams", &FileProperties::getNbStreams );
+	addProperty( data, "numberOfPrograms", &FileProperties::getProgramsCount );
 
-	detail::add( dataMap, "numberOfVideoStreams", getNbVideoStreams() );
-	detail::add( dataMap, "numberOfAudioStreams", getNbAudioStreams() );
-	detail::add( dataMap, "numberOfDataStreams", getNbDataStreams() );
-	detail::add( dataMap, "numberOfSubtitleStreams", getNbSubtitleStreams() );
-	detail::add( dataMap, "numberOfAttachementStreams", getNbAttachementStreams() );
-	detail::add( dataMap, "numberOfUnknownStreams", getNbUnknownStreams() );
+	detail::add( data, "numberOfVideoStreams", getNbVideoStreams() );
+	detail::add( data, "numberOfAudioStreams", getNbAudioStreams() );
+	detail::add( data, "numberOfDataStreams", getNbDataStreams() );
+	detail::add( data, "numberOfSubtitleStreams", getNbSubtitleStreams() );
+	detail::add( data, "numberOfAttachementStreams", getNbAttachementStreams() );
+	detail::add( data, "numberOfUnknownStreams", getNbUnknownStreams() );
 
 	for( size_t metadataIndex = 0; metadataIndex < _metadatas.size(); ++metadataIndex )
 	{
-		detail::add( dataMap, _metadatas.at( metadataIndex ).first, _metadatas.at( metadataIndex ).second );
+		detail::add( data, _metadatas.at( metadataIndex ).first, _metadatas.at( metadataIndex ).second );
 	}
 
-	return dataMap;
+	return data;
 }
 
 void FileProperties::clearStreamProperties()