avTranscoder · cchampet · Nov 12, 2014 · Nov 12, 2014 · Nov 12, 2014 · Nov 12, 2014
diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp
@@ -1,5 +1,5 @@
 #include <AvTranscoder/file/InputFile.hpp>
-#include <AvTranscoder/mediaProperty/printMediaProperty.hpp>
+#include <AvTranscoder/mediaProperty/print.hpp>
 
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
@@ -16,7 +16,7 @@ int main( int argc, char** argv )
 	avtranscoder::NoDisplayProgress p;
 
 	avtranscoder::InputFile input( argv[1] );
-	input.analyse( p, avtranscoder::InputFile::eAnalyseLevelFull );
+	input.analyse( p, avtranscoder::eAnalyseLevelFirstGop );
 
 	// a simply metadata display
 	std::cout << input;

diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -28,7 +28,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 	InputFile input( inputfilename );
 	input.analyse( p );
 
-	input.readStream( input.getProperties().videoStreams.at( 0 ).streamId );
+	input.readStream( input.getProperties().getVideoProperties().at( 0 ).getStreamId() );
 
 	// init video decoders
 	AvInputVideo inputVideo( input.getStream( 0 ) );

diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
@@ -5,7 +5,7 @@
 #include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
 #include <AvTranscoder/transform/VideoTransform.hpp>
-#include <AvTranscoder/mediaProperty/printMediaProperty.hpp>
+#include <AvTranscoder/mediaProperty/print.hpp>
 
 #include <AvTranscoder/progress/ConsoleProgress.hpp>
 
@@ -23,7 +23,7 @@ class AvReader : public Reader
 		avtranscoder::ConsoleProgress p;
 
 		_inputFile.analyse( p );
-		_videoStream = _inputFile.getProperties().videoStreams.at(0).streamId;
+		_videoStream = _inputFile.getProperties().getVideoProperties().at(0).getStreamId();
 
 		_inputFile.readStream( _videoStream );
 
@@ -58,17 +58,17 @@ class AvReader : public Reader
 
 	size_t getWidth()
 	{
-		return _inputFile.getProperties().videoStreams.at(0).width;
+		return _inputFile.getProperties().getVideoProperties().at(0).getWidth();
 	};
 
 	size_t getHeight()
 	{
-		return _inputFile.getProperties().videoStreams.at(0).height;
+		return _inputFile.getProperties().getVideoProperties().at(0).getHeight();
 	}
 
 	size_t getComponents()
 	{
-		return _inputFile.getProperties().videoStreams.at(0).componentsCount;
+		return _inputFile.getProperties().getVideoProperties().at(0).getComponentsCount();
 	}
 
 	size_t getBitDepth()

diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -25,8 +25,6 @@
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/codec/DataCodec.hpp>
 
-#include <AvTranscoder/mediaProperty/mediaProperty.hpp>
-
 #include <AvTranscoder/codedStream/IOutputStream.hpp>
 #include <AvTranscoder/codedStream/AvOutputStream.hpp>
 
@@ -41,27 +39,19 @@
 #include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
 
-#include <AvTranscoder/file/InputFile.hpp>
-#include <AvTranscoder/file/OutputFile.hpp>
-
 #include <AvTranscoder/transcoder/StreamTranscoder.hpp>
 #include <AvTranscoder/transcoder/Transcoder.hpp>
 %}
 
-namespace std {	
+namespace std {
 %template(IntPair)         pair< size_t, size_t >;
-%template(VideoVector)     vector< avtranscoder::VideoProperties >;
-%template(AudioVector)     vector< avtranscoder::AudioProperties >;
-%template(MetadataPair)    pair< string, string >;
-%template(MetadatasVector) vector< pair< string, string > >;
-%template(GopPair)         pair< char, bool >;
-%template(GopVector)       vector< pair< char, bool > >;
-%template(ChannelVector)   vector< avtranscoder::Channel >;
 %template(ProfileMap)      map< string, string >;
 %template(ProfilesVector)  vector< map< string, string > >;
 }
 
 %include "AvTranscoder/progress/progress.i"
+%include "AvTranscoder/mediaProperty/mediaProperty.i"
+%include "AvTranscoder/file/file.i"
 
 %include <AvTranscoder/ProfileLoader.hpp>
 
@@ -75,8 +65,6 @@ namespace std {
 %include <AvTranscoder/codec/AudioCodec.hpp>
 %include <AvTranscoder/codec/DataCodec.hpp>
 
-%include <AvTranscoder/mediaProperty/mediaProperty.hpp>
-
 %include <AvTranscoder/codedStream/IOutputStream.hpp>
 %include <AvTranscoder/codedStream/AvOutputStream.hpp>
 
@@ -91,8 +79,5 @@ namespace std {
 %include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 %include <AvTranscoder/essenceStream/AvInputVideo.hpp>
 
-%include <AvTranscoder/file/InputFile.hpp>
-%include <AvTranscoder/file/OutputFile.hpp>
-
 %include <AvTranscoder/transcoder/StreamTranscoder.hpp>
 %include <AvTranscoder/transcoder/Transcoder.hpp>
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -1,13 +1,13 @@
 #include "InputFile.hpp"
 
 #include <AvTranscoder/option/Context.hpp>
-#include <AvTranscoder/mediaProperty/VideoStreamProperty.hpp>
-#include <AvTranscoder/mediaProperty/AudioStreamProperty.hpp>
-#include <AvTranscoder/mediaProperty/DataStreamProperty.hpp>
-#include <AvTranscoder/mediaProperty/SubtitleStreamProperty.hpp>
-#include <AvTranscoder/mediaProperty/AttachementStreamProperty.hpp>
-#include <AvTranscoder/mediaProperty/UnknownStreamProperty.hpp>
-
+#include <AvTranscoder/mediaProperty/util.hpp>
+#include <AvTranscoder/mediaProperty/VideoProperties.hpp>
+#include <AvTranscoder/mediaProperty/AudioProperties.hpp>
+#include <AvTranscoder/mediaProperty/DataProperties.hpp>
+#include <AvTranscoder/mediaProperty/SubtitleProperties.hpp>
+#include <AvTranscoder/mediaProperty/AttachementProperties.hpp>
+#include <AvTranscoder/mediaProperty/UnknownProperties.hpp>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -24,7 +24,8 @@ namespace avtranscoder
 
 InputFile::InputFile( const std::string& filename )
 	: _formatContext ( NULL )
-	, _filename      ( filename )
+	, _properties( NULL )
+	, _filename( filename )
 {
 	av_register_all();
 	if( avformat_open_input( &_formatContext, _filename.c_str(), NULL, NULL ) < 0 )
@@ -42,6 +43,10 @@ InputFile::InputFile( const std::string& filename )
 		throw std::runtime_error( "unable to find stream informations" );
 	}
 
+	// Initialize FileProperties
+	_properties = FileProperties( _formatContext );
+
+	// Create streams
 	for( size_t streamIndex = 0; streamIndex < _formatContext->nb_streams; ++streamIndex )
 	{
 		_inputStreams.push_back( new AvInputStream( *this, streamIndex ) );
@@ -68,56 +73,44 @@ InputFile& InputFile::analyse( IProgress& progress, const EAnalyseLevel level )
 
 	seekAtFrame( 0 );
 
-	_properties.filename = _formatContext->filename;
-	_properties.formatName = _formatContext->iformat->name;
-	_properties.formatLongName = _formatContext->iformat->long_name;
-	_properties.streamsCount = _formatContext->nb_streams;
-	_properties.programsCount = _formatContext->nb_programs;
-	_properties.startTime = 1.0 * (unsigned int)_formatContext->start_time / AV_TIME_BASE;
-	_properties.duration = 1.0 * _formatContext->duration / AV_TIME_BASE;
-	_properties.bitRate = _formatContext->bit_rate;
-	_properties.packetSize = _formatContext->packet_size;
-
-	detail::fillMetadataDictionnary( _formatContext->metadata, _properties.metadatas );
-
 	for( size_t streamId = 0; streamId < _formatContext->nb_streams; streamId++ )
 	{
 		switch( _formatContext->streams[streamId]->codec->codec_type )
 		{
 			case AVMEDIA_TYPE_VIDEO:
 			{
-				_properties.videoStreams.push_back( videoStreamInfo( _formatContext, streamId, progress, level ) );
-				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.videoStreams.back().metadatas );
+				VideoProperties properties( _formatContext, streamId, progress, level );
+				_properties.getVideoProperties().push_back( properties );
 				break;
 			}
 			case AVMEDIA_TYPE_AUDIO:
 			{
-				_properties.audioStreams.push_back( audioStreamInfo( _formatContext, streamId ) );
-				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.audioStreams.back().metadatas );
+				AudioProperties properties( _formatContext, streamId );
+				_properties.getAudioProperties().push_back( properties );
 				break;
 			}
 			case AVMEDIA_TYPE_DATA:
 			{
-				_properties.dataStreams.push_back( dataStreamInfo( _formatContext, streamId ) );
-				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.dataStreams.back().metadatas );
+				DataProperties properties( _formatContext, streamId );
+				_properties.getDataProperties().push_back( properties );
 				break;
 			}
 			case AVMEDIA_TYPE_SUBTITLE:
 			{
-				_properties.subtitleStreams.push_back( subtitleStreamInfo( _formatContext, streamId ) );
-				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.subtitleStreams.back().metadatas );
+				SubtitleProperties properties( _formatContext, streamId );
+				_properties.getSubtitleProperties().push_back( properties );
 				break;
 			}
 			case AVMEDIA_TYPE_ATTACHMENT:
 			{
-				_properties.attachementStreams.push_back( attachementStreamInfo( _formatContext, streamId ) );
-				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.attachementStreams.back().metadatas );
+				AttachementProperties properties( _formatContext, streamId );
+				_properties.getAttachementProperties().push_back( properties );
 				break;
 			}
 			case AVMEDIA_TYPE_UNKNOWN:
 			{
-				_properties.unknownStreams.push_back( unknownStreamInfo( _formatContext, streamId ) );
-				detail::fillMetadataDictionnary( _formatContext->streams[streamId]->metadata, _properties.unknownStreams.back().metadatas );
+				UnknownProperties properties( _formatContext, streamId );
+				_properties.getUnknownPropertiesProperties().push_back( properties );
 				break;
 			}
 			case AVMEDIA_TYPE_NB:
@@ -132,13 +125,11 @@ InputFile& InputFile::analyse( IProgress& progress, const EAnalyseLevel level )
 	return *this;
 }
 
-Properties InputFile::analyseFile( const std::string& filename, IProgress& progress, const EAnalyseLevel level )
+FileProperties InputFile::analyseFile( const std::string& filename, IProgress& progress, const EAnalyseLevel level )
 {
 	InputFile file( filename );
 	file.analyse( progress, level );
-	Properties properties;
-	file.getProperties( properties );
-	return properties;
+	return file.getProperties();
 }
 
 AVMediaType InputFile::getStreamType( size_t index )
@@ -229,9 +220,9 @@ void InputFile::setProfile( const ProfileLoader::Profile& profile )
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "[InputFile] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
+			std::cout << "[InputFile] warning: " << e.what() << std::endl;
 		}
 	}
 }
 
-}
+}
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -3,12 +3,14 @@
 
 #include <AvTranscoder/common.hpp>
 
+#include <AvTranscoder/file/util.hpp>
+
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/codec/VideoCodec.hpp>
 
 #include <AvTranscoder/codedStream/AvInputStream.hpp>
 
-#include <AvTranscoder/mediaProperty/mediaProperty.hpp>
+#include <AvTranscoder/mediaProperty/FileProperties.hpp>
 
 #include <AvTranscoder/progress/IProgress.hpp>
 
@@ -34,12 +36,6 @@ class AvExport InputFile
 
 	virtual ~InputFile();
 
-	enum EAnalyseLevel
-	{
-		eAnalyseLevelFast = 0,
-		eAnalyseLevelFull = 0,
-	};
-
 	/**
 	 * @return Return the resource to access
 	**/
@@ -50,24 +46,24 @@ class AvExport InputFile
 	 *        call this function before getProperties().
 	 * @param progress callback to get analysis progression
 	 **/
-	InputFile& analyse( IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFull );
+	InputFile& analyse( IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFirstGop );
 
 	/**
 	 * @brief Return media properties on the current InputFile.
 	 * @note require to launch analyse() before to fill the property struture
 	 * @return structure of media metadatas
 	 **/
-	const Properties& getProperties() const { return _properties; }
+	const FileProperties& getProperties() const { return _properties; }
 
-	void getProperties( Properties& properties ) const { properties = _properties; }
+	void getProperties( FileProperties& properties ) const { properties = _properties; }
 
 	/**
 	 * @brief Get media file properties using static method.
 	 * @param filename input filename
 	 * @param progress callback to get analysis progression
 	 * @return structure of media metadatas
 	 **/
-	static Properties analyseFile( const std::string& filename, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFull );
+	static FileProperties analyseFile( const std::string& filename, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFirstGop );
 
 	/**
 	 * @brief Get stream type: video, audio, subtitle, etc.
@@ -125,7 +121,7 @@ class AvExport InputFile
 
 protected:
 	AVFormatContext*            _formatContext;
-	Properties                  _properties;
+	FileProperties _properties;
 	std::string                 _filename;
 	std::vector<AvInputStream*> _inputStreams;
 };

diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 
-#include <AvTranscoder/mediaProperty/mediaProperty.hpp>
+#include <AvTranscoder/mediaProperty/util.hpp>
 
 #include <AvTranscoder/codec/VideoCodec.hpp>
 #include <AvTranscoder/codec/AudioCodec.hpp>

diff --git a/src/AvTranscoder/file/file.i b/src/AvTranscoder/file/file.i
@@ -0,0 +1,9 @@
+%{
+#include <AvTranscoder/file/util.hpp>
+#include <AvTranscoder/file/InputFile.hpp>
+#include <AvTranscoder/file/OutputFile.hpp>
+%}
+
+%include <AvTranscoder/file/util.hpp>
+%include <AvTranscoder/file/InputFile.hpp>
+%include <AvTranscoder/file/OutputFile.hpp>
diff --git a/src/AvTranscoder/file/util.hpp b/src/AvTranscoder/file/util.hpp
@@ -0,0 +1,20 @@
+#ifndef _AV_TRANSCODER_FILE_UTIL_HPP_
+#define _AV_TRANSCODER_FILE_UTIL_HPP_
+
+namespace avtranscoder
+{
+
+/**
+ * @brief Level of file analysis.
+ */
+enum EAnalyseLevel
+{
+	eAnalyseLevelHeader = 0,
+	eAnalyseLevelFirstGop = 1,
+	//eAnalyseLevelFull = 2,
+};
+
+}
+
+#endif
+
diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.cpp b/src/AvTranscoder/mediaProperty/AttachementProperties.cpp
@@ -0,0 +1,28 @@
+#include "AttachementProperties.hpp"
+
+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
+{
+	MetadatasMap dataMap;
+
+	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;
+}
+
+}