mikrosimage · valnoel · Jun 8, 2015 · Jun 8, 2015 · Jun 8, 2015 · Jun 8, 2015
diff --git a/app/avPlay/AvReader.cpp b/app/avPlay/AvReader.cpp
@@ -17,7 +17,7 @@ AvReader::AvReader( const std::string& filename )
 	_inputFile.activateStream( _videoStream );
 
 	_inputVideo = new avtranscoder::VideoDecoder( _inputFile.getStream( _videoStream ) );
-	_inputVideo->setup();
+	_inputVideo->setupDecoder();
 
 	_sourceImage = new avtranscoder::VideoFrame( _inputFile.getStream( _videoStream ).getVideoCodec().getVideoFrameDesc() );
 

diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -36,4 +36,5 @@
 %include "AvTranscoder/encoder/encoder.i"
 %include "AvTranscoder/transform/transform.i"
 %include "AvTranscoder/file/file.i"
+%include "AvTranscoder/stat/stat.i"
 %include "AvTranscoder/transcoder/transcoder.i"
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -50,8 +50,39 @@ AudioDecoder::~AudioDecoder()
 }
 
 
-void AudioDecoder::setup()
+void AudioDecoder::setupDecoder( const ProfileLoader::Profile& profile )
 {
+	LOG_DEBUG( "Set profile of audio decoder with:\n" << profile )
+
+	AudioCodec& codec = _inputStream->getAudioCodec();
+
+	// set threads before any other options
+	if( profile.count( constants::avProfileThreads ) )
+		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
+	else
+		codec.getOption( constants::avProfileThreads ).setString( "auto" );
+
+	// set decoder options
+	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
+	{
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileThreads )
+			continue;
+
+		try
+		{
+			Option& decodeOption = codec.getOption( (*it).first );
+			decodeOption.setString( (*it).second );
+		}
+		catch( std::exception& e )
+		{
+			LOG_WARN( "AudioDecoder - can't set option " << (*it).first <<  " to " << (*it).second << ": " << e.what() )
+		}
+	}
+
+	// open decoder
 	_inputStream->getAudioCodec().openCodec();
 }
 
@@ -145,37 +176,4 @@ bool AudioDecoder::decodeNextFrame()
 	return true;
 }
 
-void AudioDecoder::setProfile( const ProfileLoader::Profile& profile )
-{
-	LOG_DEBUG( "Set profile of audio decoder with:\n" << profile )
-
-	AudioCodec& codec = _inputStream->getAudioCodec();
-
-	// set threads before any other options
-	if( profile.count( constants::avProfileThreads ) )
-		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
-	else
-		codec.getOption( constants::avProfileThreads ).setString( "auto" );
-
-	// set decoder options
-	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
-	{
-		if( (*it).first == constants::avProfileIdentificator ||
-			(*it).first == constants::avProfileIdentificatorHuman ||
-			(*it).first == constants::avProfileType ||
-			(*it).first == constants::avProfileThreads )
-			continue;
-
-		try
-		{
-			Option& decodeOption = codec.getOption( (*it).first );
-			decodeOption.setString( (*it).second );
-		}
-		catch( std::exception& e )
-		{
-			LOG_WARN( "AudioDecoder - can't set option " << (*it).first <<  " to " << (*it).second << ": " << e.what() )
-		}
-	}
-}
-
 }
diff --git a/src/AvTranscoder/decoder/AudioDecoder.hpp b/src/AvTranscoder/decoder/AudioDecoder.hpp
@@ -2,7 +2,6 @@
 #define _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_AUDIO_HPP_
 
 #include "IDecoder.hpp"
-#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 struct AVFrame;
 
@@ -17,13 +16,11 @@ class AvExport AudioDecoder : public IDecoder
 	AudioDecoder( InputStream& inputStream );
 	~AudioDecoder();
 
-	void setup();
+	void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() );
 
 	bool decodeNextFrame( Frame& frameBuffer );
 	bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
-	void setProfile( const ProfileLoader::Profile& profile );
-
 private:
 	bool decodeNextFrame();
 

diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -16,7 +16,7 @@ class AvExport AudioGenerator : public IDecoder
 
 	~AudioGenerator();
 
-	void setup() {}
+	void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() ) {}
 
 	bool decodeNextFrame( Frame& frameBuffer );
 	bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex );

diff --git a/src/AvTranscoder/decoder/IDecoder.hpp b/src/AvTranscoder/decoder/IDecoder.hpp
@@ -3,6 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 namespace avtranscoder
 {
@@ -13,9 +14,11 @@ class AvExport IDecoder
 	virtual ~IDecoder() {};
 
 	/**
-	 * @brief Open the decoder
+	 * @brief Setup the decoder
+	 * @param profile: set decoder parameters from the given profile
+	 * @note Open the decoder.
 	 */
-	virtual void setup() = 0;
+	virtual void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() ) = 0;
 
 	/**
 	 * @brief Decode next frame

diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -48,8 +48,39 @@ VideoDecoder::~VideoDecoder()
 	}
 }
 
-void VideoDecoder::setup()
+void VideoDecoder::setupDecoder( const ProfileLoader::Profile& profile )
 {
+	LOG_DEBUG( "Set profile of video decoder with:\n" << profile )
+
+	VideoCodec& codec = _inputStream->getVideoCodec();
+
+	// set threads before any other options
+	if( profile.count( constants::avProfileThreads ) )
+		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
+	else
+		codec.getOption( constants::avProfileThreads ).setString( "auto" );
+
+	// set decoder options
+	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
+	{
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileThreads )
+			continue;
+
+		try
+		{
+			Option& decodeOption = codec.getOption( (*it).first );
+			decodeOption.setString( (*it).second );
+		}
+		catch( std::exception& e )
+		{
+			LOG_WARN( "VideoDecoder - can't set option " << (*it).first <<  " to " << (*it).second << ": " << e.what() )
+		}
+	}
+
+	// open decoder
 	_inputStream->getVideoCodec().openCodec();
 }
 
@@ -104,37 +135,4 @@ void VideoDecoder::flushDecoder()
 	avcodec_flush_buffers( &_inputStream->getVideoCodec().getAVCodecContext() );
 }
 
-void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )
-{	
-	LOG_DEBUG( "Set profile of video decoder with:\n" << profile )
-
-	VideoCodec& codec = _inputStream->getVideoCodec();
-
-	// set threads before any other options
-	if( profile.count( constants::avProfileThreads ) )
-		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
-	else
-		codec.getOption( constants::avProfileThreads ).setString( "auto" );
-
-	// set decoder options
-	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
-	{
-		if( (*it).first == constants::avProfileIdentificator ||
-			(*it).first == constants::avProfileIdentificatorHuman ||
-			(*it).first == constants::avProfileType ||
-			(*it).first == constants::avProfileThreads )
-			continue;
-
-		try
-		{
-			Option& decodeOption = codec.getOption( (*it).first );
-			decodeOption.setString( (*it).second );
-		}
-		catch( std::exception& e )
-		{
-			LOG_WARN( "VideoDecoder - can't set option " << (*it).first <<  " to " << (*it).second << ": " << e.what() )
-		}
-	}
-}
-
 }
diff --git a/src/AvTranscoder/decoder/VideoDecoder.hpp b/src/AvTranscoder/decoder/VideoDecoder.hpp
@@ -2,7 +2,6 @@
 #define _AV_TRANSCODER_DECODER_VIDEO_DECODER_HPP_
 
 #include "IDecoder.hpp"
-#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 struct AVFrame;
 
@@ -16,16 +15,14 @@ class AvExport VideoDecoder : public IDecoder
 public:
 	VideoDecoder( InputStream& inputStream );
 	~VideoDecoder();
-	
-	void setup();
+
+	void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() );
 
 	bool decodeNextFrame( Frame& frameBuffer );
 	bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 	void flushDecoder();
-
-	void setProfile( const ProfileLoader::Profile& profile );
-
+
 private:
 	bool decodeNextFrame();
 

diff --git a/src/AvTranscoder/decoder/VideoGenerator.hpp b/src/AvTranscoder/decoder/VideoGenerator.hpp
@@ -16,7 +16,7 @@ class AvExport VideoGenerator : public IDecoder
 
 	~VideoGenerator();
 
-	void setup() {}
+	void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() ) {}
 
 	bool decodeNextFrame( Frame& frameBuffer );
 	bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex );

diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -35,9 +35,69 @@ AudioEncoder::~AudioEncoder()
 #endif
 }
 
-void AudioEncoder::setup()
+void AudioEncoder::setupAudioEncoder( const AudioFrameDesc& frameDesc, const ProfileLoader::Profile& profile )
 {
+	LOG_DEBUG( "Set profile of audio encoder with:\n" << profile )
+
+	// set sampleRate, number of channels, sample format
+	_codec.setAudioParameters( frameDesc );
+
+	// setup encoder
+	setupEncoder( profile );
+}
+
+void AudioEncoder::setupEncoder( const ProfileLoader::Profile& profile )
+{
+	// set threads before any other options
+	if( profile.count( constants::avProfileThreads ) )
+		_codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
+	else
+		_codec.getOption( constants::avProfileThreads ).setString( "auto" );
+
+
+	// set encoder options
+	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
+	{
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileCodec ||
+			(*it).first == constants::avProfileSampleFormat ||
+			(*it).first == constants::avProfileThreads )
+			continue;
+
+		try
+		{
+			Option& encodeOption = _codec.getOption( (*it).first );
+			encodeOption.setString( (*it).second );
+		}
+		catch( std::exception& e )
+		{}
+	}
+
+	// open encoder
 	_codec.openCodec();
+
+	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
+	{
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileCodec ||
+			(*it).first == constants::avProfileSampleFormat ||
+			(*it).first == constants::avProfileThreads )
+			continue;
+
+		try
+		{
+			Option& encodeOption = _codec.getOption( (*it).first );
+			encodeOption.setString( (*it).second );
+		}
+		catch( std::exception& e )
+		{
+			LOG_WARN( "AudioEncoder - can't set option " << (*it).first <<  " to " << (*it).second << ": " << e.what() )
+		}
+	}
 }
 
 bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
@@ -133,63 +193,5 @@ bool AudioEncoder::encodeFrame( Frame& codedFrame )
 #endif
 }
 
-void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const AudioFrameDesc& frameDesc  )
-{
-	LOG_DEBUG( "Set profile of audio encoder with:\n" << profile )
-
-	// set sampleRate, number of channels, sample format
-	_codec.setAudioParameters( frameDesc );
-
-	// set threads before any other options
-	if( profile.count( constants::avProfileThreads ) )
-		_codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
-	else
-		_codec.getOption( constants::avProfileThreads ).setString( "auto" );
-
-
-	// set encoder options
-	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
-	{
-		if( (*it).first == constants::avProfileIdentificator ||
-			(*it).first == constants::avProfileIdentificatorHuman ||
-			(*it).first == constants::avProfileType ||
-			(*it).first == constants::avProfileCodec ||
-			(*it).first == constants::avProfileSampleFormat ||
-			(*it).first == constants::avProfileThreads )
-			continue;
-
-		try
-		{
-			Option& encodeOption = _codec.getOption( (*it).first );
-			encodeOption.setString( (*it).second );
-		}
-		catch( std::exception& e )
-		{}
-	}
-
-	setup();
-
-	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
-	{
-		if( (*it).first == constants::avProfileIdentificator ||
-			(*it).first == constants::avProfileIdentificatorHuman ||
-			(*it).first == constants::avProfileType ||
-			(*it).first == constants::avProfileCodec ||
-			(*it).first == constants::avProfileSampleFormat ||
-			(*it).first == constants::avProfileThreads )
-			continue;
-
-		try
-		{
-			Option& encodeOption = _codec.getOption( (*it).first );
-			encodeOption.setString( (*it).second );
-		}
-		catch( std::exception& e )
-		{
-			LOG_WARN( "AudioEncoder - can't set option " << (*it).first <<  " to " << (*it).second << ": " << e.what() )
-		}
-	}
-}
-
 }