From 30851a7f13c023f077d5034292a02711b53d497b Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 18:39:45 +0100
Subject: [PATCH 01/39] AudioCodec: refactore getters

* Do not duplicate getters with AudioFrameDesc (getSampleRate,
getChannels...).
* Keep symmetry with VideoCodec (rename getFrameDesc to
getAudioFrameDesc).
---
 app/presetChecker/presetChecker.cpp           |  2 +-
 src/AvTranscoder/codec/AudioCodec.cpp         | 20 +------------------
 src/AvTranscoder/codec/AudioCodec.hpp         |  7 ++-----
 .../essenceStream/AvInputAudio.cpp            |  2 +-
 .../transcoder/StreamTranscoder.cpp           |  8 ++++----
 5 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
index f921f25f..5f8ae768 100644
--- a/app/presetChecker/presetChecker.cpp
+++ b/app/presetChecker/presetChecker.cpp
@@ -34,7 +34,7 @@ int main( int argc, char** argv )
 			if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )
 			{
 				avtranscoder::AvOutputAudio outputAudio;
-				outputAudio.setProfile( profile, outputAudio.getAudioCodec().getFrameDesc() );
+				outputAudio.setProfile( profile, outputAudio.getAudioCodec().getAudioFrameDesc() );
 			}
 		}
 		catch( ... )
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
index b96bbdaf..ba94746e 100644
--- a/src/AvTranscoder/codec/AudioCodec.cpp
+++ b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -20,7 +20,7 @@ AudioCodec::AudioCodec( const ICodec& codec )
 {
 }
 
-AudioFrameDesc AudioCodec::getFrameDesc() const
+AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 {
 	assert( _codecContext != NULL );
 	AudioFrameDesc audioFrameDesc;
@@ -33,24 +33,6 @@ AudioFrameDesc AudioCodec::getFrameDesc() const
 	return audioFrameDesc;
 }
 
-const size_t AudioCodec::getSampleRate() const
-{
-	assert( _codecContext != NULL );
-	return _codecContext->sample_rate;
-}
-
-const size_t AudioCodec::getChannels() const
-{
-	assert( _codecContext != NULL );
-	return _codecContext->channels;
-}
-
-const AVSampleFormat AudioCodec::getAVSampleFormat() const
-{
-	assert( _codecContext != NULL );
-	return _codecContext->sample_fmt;
-}
-
 void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )
 {
 	setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getAVSampleFormat() );
diff --git a/src/AvTranscoder/codec/AudioCodec.hpp b/src/AvTranscoder/codec/AudioCodec.hpp
index 5d86e1aa..75c0734c 100644
--- a/src/AvTranscoder/codec/AudioCodec.hpp
+++ b/src/AvTranscoder/codec/AudioCodec.hpp
@@ -14,11 +14,8 @@ class AvExport AudioCodec : public ICodec
 	AudioCodec( const ECodecType type, const AVCodecID codecId );
 	AudioCodec( const ICodec& codec );
 
-	AudioFrameDesc getFrameDesc() const;
-	const size_t getSampleRate() const;
-	const size_t getChannels() const;
-	const AVSampleFormat getAVSampleFormat() const;
-	
+	AudioFrameDesc getAudioFrameDesc() const;
+
 	void setAudioParameters( const AudioFrameDesc& audioFrameDesc );
 	void setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat );
 };
diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.cpp b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
index 0187f20e..21f29679 100644
--- a/src/AvTranscoder/essenceStream/AvInputAudio.cpp
+++ b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
@@ -49,7 +49,7 @@ void AvInputAudio::setup()
 	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
 	AVCodec* avCodec = _codec.getAVCodec();
 
-	avCodecContext->channels = _inputStream->getAudioCodec().getChannels();
+	avCodecContext->channels = _inputStream->getAudioCodec().getAudioFrameDesc().getChannels();
 	
 	int ret = avcodec_open2( avCodecContext, avCodec, NULL );
 
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
index da35ceb8..841a606a 100644
--- a/src/AvTranscoder/transcoder/StreamTranscoder.cpp
+++ b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -126,7 +126,7 @@ StreamTranscoder::StreamTranscoder(
 
 			_outputEssence = outputAudio;
 			
-			AudioFrameDesc outputFrameDesc( _inputStream->getAudioCodec().getFrameDesc() );
+			AudioFrameDesc outputFrameDesc( _inputStream->getAudioCodec().getAudioFrameDesc() );
 			outputFrameDesc.setParameters( profile );
 			if( subStreamIndex > -1 )
 			{
@@ -137,12 +137,12 @@ StreamTranscoder::StreamTranscoder(
 
 			_outputStream = &outputFile.addAudioStream( outputAudio->getAudioCodec() );
 
-			AudioFrameDesc inputFrameDesc( _inputStream->getAudioCodec().getFrameDesc() );
+			AudioFrameDesc inputFrameDesc( _inputStream->getAudioCodec().getAudioFrameDesc() );
 			if( subStreamIndex > -1 )
 				inputFrameDesc.setChannels( 1 );
 			
 			_sourceBuffer = new AudioFrame( inputFrameDesc );
-			_frameBuffer  = new AudioFrame( outputAudio->getAudioCodec().getFrameDesc() );
+			_frameBuffer  = new AudioFrame( outputAudio->getAudioCodec().getAudioFrameDesc() );
 			
 			_transform = new AudioTransform();
 
@@ -223,7 +223,7 @@ StreamTranscoder::StreamTranscoder(
 		_inputEssence = generatorAudio;
 
 		// Create inputFrame, and outputFrame which is based on a given profile
-		AudioFrameDesc inputFrameDesc = inputAudioCodec.getFrameDesc();
+		AudioFrameDesc inputFrameDesc = inputAudioCodec.getAudioFrameDesc();
 		AudioFrameDesc outputFrameDesc = inputFrameDesc;
 		outputFrameDesc.setParameters( profile );
 		_sourceBuffer = new AudioFrame( inputFrameDesc );

From 01c9b19f0d7e66aa98111186afc744de90c18d13 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 18:45:05 +0100
Subject: [PATCH 02/39] VideoCodec: refactore getVideoFrameDesc

---
 src/AvTranscoder/codec/VideoCodec.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/AvTranscoder/codec/VideoCodec.cpp b/src/AvTranscoder/codec/VideoCodec.cpp
index faae1076..f29b581b 100644
--- a/src/AvTranscoder/codec/VideoCodec.cpp
+++ b/src/AvTranscoder/codec/VideoCodec.cpp
@@ -23,14 +23,16 @@ VideoCodec::VideoCodec( const ICodec& codec )
 VideoFrameDesc VideoCodec::getVideoFrameDesc() const
 {
 	assert( _codecContext != NULL );
-	VideoFrameDesc VideoFrameDesc;
+
+	VideoFrameDesc videoFrameDesc;
+	videoFrameDesc.setWidth ( _codecContext->width  );
+	videoFrameDesc.setHeight( _codecContext->height );
+	videoFrameDesc.setDar( _codecContext->width, _codecContext->height );
+
 	Pixel pixel( _codecContext->pix_fmt );
+	videoFrameDesc.setPixel( pixel );
 
-	VideoFrameDesc.setWidth ( _codecContext->width  );
-	VideoFrameDesc.setHeight( _codecContext->height );
-	VideoFrameDesc.setPixel ( pixel );
-	VideoFrameDesc.setDar   ( _codecContext->height, _codecContext->width );
-	return VideoFrameDesc;
+	return videoFrameDesc;
 }
 
 std::pair< size_t, size_t > VideoCodec::getTimeBase() const

From 1c786365de8c3619000dc069ad652895c7f39ace Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 18:46:25 +0100
Subject: [PATCH 03/39] Generators: add documentation for attributes

---
 src/AvTranscoder/essenceStream/GeneratorAudio.hpp | 4 ++--
 src/AvTranscoder/essenceStream/GeneratorVideo.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
index 0c8e80d1..1c1588de 100644
--- a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
+++ b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
@@ -24,8 +24,8 @@ class AvExport GeneratorAudio : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	const AudioCodec* _codec;
-	Frame*         _inputFrame;
+	const AudioCodec* _codec;  ///< Has link (no ownership)
+	Frame* _inputFrame;  ///< Has link (no ownership)
 	AudioFrameDesc _frameDesc;
 };
 
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
index 54a206ab..59d027b3 100644
--- a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
+++ b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
@@ -25,8 +25,8 @@ class AvExport GeneratorVideo : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	const VideoCodec* _codec;
-	Frame* _inputFrame;
+	const VideoCodec* _codec;  ///< Has link (no ownership)
+	Frame* _inputFrame;  ///< Has link (no ownership)
 	VideoFrameDesc _videoFrameDesc;
 
 	size_t         _numberOfView;

From 4ca62566b1d4b86d33f8beb128ec4a875aa81579 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 18:48:54 +0100
Subject: [PATCH 04/39] GeneratorVideo: throw exception if no codec

---
 src/AvTranscoder/essenceStream/GeneratorVideo.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
index e1a37861..3fd12211 100644
--- a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
+++ b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
@@ -2,6 +2,8 @@
 
 #include <AvTranscoder/transform/VideoTransform.hpp>
 
+#include <stdexcept>
+
 namespace avtranscoder
 {
 
@@ -32,8 +34,14 @@ void GeneratorVideo::setFrame( Frame& inputFrame )
 
 bool GeneratorVideo::readNextFrame( Frame& frameBuffer )
 {
+	// Generate black image
 	if( ! _inputFrame )
 	{
+		if( ! _codec )
+		{
+			throw std::runtime_error( "Can't readNextFrame of video generator without knowing codec." );
+		}
+
 		// @todo support PAL (0 to 255) and NTFS (16 to 235)
 		int fillChar = 0;
 
@@ -55,7 +63,8 @@ bool GeneratorVideo::readNextFrame( Frame& frameBuffer )
 
 		return true;
 	}
-	
+
+	// Take image from _inputFrame
 	if( frameBuffer.getSize() != _inputFrame->getSize() )
 		frameBuffer.getBuffer().resize( _inputFrame->getSize() );
 	std::memcpy( frameBuffer.getPtr(), _inputFrame->getPtr(), _inputFrame->getSize() );

From b91fc308e8c9be8ad2bc171579505d1039ee2c3e Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 18:49:24 +0100
Subject: [PATCH 05/39] AvOutputVideo: clean encodeFrame

Remove comments.
---
 .../essenceStream/AvOutputVideo.cpp            | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/AvTranscoder/essenceStream/AvOutputVideo.cpp b/src/AvTranscoder/essenceStream/AvOutputVideo.cpp
index 0c636e15..3c56f417 100644
--- a/src/AvTranscoder/essenceStream/AvOutputVideo.cpp
+++ b/src/AvTranscoder/essenceStream/AvOutputVideo.cpp
@@ -103,25 +103,7 @@ bool AvOutputVideo::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
 		memcpy( codedFrame.getPtr(), packet.data, packet.size );
 	}
 #endif
-/*
-		std::string imgType = "";
-		switch( codecContext->coded_frame->pict_type )
-		{
-			case AV_PICTURE_TYPE_NONE : imgType = "None"; break;
-			case AV_PICTURE_TYPE_I : imgType = "I"; break;
-			case AV_PICTURE_TYPE_P : imgType = "P"; break;
-			case AV_PICTURE_TYPE_B : imgType = "B"; break;
-			case AV_PICTURE_TYPE_S : imgType = "S"; break;
-			case AV_PICTURE_TYPE_SI : imgType = "SI"; break;
-			case AV_PICTURE_TYPE_SP : imgType = "SP"; break;
-			case AV_PICTURE_TYPE_BI : imgType = "BI"; break;
-		}
 
-		std::clog << "\tframe " << codecContext->coded_frame->display_picture_number;
-		std::clog << " coded @ " << codecContext->coded_frame->coded_picture_number;
-		std::clog << " type : " << imgType;
-		std::clog << " quality : " << codecContext->coded_frame->quality << std::endl;
-*/
 	av_free_packet( &packet );
 #if LIBAVCODEC_VERSION_MAJOR > 54
 	av_frame_free( &frame );

From 1869f4a0fc9a814e568f2bd54e6de335c0d6268e Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 18:50:19 +0100
Subject: [PATCH 06/39] VideoFrame: setPixel takes a reference

---
 src/AvTranscoder/frame/VideoFrame.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvTranscoder/frame/VideoFrame.hpp b/src/AvTranscoder/frame/VideoFrame.hpp
index 569cb10a..fedc69f2 100644
--- a/src/AvTranscoder/frame/VideoFrame.hpp
+++ b/src/AvTranscoder/frame/VideoFrame.hpp
@@ -40,7 +40,7 @@ class AvExport VideoFrameDesc
 	
 	void setWidth ( const size_t width     ) { _width = width; }
 	void setHeight( const size_t height    ) { _height = height; }
-	void setPixel ( const Pixel  pixel     ) { _pixel = pixel; }
+	void setPixel( const Pixel&  pixel ) { _pixel = pixel; }
 	void setDar( const size_t num, const size_t den ) { _displayAspectRatio.num = num; _displayAspectRatio.den = den; }
 	void setDar( const Rational ratio ) { _displayAspectRatio = ratio; }
 	

From 7c885d3e74da330cca4f958b920b07230081da9f Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 18:51:38 +0100
Subject: [PATCH 07/39] Context: add typedef to manipulate options

Add OptionArray and OptionMap.
---
 src/AvTranscoder/option/Context.hpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/AvTranscoder/option/Context.hpp b/src/AvTranscoder/option/Context.hpp
index b804943c..b7e43e8d 100644
--- a/src/AvTranscoder/option/Context.hpp
+++ b/src/AvTranscoder/option/Context.hpp
@@ -11,6 +11,9 @@
 namespace avtranscoder
 {
 
+typedef std::vector<Option> OptionArray;
+typedef std::map<std::string, Option> OptionMap;
+
 /**
  * @brief Wrapper of AVContext.
  * Can access Options through the corresponding context.
@@ -37,8 +40,8 @@ class AvExport Context
 		loadOptions( avContext, req_flags );
 	}
 
-	std::vector<Option> getOptions();
-	std::map<std::string, Option>& getOptionsMap() { return _options; }
+	OptionArray getOptions();
+	OptionMap& getOptionsMap() { return _options; }
 
 	Option& getOption( const std::string& optionName ) { return _options.at(optionName); }
 
@@ -46,7 +49,7 @@ class AvExport Context
 	void loadOptions( void* av_class, int req_flags );
 
 private:
-	std::map<std::string, Option> _options;
+	OptionMap _options;
 	void* _avContext;  ///< Has link (no ownership)
 };
 

From 2e6fd674d7dca191dfe555acd8155998350ee655 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 18:56:45 +0100
Subject: [PATCH 08/39] util: add typedef OptionArrayMap

* Easier to manipulate complexe data (in AvTranscoder and in other
libraries...).
* Remove forward declaration of 'Option': need to include 'Context' to
get 'OptionArray' typedef.
---
 src/AvTranscoder/util.cpp |  6 +++---
 src/AvTranscoder/util.hpp | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
index c5ddcdc7..36b7fc71 100644
--- a/src/AvTranscoder/util.cpp
+++ b/src/AvTranscoder/util.cpp
@@ -261,7 +261,7 @@ std::vector<std::string> getAudioCodecsShortNames()
 	return audioCodecsShortNames;
 }
 
-std::map< std::string, std::vector<Option> > getOutputFormatOptions()
+OptionArrayMap getOutputFormatOptions()
 {
 	av_register_all();
 
@@ -288,7 +288,7 @@ std::map< std::string, std::vector<Option> > getOutputFormatOptions()
 	return optionsPerFormat;
 }
 
-std::map< std::string, std::vector<Option> > getVideoCodecOptions()
+OptionArrayMap getVideoCodecOptions()
 {
 	std::map< std::string, std::vector<Option> > videoCodecOptions;
 	
@@ -319,7 +319,7 @@ std::map< std::string, std::vector<Option> > getVideoCodecOptions()
 	return videoCodecOptions;
 }
 
-std::map< std::string, std::vector<Option> > getAudioCodecOptions()
+OptionArrayMap getAudioCodecOptions()
 {
 	std::map< std::string, std::vector<Option> > audioCodecOptions;
 	
diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
index 02173bde..100af79b 100644
--- a/src/AvTranscoder/util.hpp
+++ b/src/AvTranscoder/util.hpp
@@ -3,6 +3,8 @@
 
 #include "common.hpp"
 
+#include <AvTranscoder/option/Context.hpp>
+
 extern "C" {
 #include <libavutil/pixfmt.h>
 #include <libavutil/samplefmt.h>
@@ -15,7 +17,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-class Option;
+typedef std::map<std::string, OptionArray> OptionArrayMap;
 
 /**
 *  @brief Get pixel format supported by a video codec.
@@ -65,17 +67,17 @@ std::vector<std::string> getAudioCodecsShortNames();
 /**
  * @brief Get the list of options for each output format
  */
-std::map< std::string, std::vector<Option> > getOutputFormatOptions();
+OptionArrayMap getOutputFormatOptions();
 
 /**
  * @brief Get the list of options for each video codec
  */
-std::map< std::string, std::vector<Option> > getVideoCodecOptions();
+OptionArrayMap getVideoCodecOptions();
 
 /**
  * @brief Get the list of options for each audio codec
  */
-std::map< std::string, std::vector<Option> > getAudioCodecOptions();
+OptionArrayMap getAudioCodecOptions();
 
 }
 

From afe3e4e9334492b3464038d89631d0b12bd4bf47 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 19:01:58 +0100
Subject: [PATCH 09/39] util: clean getPixel/Sample functions

* Test NULL pointer to avoid possible crash.
* Do not skip format name with no video track possible.
---
 src/AvTranscoder/util.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
index 36b7fc71..21bca3af 100644
--- a/src/AvTranscoder/util.cpp
+++ b/src/AvTranscoder/util.cpp
@@ -41,7 +41,6 @@ std::vector<std::string> getPixelFormats( const std::string& videoCodecName )
 	else
 	{
 		const AVCodec* videoCodec = avcodec_find_encoder_by_name( videoCodecName.c_str() );
-
 		if( videoCodec && videoCodec->pix_fmts != NULL )
 		{
 			size_t pix_fmt = 0;
@@ -52,7 +51,7 @@ std::vector<std::string> getPixelFormats( const std::string& videoCodecName )
 #else
 				const AVPixFmtDescriptor* pix_desc = av_pix_fmt_desc_get( videoCodec->pix_fmts[pix_fmt] );
 #endif
-				if( ! pix_desc->name )
+				if( ! pix_desc || ! pix_desc->name )
 					continue;
 				pixelFormats.push_back( std::string( pix_desc->name ) );
 				++pix_fmt;
@@ -66,6 +65,7 @@ std::vector<std::string> getSampleFormats( const std::string& audioCodecName )
 {
 	std::vector<std::string> sampleFormats;
 	
+	// all audio codec concerned
 	if( audioCodecName.empty() )
 	{
 		for( size_t sampleFormat = 0; sampleFormat < AV_SAMPLE_FMT_NB; ++sampleFormat)
@@ -73,6 +73,7 @@ std::vector<std::string> getSampleFormats( const std::string& audioCodecName )
 			sampleFormats.push_back( av_get_sample_fmt_name( static_cast<AVSampleFormat>( sampleFormat ) ) );
 		}
 	}
+	// specific audio codec
 	else
 	{
 		const AVCodec* audioCodec = avcodec_find_encoder_by_name( audioCodecName.c_str() );
@@ -109,10 +110,6 @@ std::vector<std::string> getFormatsLongNames()
 	AVOutputFormat* fmt = NULL;
 	while( ( fmt = av_oformat_next( fmt ) ) )
 	{
-		// add only format with video track
-		if( fmt->video_codec == AV_CODEC_ID_NONE )
-			continue;
-
 		if( ! fmt->long_name )
 			continue;
 
@@ -127,10 +124,6 @@ std::vector<std::string> getFormatsShortNames()
 	AVOutputFormat* fmt = NULL;
 	while( ( fmt = av_oformat_next( fmt ) ) )
 	{
-		// add only format with video track
-		if( fmt->video_codec == AV_CODEC_ID_NONE )
-			continue;
-
 		if( ! fmt->name )
 			continue;
 

From 00380fe9832a46e82787e53a778e70ba171d7d43 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 19:04:11 +0100
Subject: [PATCH 10/39] VideoTransform: clean init

Remove assert which are already tested before calling init (private)
function.
---
 src/AvTranscoder/transform/VideoTransform.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/AvTranscoder/transform/VideoTransform.cpp b/src/AvTranscoder/transform/VideoTransform.cpp
index 437c4590..5d097652 100644
--- a/src/AvTranscoder/transform/VideoTransform.cpp
+++ b/src/AvTranscoder/transform/VideoTransform.cpp
@@ -40,11 +40,6 @@ bool VideoTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 	const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );
 	const VideoFrame& dst = static_cast<const VideoFrame&>( dstFrame );
 
-	assert( src.desc().getWidth()  != 0 );
-	assert( src.desc().getHeight() != 0 );
-	assert( src.desc().getWidth()  == dst.desc().getWidth()  );
-	assert( src.desc().getHeight() == dst.desc().getHeight() );
-
 	_imageConvertContext = sws_getContext(
 		src.desc().getWidth(), src.desc().getHeight(), src.desc().getPixelDesc().findPixel(),
 		dst.desc().getWidth(), dst.desc().getHeight(), dst.desc().getPixelDesc().findPixel(),

From 51b0eae4d3c522a9685b627e58887d15a588cf4d Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 19:09:58 +0100
Subject: [PATCH 11/39] Transcoder: remove add( StreamTranscoder& stream )

We delete all the 'StreamTranscoder' in destructor of 'Transcoder':
can't add a reference to a stream from outside like this.
---
 src/AvTranscoder/transcoder/Transcoder.cpp | 5 -----
 src/AvTranscoder/transcoder/Transcoder.hpp | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
index c6d4c142..63b65080 100644
--- a/src/AvTranscoder/transcoder/Transcoder.cpp
+++ b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -190,11 +190,6 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 	addTranscodeStream( filename, streamIndex, subStreamIndex, profileDesc, offset );
 }
 
-void Transcoder::add( StreamTranscoder& stream )
-{
-	_streamTranscoders.push_back( &stream );
-}
-
 void Transcoder::init()
 {
 	for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
index 0c29b9bf..8d1ed997 100644
--- a/src/AvTranscoder/transcoder/Transcoder.hpp
+++ b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -94,12 +94,6 @@ class AvExport Transcoder
 	 */
 	void add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, ICodec& codec, const size_t offset = 0  );
 
-	/**
-	 * @brief Add the stream
-	 * @note The stream will be deleted in Transcoder's destructor.
-	 */
-	void add( StreamTranscoder& stream );
-
 	/**
 	 * @brief Initialize all streams added, by ensure process necessary frames in case of latency.
 	 * @note This can be called several times with no side effects.

From 2f2e0ffe6c6268cce8a015ff625469ec5901fdb9 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 19:12:01 +0100
Subject: [PATCH 12/39] StreamTranscoder: update verbose of processTranscode
 with a subStreamIndex

Symmetry with other processTranscode method.
---
 src/AvTranscoder/transcoder/StreamTranscoder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
index 841a606a..9d0855c6 100644
--- a/src/AvTranscoder/transcoder/StreamTranscoder.cpp
+++ b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -402,10 +402,10 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 	if( _currentEssence->readNextFrame( *_sourceBuffer, subStreamIndex ) )
 	{
 		if( _verbose )
-			std::cout << "convert " << std::endl;
+			std::cout << "convert " << _sourceBuffer->getSize() << std::endl;
 		_transform->convert( *_sourceBuffer, *_frameBuffer );
 		if( _verbose )
-			std::cout << "encode" << std::endl;
+			std::cout << "encode " << _frameBuffer->getSize() << std::endl;
 		_outputEssence->encodeFrame( *_frameBuffer, data );
 	}
 	else

From 6946e6c8410505a1368247d01568428cee58ba54 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 19:18:18 +0100
Subject: [PATCH 13/39] Transcoder: add getter to a specific stream

* An external library could need to update a specific stream during
process.
* Also add a getter to the current Essence in StreamTranscoder, for the
same reason above.
---
 .../transcoder/StreamTranscoder.hpp             | 17 +++++++++++------
 src/AvTranscoder/transcoder/Transcoder.hpp      |  6 ++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
index 47601146..cb7ce23d 100644
--- a/src/AvTranscoder/transcoder/StreamTranscoder.hpp
+++ b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -57,18 +57,23 @@ class AvExport StreamTranscoder
 	void switchToGeneratorEssence();
 	void switchToInputEssence();
 
-	void setVerbose( bool verbose = true ){ _verbose = verbose; }
-
-	void setInfinityStream( bool isInfinity ) { _infinityStream = isInfinity; }
-
-	void setOffset( bool offset = true ){ _offset = offset; }
-
 	/**
 	 * @brief Get the duration of the stream.
 	 * @note if it's a generated stream, return limit of double.
 	 */
 	double getDuration() const;
 
+	/**
+	 * @return a reference to the current essence processed in this stream.
+	 */
+	IInputEssence& getCurrentEssence() const { return *_currentEssence; }
+
+	void setVerbose( bool verbose = true ){ _verbose = verbose; }
+
+	void setInfinityStream( bool isInfinity ) { _infinityStream = isInfinity; }
+
+	void setOffset( bool offset = true ){ _offset = offset; }
+
 private:
 	bool processRewrap();
 	bool processRewrap( const int subStreamIndex );
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
index 8d1ed997..e6751f38 100644
--- a/src/AvTranscoder/transcoder/Transcoder.hpp
+++ b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -113,6 +113,12 @@ class AvExport Transcoder
 	 */
 	void process( IProgress& progress );
 
+	/**
+	 * @param streamIndex: careful about the order of stream insertion of the Transcoder.
+	 * @return a reference to a stream manage by the Transcoder.
+	 */
+	StreamTranscoder& getStream( size_t streamIndex ) const { return *_streamTranscoders.at( streamIndex ); }
+
 	/**
 	 * @brief Set the transcodage politic.
 	 * @note Call it after adding the streams.

From 681768061fd4655b0b869a959808d69f7c106178 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 31 Oct 2014 19:22:48 +0100
Subject: [PATCH 14/39] pyTest: add script to test setFrame during process

* 2 tests in the python file:
     * Generate a video stream, and set its frame during process.
     * Generate a audio stream, and set its frame during process.
* Swig: add template to have access to DataBuffer methods in bindings.
* IInputEssence: add virtual method setFrame. Reasons:
     * avoid cast when setFrame.
     * can access this feature whithout issue in bindings.
     * it could be a case to set some frames of a stream which is from
an input file (still not implemented).
---
 src/AvTranscoder/avTranscoder.i               |   1 +
 .../essenceStream/IInputEssence.hpp           |   2 +
 test/pyTest/testSetFrame.py                   | 116 ++++++++++++++++++
 3 files changed, 119 insertions(+)
 create mode 100644 test/pyTest/testSetFrame.py

diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
index 2fcd38db..c5826f5e 100644
--- a/src/AvTranscoder/avTranscoder.i
+++ b/src/AvTranscoder/avTranscoder.i
@@ -61,6 +61,7 @@ namespace std {
 %template(ChannelVector)   vector< avtranscoder::Channel >;
 %template(ProfileMap)      map< string, string >;
 %template(ProfilesVector)  vector< map< string, string > >;
+%template(DataBuffer)      std::vector< unsigned char >;
 }
 
 %include "AvTranscoder/progress/progress.i"
diff --git a/src/AvTranscoder/essenceStream/IInputEssence.hpp b/src/AvTranscoder/essenceStream/IInputEssence.hpp
index 33f7968a..affe39c7 100644
--- a/src/AvTranscoder/essenceStream/IInputEssence.hpp
+++ b/src/AvTranscoder/essenceStream/IInputEssence.hpp
@@ -31,6 +31,8 @@ class AvExport IInputEssence
 	 * @return status of decoding
 	 */
 	virtual bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex ) = 0;
+
+	virtual void setFrame( Frame& inputFrame ) {}
 };
 
 }
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py
new file mode 100644
index 00000000..88e8b325
--- /dev/null
+++ b/test/pyTest/testSetFrame.py
@@ -0,0 +1,116 @@
+import os
+
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+
+def testSetVideoFrame():
+	"""
+	Generate a video stream, and set its frame during process.
+	"""
+
+	# create output
+	outputFileName = "testSetVideoFrame.mov"
+	ouputFile = av.OutputFile( outputFileName )
+
+	# create video frame and codec
+	imageDesc = av.VideoFrameDesc()
+	imageDesc.setWidth( 1920 )
+	imageDesc.setHeight( 1080 )
+	imageDesc.setDar( 1920, 1080 )
+
+	inputPixel = av.Pixel()
+	inputPixel.setColorComponents( av.eComponentRgb );
+	inputPixel.setPlanar( False );
+
+	imageDesc.setPixel( inputPixel );
+
+	inputVideoCodec = av.VideoCodec( av.eCodecTypeEncoder, "mpeg2video" );
+	inputVideoCodec.setImageParameters( imageDesc );
+
+	# create transcoder and add a video stream
+	transcoder = av.Transcoder( ouputFile )
+	transcoder.add(  "", 0, "xdcamhd422", inputVideoCodec )
+	videoEssence = transcoder.getStream( 0 ).getCurrentEssence()
+
+	# start process
+	transcoder.init()
+	ouputFile.beginWrap()
+
+	# process 255 frames
+	for i in range(0,255):
+		transcoder.processFrame()
+		# set video frame
+		frame = av.VideoFrame( imageDesc )
+		frame.getBuffer().assign(frame.getBuffer().size(), i)
+		videoEssence.setFrame( frame )
+
+	# end process
+	ouputFile.endWrap()
+
+	# get dst file of transcode
+	dst_inputFile = av.InputFile( outputFileName )
+	progress = av.NoDisplayProgress()
+	dst_inputFile.analyse( progress, av.InputFile.eAnalyseLevelFast )
+	dst_properties = dst_inputFile.getProperties()
+	dst_videoStream = dst_properties.videoStreams[0]
+
+	assert_equals( "mpeg2video", dst_videoStream.codecName )
+	assert_equals( "MPEG-2 video", dst_videoStream.codecLongName )
+	assert_equals( 1920, dst_videoStream.width )
+	assert_equals( 1080, dst_videoStream.height )
+	assert_equals( 16, dst_videoStream.dar.num )
+	assert_equals( 9, dst_videoStream.dar.den )
+
+
+def testSetAudioFrame():
+	"""
+	Generate a audio stream, and set its frame during process.
+	"""
+
+	# create output
+	outputFileName = "testSetAudioFrame.wav"
+	ouputFile = av.OutputFile( outputFileName )
+
+	# create video frame and codec
+	audioDesc = av.AudioFrameDesc()
+	audioDesc.setSampleRate( 48000 )
+	audioDesc.setChannels( 1 )
+	audioDesc.setSampleFormat( "s32" )
+
+	inputAudioCodec = av.AudioCodec( av.eCodecTypeEncoder, "pcm_s24le" );
+	inputAudioCodec.setAudioParameters( audioDesc );
+
+	# create transcoder and add a video stream
+	transcoder = av.Transcoder( ouputFile )
+	transcoder.add(  "", 0, "wave24b48kmono", inputAudioCodec )
+	audioEssence = transcoder.getStream( 0 ).getCurrentEssence()
+
+	# start process
+	transcoder.init()
+	ouputFile.beginWrap()
+
+	# process 255 frames
+	for i in range(0,255):
+		transcoder.processFrame()
+		# set video frame
+		frame = av.AudioFrame( audioDesc )
+		frame.getBuffer().assign(frame.getBuffer().size(), i)
+		audioEssence.setFrame( frame )
+
+	# end process
+	ouputFile.endWrap()
+
+	# get dst file of transcode
+	dst_inputFile = av.InputFile( outputFileName )
+	progress = av.NoDisplayProgress()
+	dst_inputFile.analyse( progress, av.InputFile.eAnalyseLevelFast )
+	dst_properties = dst_inputFile.getProperties()
+	dst_audioStream = dst_properties.audioStreams[0]
+
+	assert_equals( "pcm_s24le", dst_audioStream.codecName )
+	assert_equals( "PCM signed 24-bit little-endian", dst_audioStream.codecLongName )
+	assert_equals( "signed 32 bits", dst_audioStream.sampleFormat )
+	assert_equals( 48000, dst_audioStream.sampleRate )
+	assert_equals( 1, dst_audioStream.channels )

From ed286b51eb0e6667a03c913e7799f51c46680df3 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 10:44:31 +0100
Subject: [PATCH 15/39] StreamTranscoder: add a more explicit messages when
 verbose

---
 src/AvTranscoder/transcoder/StreamTranscoder.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
index 9d0855c6..287b739b 100644
--- a/src/AvTranscoder/transcoder/StreamTranscoder.cpp
+++ b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -350,10 +350,10 @@ bool StreamTranscoder::processTranscode()
 	if( _currentEssence->readNextFrame( *_sourceBuffer ) )
 	{
 		if( _verbose )
-			std::cout << "convert " << _sourceBuffer->getSize() << std::endl;
+			std::cout << "convert (" << _sourceBuffer->getSize() << " bytes)" << std::endl;
 		_transform->convert( *_sourceBuffer, *_frameBuffer );
 		if( _verbose )
-			std::cout << "encode " << _frameBuffer->getSize() << std::endl;
+			std::cout << "encode (" << _frameBuffer->getSize() << " bytes)" << std::endl;
 		_outputEssence->encodeFrame( *_frameBuffer, data );
 	}
 	else
@@ -372,7 +372,7 @@ bool StreamTranscoder::processTranscode()
 	}
 
 	if( _verbose )
-		std::cout << "wrap (" << data.getSize() << ")" << std::endl;
+		std::cout << "wrap (" << data.getSize() << " bytes)" << std::endl;
 	_outputStream->wrap( data );
 	return true;
 }
@@ -402,10 +402,10 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 	if( _currentEssence->readNextFrame( *_sourceBuffer, subStreamIndex ) )
 	{
 		if( _verbose )
-			std::cout << "convert " << _sourceBuffer->getSize() << std::endl;
+			std::cout << "convert (" << _sourceBuffer->getSize() << " bytes)" << std::endl;
 		_transform->convert( *_sourceBuffer, *_frameBuffer );
 		if( _verbose )
-			std::cout << "encode " << _frameBuffer->getSize() << std::endl;
+			std::cout << "encode (" << _frameBuffer->getSize() << " bytes)" << std::endl;
 		_outputEssence->encodeFrame( *_frameBuffer, data );
 	}
 	else
@@ -423,7 +423,7 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 		}
 	}
 	if( _verbose )
-		std::cout << "wrap (" << data.getSize() << ")" << std::endl;
+		std::cout << "wrap (" << data.getSize() << " bytes)" << std::endl;
 	_outputStream->wrap( data );
 	return true;
 }

From 36448831c681d960f9ba405cb7d990311eb0e23c Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 10:44:55 +0100
Subject: [PATCH 16/39] Transcoder: rename getStream to getStreamTranscoder

---
 src/AvTranscoder/transcoder/Transcoder.hpp | 2 +-
 test/pyTest/testSetFrame.py                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
index e6751f38..30e00ac6 100644
--- a/src/AvTranscoder/transcoder/Transcoder.hpp
+++ b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -117,7 +117,7 @@ class AvExport Transcoder
 	 * @param streamIndex: careful about the order of stream insertion of the Transcoder.
 	 * @return a reference to a stream manage by the Transcoder.
 	 */
-	StreamTranscoder& getStream( size_t streamIndex ) const { return *_streamTranscoders.at( streamIndex ); }
+	StreamTranscoder& getStreamTranscoder( size_t streamIndex ) const { return *_streamTranscoders.at( streamIndex ); }
 
 	/**
 	 * @brief Set the transcodage politic.
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py
index 88e8b325..dfd0aa4d 100644
--- a/test/pyTest/testSetFrame.py
+++ b/test/pyTest/testSetFrame.py
@@ -32,7 +32,7 @@ def testSetVideoFrame():
 	# create transcoder and add a video stream
 	transcoder = av.Transcoder( ouputFile )
 	transcoder.add(  "", 0, "xdcamhd422", inputVideoCodec )
-	videoEssence = transcoder.getStream( 0 ).getCurrentEssence()
+	videoEssence = transcoder.getStreamTranscoder( 0 ).getCurrentEssence()
 
 	# start process
 	transcoder.init()
@@ -85,7 +85,7 @@ def testSetAudioFrame():
 	# create transcoder and add a video stream
 	transcoder = av.Transcoder( ouputFile )
 	transcoder.add(  "", 0, "wave24b48kmono", inputAudioCodec )
-	audioEssence = transcoder.getStream( 0 ).getCurrentEssence()
+	audioEssence = transcoder.getStreamTranscoder( 0 ).getCurrentEssence()
 
 	# start process
 	transcoder.init()

From d2dd12ae93b97bddaeb9dcd1010684387c46968e Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 10:47:28 +0100
Subject: [PATCH 17/39] pyTest: add a blanck line at the end of files

---
 test/pyTest/testProperties.py          | 1 +
 test/pyTest/testSetFrame.py            | 1 +
 test/pyTest/testTranscoderDummy.py     | 1 +
 test/pyTest/testTranscoderRewrap.py    | 1 +
 test/pyTest/testTranscoderTranscode.py | 1 +
 5 files changed, 5 insertions(+)

diff --git a/test/pyTest/testProperties.py b/test/pyTest/testProperties.py
index 8a380f04..0e23acc1 100644
--- a/test/pyTest/testProperties.py
+++ b/test/pyTest/testProperties.py
@@ -54,3 +54,4 @@ def testAddImpossibleMetadata():
 	properties = inputFile.getProperties()
 
 	assert_not_in( metadata_to_check, properties.metadatas )
+
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py
index dfd0aa4d..7f6461f8 100644
--- a/test/pyTest/testSetFrame.py
+++ b/test/pyTest/testSetFrame.py
@@ -114,3 +114,4 @@ def testSetAudioFrame():
 	assert_equals( "signed 32 bits", dst_audioStream.sampleFormat )
 	assert_equals( 48000, dst_audioStream.sampleRate )
 	assert_equals( 1, dst_audioStream.channels )
+
diff --git a/test/pyTest/testTranscoderDummy.py b/test/pyTest/testTranscoderDummy.py
index 1dd7624b..cdc145f4 100644
--- a/test/pyTest/testTranscoderDummy.py
+++ b/test/pyTest/testTranscoderDummy.py
@@ -121,3 +121,4 @@ def testTranscodeDummyVideo():
 	ouputFile.beginWrap()
 	transcoder.processFrame()
 	ouputFile.endWrap()
+
diff --git a/test/pyTest/testTranscoderRewrap.py b/test/pyTest/testTranscoderRewrap.py
index e48bcfe7..e87caf0d 100644
--- a/test/pyTest/testTranscoderRewrap.py
+++ b/test/pyTest/testTranscoderRewrap.py
@@ -167,3 +167,4 @@ def testRewrapVideoStream():
 		dst_metadata = dst_videoStream.metadatas[metadata]
 
 		assert_equals( src_metadata, dst_metadata )
+
diff --git a/test/pyTest/testTranscoderTranscode.py b/test/pyTest/testTranscoderTranscode.py
index f1784fdf..a358d08b 100644
--- a/test/pyTest/testTranscoderTranscode.py
+++ b/test/pyTest/testTranscoderTranscode.py
@@ -223,3 +223,4 @@ def testTranscodeWave16b48kmono():
 
 # 	assert_equals( "mpeg2video", dst_videoStream.codecName )
 # 	assert_equals( "yuv420p", dst_videoStream.pixelName )
+

From 221e11b7a17f0320d9e64b45a402c4396c4e5ae9 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 24 Oct 2014 17:49:01 +0200
Subject: [PATCH 18/39] AvInputStream: remove getPacketDuration

* The functions returns duration of last packet added.
* Not what we expected, and not used.
---
 src/AvTranscoder/codedStream/AvInputStream.cpp | 7 -------
 src/AvTranscoder/codedStream/AvInputStream.hpp | 2 --
 src/AvTranscoder/codedStream/IInputStream.hpp  | 1 -
 3 files changed, 10 deletions(-)

diff --git a/src/AvTranscoder/codedStream/AvInputStream.cpp b/src/AvTranscoder/codedStream/AvInputStream.cpp
index 3f143b7f..1e6c15e0 100644
--- a/src/AvTranscoder/codedStream/AvInputStream.cpp
+++ b/src/AvTranscoder/codedStream/AvInputStream.cpp
@@ -17,7 +17,6 @@ AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )
 	: IInputStream( )
 	, _inputFile( &inputFile )
 	, _codec( NULL )
-	, _packetDuration( 0 )
 	, _streamIndex( streamIndex )
 	, _bufferized( false )
 {
@@ -98,7 +97,6 @@ void AvInputStream::addPacket( AVPacket& packet )
 	//std::cout << "add packet for stream " << _streamIndex << std::endl;
 	CodedData data;
 	_streamCache.push_back( data );
-	_packetDuration = packet.duration;
 
 	if( ! _bufferized )
 		return;
@@ -166,11 +164,6 @@ double AvInputStream::getDuration() const
 	return 1.0 * _inputFile->getFormatContext().duration / AV_TIME_BASE;
 }
 
-double AvInputStream::getPacketDuration() const
-{
-	return _packetDuration * av_q2d( _inputFile->getFormatContext().streams[_streamIndex]->time_base );
-}
-
 void AvInputStream::clearBuffering()
 {
 	_streamCache.clear();
diff --git a/src/AvTranscoder/codedStream/AvInputStream.hpp b/src/AvTranscoder/codedStream/AvInputStream.hpp
index e13ebbdf..72c10d98 100644
--- a/src/AvTranscoder/codedStream/AvInputStream.hpp
+++ b/src/AvTranscoder/codedStream/AvInputStream.hpp
@@ -30,7 +30,6 @@ class AvExport AvInputStream : public IInputStream
 	AVMediaType getStreamType() const;
 
 	double getDuration() const;
-	double getPacketDuration() const;
 
 	void addPacket( AVPacket& packet );
 
@@ -48,7 +47,6 @@ class AvExport AvInputStream : public IInputStream
 
 	ICodec* _codec;  ///< Has ownership
 
-	int              _packetDuration;
 	size_t           _streamIndex;
 	bool             _bufferized;
 };
diff --git a/src/AvTranscoder/codedStream/IInputStream.hpp b/src/AvTranscoder/codedStream/IInputStream.hpp
index 1557b0e7..4f9ae9a1 100644
--- a/src/AvTranscoder/codedStream/IInputStream.hpp
+++ b/src/AvTranscoder/codedStream/IInputStream.hpp
@@ -26,7 +26,6 @@ class IInputStream
 	virtual AVMediaType getStreamType() const = 0;
 
 	virtual double getDuration() const = 0;
-	virtual double getPacketDuration() const = 0;
 
 	virtual void setBufferred( const bool bufferized ) = 0;
 

From c90265e22d4932e99299df6bb3d82df202fd42cc Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 27 Oct 2014 15:33:06 +0100
Subject: [PATCH 19/39] Transcoder: remove _outputFps attribute

* The method setOutputFps does not do what the user expected: the fps of
Transcoder is only used for progress bar (no consequencies in transcode
process !).
* This kind of method must be implemented in the outputStream on which
we want to update the fps.
---
 app/genericProcessor/genericProcessor.cpp  | 1 -
 src/AvTranscoder/transcoder/Transcoder.cpp | 3 +--
 src/AvTranscoder/transcoder/Transcoder.hpp | 8 --------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/genericProcessor/genericProcessor.cpp b/app/genericProcessor/genericProcessor.cpp
index 37d43cf2..f6b458d9 100644
--- a/app/genericProcessor/genericProcessor.cpp
+++ b/app/genericProcessor/genericProcessor.cpp
@@ -116,7 +116,6 @@ int main( int argc, char** argv )
 		// set verbose of all stream
 		transcoder.setVerbose( verbose );
 		transcoder.setProcessMethod( avtranscoder::eProcessMethodLongest );
-		//transcoder.setOutputFps( 12 );
 		transcoder.init();
 		
 		if( verbose )
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
index 63b65080..355bac6f 100644
--- a/src/AvTranscoder/transcoder/Transcoder.cpp
+++ b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -12,7 +12,6 @@ Transcoder::Transcoder( OutputFile& outputFile )
 	, _inputFiles()
 	, _streamTranscoders()
 	, _profile( true )
-	, _outputFps( 25 )
 	, _eProcessMethod ( eProcessMethodLongest )
 	, _mainStreamIndex( 0 )
 	, _verbose( false )
@@ -266,7 +265,7 @@ void Transcoder::process( IProgress& progress )
 		if( ! processFrame() )
 			break;
 		
-		if( progress.progress( 1 / _outputFps * ( frame ), totalDuration ) == eJobStatusCancel )
+		if( progress.progress( 1 / 25. * ( frame ), totalDuration ) == eJobStatusCancel )
 		{
 			break;
 		}
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
index 30e00ac6..337b8abb 100644
--- a/src/AvTranscoder/transcoder/Transcoder.hpp
+++ b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -133,12 +133,6 @@ class AvExport Transcoder
 	 */
 	void setVerbose( bool verbose = true );
 
-	/**
-	 * @brief Set FPS of output media file.
-	 * @note By default 25 frames per second.
-     */
-	void setOutputFps( double fps ) { _outputFps = fps; }
-
 private:
 
 	void addRewrapStream( const std::string& filename, const size_t streamIndex );
@@ -176,8 +170,6 @@ class AvExport Transcoder
 
 	Profile _profile;  ///< Objet to get existing profiles, and add new ones for the Transcoder.
 
-	double _outputFps;
-
 	EProcessMethod _eProcessMethod;
 
 	size_t _mainStreamIndex;  ///< Index of stream used to stop the process of transcode in case of eProcessMethodBasedOnStream.

From b323fbcd256a5a7bbddd09b0b7c5b4b88fcd023e Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 27 Oct 2014 15:35:06 +0100
Subject: [PATCH 20/39] AvInputAudio: rename getNextFrame to decodeNextFrame

This private function decodes the next frame (call
avcodec_decode_audio4).
---
 src/AvTranscoder/essenceStream/AvInputAudio.cpp | 6 +++---
 src/AvTranscoder/essenceStream/AvInputAudio.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.cpp b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
index 21f29679..9d07d276 100644
--- a/src/AvTranscoder/essenceStream/AvInputAudio.cpp
+++ b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
@@ -82,7 +82,7 @@ void AvInputAudio::setup()
 
 bool AvInputAudio::readNextFrame( Frame& frameBuffer )
 {
-	if( ! getNextFrame() )
+	if( ! decodeNextFrame() )
 		return false;
 
 	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
@@ -116,7 +116,7 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer )
 
 bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
-	if( ! getNextFrame() )
+	if( ! decodeNextFrame() )
 		return false;
 
 	const int output_nbChannels = 1;
@@ -156,7 +156,7 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamInde
 	return true;
 }
 
-bool AvInputAudio::getNextFrame()
+bool AvInputAudio::decodeNextFrame()
 {
 	int got_frame = 0;
 	while( ! got_frame )
diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.hpp b/src/AvTranscoder/essenceStream/AvInputAudio.hpp
index 394fbf0d..ef0719a7 100644
--- a/src/AvTranscoder/essenceStream/AvInputAudio.hpp
+++ b/src/AvTranscoder/essenceStream/AvInputAudio.hpp
@@ -23,7 +23,7 @@ class AvExport AvInputAudio : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	bool getNextFrame();
+	bool decodeNextFrame();
 
 	AvInputStream*     _inputStream;
 	AudioCodec _codec;

From a1992c040aa587327be698e0d452b69bb2e7e00f Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 27 Oct 2014 15:40:51 +0100
Subject: [PATCH 21/39] AvInputVideo: check decodedSize

* Return false as status of decoding if size of frame is 0.
---
 src/AvTranscoder/essenceStream/AvInputVideo.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
index c1004cdc..78adba63 100644
--- a/src/AvTranscoder/essenceStream/AvInputVideo.cpp
+++ b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -108,6 +108,9 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 	VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
 
 	size_t decodedSize = avpicture_get_size( (AVPixelFormat)_frame->format, _frame->width, _frame->height );
+	if( ! decodedSize )
+		return false;
+
 	if( imageBuffer.getBuffer().size() != decodedSize )
 		imageBuffer.getBuffer().resize( decodedSize );
 

From abe853e23213f033f1cf2f0c1d2211d89efb68ed Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 27 Oct 2014 16:02:34 +0100
Subject: [PATCH 22/39] StreamTranscoder: clean documentation of attributes

---
 .../transcoder/StreamTranscoder.hpp           | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
index cb7ce23d..8957898c 100644
--- a/src/AvTranscoder/transcoder/StreamTranscoder.hpp
+++ b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -94,28 +94,15 @@ class AvExport StreamTranscoder
 
 	ITransform* _transform;
 
-	int  _subStreamIndex;
+	int  _subStreamIndex;  ///< Index of channel that is processed from the input stream (-1 if no demultiplexing).
 
-	/**
-	 * @brief How many frame processed for this StreamTranscoder.
-	 */
-	size_t _frameProcessed;
-	/**
-	 * @brief Offset, in frame, at the beginning of the StreamTranscoder.
-	 */
-	size_t _offset;
-
-	bool _takeFromGenerator;
+	size_t _frameProcessed;  ///< How many frame processed for this StreamTranscoder.
+	size_t _offset;  ///< Offset, in frame, at the beginning of the StreamTranscoder.
 
+	bool _takeFromGenerator;  ///< Is the data processed are taken from a generator.
 	bool _verbose;
-
-	bool _offsetPassed;
-
-	/**
-	 * @brief Automatic switch to a generator
-	 * @note not applicable when rewrap
-	 */
-	bool _infinityStream;
+	bool _offsetPassed;  ///< Is the offset at the beginning of the stream is finished.
+	bool _infinityStream;  ///< Automatically switch to a generator at the end of the stream (not applicable when rewrap);
 };
 
 }

From f3989c05ffa72e6b9139b6cd36032161eaa480b2 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 11:31:22 +0100
Subject: [PATCH 23/39] AvInputVideo / Audio: add documentation for attributes

---
 src/AvTranscoder/essenceStream/AvInputAudio.hpp | 8 ++++----
 src/AvTranscoder/essenceStream/AvInputVideo.hpp | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.hpp b/src/AvTranscoder/essenceStream/AvInputAudio.hpp
index ef0719a7..dcf5417c 100644
--- a/src/AvTranscoder/essenceStream/AvInputAudio.hpp
+++ b/src/AvTranscoder/essenceStream/AvInputAudio.hpp
@@ -25,11 +25,11 @@ class AvExport AvInputAudio : public IInputEssence
 private:
 	bool decodeNextFrame();
 
-	AvInputStream*     _inputStream;
-	AudioCodec _codec;
-	AVFrame*           _frame;
+	AvInputStream* _inputStream;  ///< Stream from which we read next frames
+	AudioCodec _codec;  ///< Audio decoder
+	AVFrame* _frame;  ///< Libav object to store decoded data
 
-	int                _selectedStream;
+	int _selectedStream;  ///< Index of the selected stream in the input file
 };
 
 }
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.hpp b/src/AvTranscoder/essenceStream/AvInputVideo.hpp
index 098edc24..3c237073 100644
--- a/src/AvTranscoder/essenceStream/AvInputVideo.hpp
+++ b/src/AvTranscoder/essenceStream/AvInputVideo.hpp
@@ -28,11 +28,12 @@ class AvExport AvInputVideo : public IInputEssence
 	void setProfile( const Profile::ProfileDesc& desc );
 	
 private:
-	AvInputStream*     _inputStream;
-	VideoCodec _codec;
-	AVFrame*           _frame;
 
-	int                _selectedStream;
+	AvInputStream* _inputStream;  ///< Stream from which we read next frames
+	VideoCodec _codec;  ///< Video decoder
+	AVFrame* _frame;  ///< Libav object to store decoded data
+
+	int _selectedStream;  ///< Index of the selected stream in the input file
 };
 
 }

From f0ae2a2dec79330830377c1df8474c6976779608 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 11:32:16 +0100
Subject: [PATCH 24/39] AvInputVideo / Audio: fix _selectedStream

---
 src/AvTranscoder/essenceStream/AvInputAudio.cpp | 2 +-
 src/AvTranscoder/essenceStream/AvInputVideo.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.cpp b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
index 9d07d276..36788e19 100644
--- a/src/AvTranscoder/essenceStream/AvInputAudio.cpp
+++ b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
@@ -22,7 +22,7 @@ AvInputAudio::AvInputAudio( AvInputStream& inputStream )
 	, _inputStream   ( &inputStream )
 	, _codec( eCodecTypeDecoder, inputStream.getAudioCodec().getCodecId() )
 	, _frame         ( NULL )
-	, _selectedStream( -1 )
+	, _selectedStream( inputStream.getStreamIndex() )
 {
 }
 
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
index 78adba63..c3fa01e1 100644
--- a/src/AvTranscoder/essenceStream/AvInputVideo.cpp
+++ b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -22,7 +22,7 @@ AvInputVideo::AvInputVideo( AvInputStream& inputStream )
 	, _inputStream   ( &inputStream )
 	, _codec( eCodecTypeDecoder, inputStream.getVideoCodec().getCodecId() )
 	, _frame         ( NULL )
-	, _selectedStream( -1 )
+	, _selectedStream( inputStream.getStreamIndex() )
 {
 }
 

From 76e9ba70a1d06bafeacd83373d83b01d1f542b2a Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 11:34:45 +0100
Subject: [PATCH 25/39] AvInputVideo / Audio: has a link to the video / audio
 codec (decoder)

---
 src/AvTranscoder/essenceStream/AvInputAudio.cpp | 14 +++++++-------
 src/AvTranscoder/essenceStream/AvInputAudio.hpp |  2 +-
 src/AvTranscoder/essenceStream/AvInputVideo.cpp | 12 ++++++------
 src/AvTranscoder/essenceStream/AvInputVideo.hpp |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.cpp b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
index 36788e19..e369d88d 100644
--- a/src/AvTranscoder/essenceStream/AvInputAudio.cpp
+++ b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
@@ -20,7 +20,7 @@ namespace avtranscoder
 AvInputAudio::AvInputAudio( AvInputStream& inputStream ) 
 	: IInputEssence()
 	, _inputStream   ( &inputStream )
-	, _codec( eCodecTypeDecoder, inputStream.getAudioCodec().getCodecId() )
+	, _codec( &inputStream.getAudioCodec() )
 	, _frame         ( NULL )
 	, _selectedStream( inputStream.getStreamIndex() )
 {
@@ -46,8 +46,8 @@ AvInputAudio::~AvInputAudio()
 
 void AvInputAudio::setup()
 {
-	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
-	AVCodec* avCodec = _codec.getAVCodec();
+	AVCodecContext* avCodecContext = _codec->getAVCodecContext();
+	AVCodec* avCodec = _codec->getAVCodec();
 
 	avCodecContext->channels = _inputStream->getAudioCodec().getAudioFrameDesc().getChannels();
 	
@@ -85,7 +85,7 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer )
 	if( ! decodeNextFrame() )
 		return false;
 
-	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
+	AVCodecContext* avCodecContext = _codec->getAVCodecContext();
 
 	size_t decodedSize = av_samples_get_buffer_size(
 		NULL, avCodecContext->channels,
@@ -121,9 +121,9 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamInde
 
 	const int output_nbChannels = 1;
 	const int output_align = 1;
-	size_t decodedSize = av_samples_get_buffer_size(NULL, output_nbChannels, _frame->nb_samples, _codec.getAVCodecContext()->sample_fmt, output_align);
+	size_t decodedSize = av_samples_get_buffer_size(NULL, output_nbChannels, _frame->nb_samples, _codec->getAVCodecContext()->sample_fmt, output_align);
 	
-	size_t nbSubStreams = _codec.getAVCodecContext()->channels;
+	size_t nbSubStreams = _codec->getAVCodecContext()->channels;
 	size_t bytePerSample = av_get_bytes_per_sample( (AVSampleFormat)_frame->format );
 
 	if( subStreamIndex > nbSubStreams - 1 )
@@ -172,7 +172,7 @@ bool AvInputAudio::decodeNextFrame()
 		packet.data         = data.getPtr();
 		packet.size         = data.getSize();
 		
-		int ret = avcodec_decode_audio4( _codec.getAVCodecContext(), _frame, &got_frame, &packet );
+		int ret = avcodec_decode_audio4( _codec->getAVCodecContext(), _frame, &got_frame, &packet );
 
 		if( ret < 0 )
 		{
diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.hpp b/src/AvTranscoder/essenceStream/AvInputAudio.hpp
index dcf5417c..26b0fc9c 100644
--- a/src/AvTranscoder/essenceStream/AvInputAudio.hpp
+++ b/src/AvTranscoder/essenceStream/AvInputAudio.hpp
@@ -26,7 +26,7 @@ class AvExport AvInputAudio : public IInputEssence
 	bool decodeNextFrame();
 
 	AvInputStream* _inputStream;  ///< Stream from which we read next frames
-	AudioCodec _codec;  ///< Audio decoder
+	const AudioCodec* _codec;  ///< Audio decoder. Has link (no ownership)
 	AVFrame* _frame;  ///< Libav object to store decoded data
 
 	int _selectedStream;  ///< Index of the selected stream in the input file
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
index c3fa01e1..24fa1658 100644
--- a/src/AvTranscoder/essenceStream/AvInputVideo.cpp
+++ b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -20,7 +20,7 @@ namespace avtranscoder
 AvInputVideo::AvInputVideo( AvInputStream& inputStream )
 	: IInputEssence()
 	, _inputStream   ( &inputStream )
-	, _codec( eCodecTypeDecoder, inputStream.getVideoCodec().getCodecId() )
+	, _codec( &inputStream.getVideoCodec() )
 	, _frame         ( NULL )
 	, _selectedStream( inputStream.getStreamIndex() )
 {
@@ -45,8 +45,8 @@ AvInputVideo::~AvInputVideo()
 
 void AvInputVideo::setup()
 {
-	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
-	AVCodec* avCodec = _codec.getAVCodec();
+	AVCodecContext* avCodecContext = _codec->getAVCodecContext();
+	AVCodec* avCodec = _codec->getAVCodec();
 
 	// if( avCodec->capabilities & CODEC_CAP_TRUNCATED )
 	// 	avCodecContext->flags |= CODEC_FLAG_TRUNCATED;
@@ -92,7 +92,7 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 		packet.data         = data.getPtr();
 		packet.size         = data.getSize();
 		
-		int ret = avcodec_decode_video2( _codec.getAVCodecContext(), _frame, &got_frame, &packet );
+		int ret = avcodec_decode_video2( _codec->getAVCodecContext(), _frame, &got_frame, &packet );
 		
 		if( ret < 0 )
 		{
@@ -127,12 +127,12 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamInde
 
 void AvInputVideo::flushDecoder()
 {
-	avcodec_flush_buffers( _codec.getAVCodecContext() );
+	avcodec_flush_buffers( _codec->getAVCodecContext() );
 }
 
 void AvInputVideo::setProfile( const Profile::ProfileDesc& desc )
 {
-	Context codecContext( _codec.getAVCodecContext() );
+	Context codecContext( _codec->getAVCodecContext() );
 
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.hpp b/src/AvTranscoder/essenceStream/AvInputVideo.hpp
index 3c237073..b6a43bef 100644
--- a/src/AvTranscoder/essenceStream/AvInputVideo.hpp
+++ b/src/AvTranscoder/essenceStream/AvInputVideo.hpp
@@ -30,7 +30,7 @@ class AvExport AvInputVideo : public IInputEssence
 private:
 
 	AvInputStream* _inputStream;  ///< Stream from which we read next frames
-	VideoCodec _codec;  ///< Video decoder
+	const VideoCodec* _codec;  ///< Video decoder. Has link (no ownership)
 	AVFrame* _frame;  ///< Libav object to store decoded data
 
 	int _selectedStream;  ///< Index of the selected stream in the input file

From 41e4cec54501b183b44a9d0228290618afe70586 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 11:36:51 +0100
Subject: [PATCH 26/39] AvInputVideo: refactore readNextFrame

Symmetry with AvInputAudio: add private function decodeNextFrame.
---
 .../essenceStream/AvInputVideo.cpp            | 46 +++++++++++--------
 .../essenceStream/AvInputVideo.hpp            |  1 +
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
index 24fa1658..07f39596 100644
--- a/src/AvTranscoder/essenceStream/AvInputVideo.cpp
+++ b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -77,12 +77,36 @@ void AvInputVideo::setup()
 
 bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 {
-	int got_frame = 0;
+	if( ! decodeNextFrame() )
+		return false;
+
+	VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
+
+	size_t decodedSize = avpicture_get_size( (AVPixelFormat)_frame->format, _frame->width, _frame->height );
+	if( ! decodedSize )
+		return false;
+
+	if( imageBuffer.getBuffer().size() != decodedSize )
+		imageBuffer.getBuffer().resize( decodedSize );
+
+	// Copy pixel data from an AVPicture into one contiguous buffer.
+	avpicture_layout( (AVPicture*)_frame, (AVPixelFormat)_frame->format, _frame->width, _frame->height, &imageBuffer.getBuffer()[0], frameBuffer.getBuffer().size() );
+
+	return true;
+}
+
+bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+{
+	return false;
+}
 
+bool AvInputVideo::decodeNextFrame()
+{
+	int got_frame = 0;
 	while( ! got_frame )
 	{
 		CodedData data;
-		if( ! _inputStream->readNextPacket( data ) )
+		if( ! _inputStream->readNextPacket( data ) ) // error or end of file
 			return false;
 
 		AVPacket packet;
@@ -104,27 +128,9 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 		
 		av_free_packet( &packet );
 	}
-
-	VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
-
-	size_t decodedSize = avpicture_get_size( (AVPixelFormat)_frame->format, _frame->width, _frame->height );
-	if( ! decodedSize )
-		return false;
-
-	if( imageBuffer.getBuffer().size() != decodedSize )
-		imageBuffer.getBuffer().resize( decodedSize );
-
-	// Copy pixel data from an AVPicture into one contiguous buffer.
-	avpicture_layout( (AVPicture*)_frame, (AVPixelFormat)_frame->format, _frame->width, _frame->height, &imageBuffer.getBuffer()[0], frameBuffer.getBuffer().size() );
-
 	return true;
 }
 
-bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
-{
-	return false;
-}
-
 void AvInputVideo::flushDecoder()
 {
 	avcodec_flush_buffers( _codec->getAVCodecContext() );
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.hpp b/src/AvTranscoder/essenceStream/AvInputVideo.hpp
index b6a43bef..68477b57 100644
--- a/src/AvTranscoder/essenceStream/AvInputVideo.hpp
+++ b/src/AvTranscoder/essenceStream/AvInputVideo.hpp
@@ -28,6 +28,7 @@ class AvExport AvInputVideo : public IInputEssence
 	void setProfile( const Profile::ProfileDesc& desc );
 	
 private:
+	bool decodeNextFrame();
 
 	AvInputStream* _inputStream;  ///< Stream from which we read next frames
 	const VideoCodec* _codec;  ///< Video decoder. Has link (no ownership)

From 9872976ac11f6f23b5b13873bb9d83b57c9392e9 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 11:49:18 +0100
Subject: [PATCH 27/39] AvInputStream: add documentation for attributes

---
 src/AvTranscoder/codedStream/AvInputStream.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/AvTranscoder/codedStream/AvInputStream.hpp b/src/AvTranscoder/codedStream/AvInputStream.hpp
index 72c10d98..a34ce6d8 100644
--- a/src/AvTranscoder/codedStream/AvInputStream.hpp
+++ b/src/AvTranscoder/codedStream/AvInputStream.hpp
@@ -42,13 +42,13 @@ class AvExport AvInputStream : public IInputStream
 	AVStream* getAVStream() const;
 
 private:
-	InputFile*       _inputFile;
-	std::vector<CodedData> _streamCache;
-
+	InputFile* _inputFile;  ///< Has link (no ownership)
 	ICodec* _codec;  ///< Has ownership
 
-	size_t           _streamIndex;
-	bool             _bufferized;
+	std::vector<CodedData> _streamCache;
+
+	size_t _streamIndex;  ///<  Index of the stream in the input file
+	bool _bufferized;  ///< If the stream is bufferized
 };
 
 }

From fb946f2891b310b7d46effd9e1a9c8e338c365d4 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 11:49:53 +0100
Subject: [PATCH 28/39] AvOutputStream: add documentation for attributes

---
 src/AvTranscoder/codedStream/AvOutputStream.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AvTranscoder/codedStream/AvOutputStream.hpp b/src/AvTranscoder/codedStream/AvOutputStream.hpp
index 499c50ba..7d717131 100644
--- a/src/AvTranscoder/codedStream/AvOutputStream.hpp
+++ b/src/AvTranscoder/codedStream/AvOutputStream.hpp
@@ -18,9 +18,9 @@ class AvExport AvOutputStream : public IOutputStream
 	bool wrap( const CodedData& data );
 
 private:
-	OutputFile*      _outputFile;
+	OutputFile* _outputFile;  ///< Has link (no ownership)
 
-	size_t           _streamIndex;
+	size_t _streamIndex;  ///<  Index of the stream in the output file
 };
 
 }

From 0b71d409a57f891b51e71bf0dd8463c09cd2dafd Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 12:08:43 +0100
Subject: [PATCH 29/39] Generator Video / Audio: remove _codec

Get Video / Audio FrameDesc from a frameDesc instead of a link to a
codec.
---
 .../essenceStream/GeneratorAudio.cpp          | 16 ++--------
 .../essenceStream/GeneratorAudio.hpp          |  5 +---
 .../essenceStream/GeneratorVideo.cpp          | 30 +++++--------------
 .../essenceStream/GeneratorVideo.hpp          |  7 ++---
 .../transcoder/StreamTranscoder.cpp           |  8 ++---
 5 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.cpp b/src/AvTranscoder/essenceStream/GeneratorAudio.cpp
index bd13ef4d..e2a6be2b 100644
--- a/src/AvTranscoder/essenceStream/GeneratorAudio.cpp
+++ b/src/AvTranscoder/essenceStream/GeneratorAudio.cpp
@@ -5,25 +5,15 @@ namespace avtranscoder
 
 GeneratorAudio::GeneratorAudio( )
 	: IInputEssence( )
-	, _codec( NULL )
 	, _inputFrame( NULL )
 	, _frameDesc()
 {
 }
 
-void GeneratorAudio::setAudioCodec( const AudioCodec& codec )
+void GeneratorAudio::setAudioFrameDesc( const AudioFrameDesc& frameDesc )
 {
-	_frameDesc.setFps         ( 25.0 );
-	_codec = &codec;
-
-	_frameDesc.setSampleRate( _codec->getAVCodecContext()->sample_rate );
-	_frameDesc.setChannels( _codec->getAVCodecContext()->channels );
-	_frameDesc.setSampleFormat( _codec->getAVCodecContext()->sample_fmt );
-}
-
-const AudioCodec& GeneratorAudio::getAudioCodec()
-{
-	return *_codec;
+	_frameDesc = frameDesc;
+	_frameDesc.setFps( 25. );
 }
 
 void GeneratorAudio::setFrame( Frame& inputFrame )
diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
index 1c1588de..8354cb25 100644
--- a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
+++ b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
@@ -12,9 +12,7 @@ class AvExport GeneratorAudio : public IInputEssence
 public:
 	GeneratorAudio( );
 
-	void setAudioCodec( const AudioCodec& codec );
-
-	const AudioCodec& getAudioCodec();
+	void setAudioFrameDesc( const AudioFrameDesc& frameDesc );
 	
 	void setup() {}
 	
@@ -24,7 +22,6 @@ class AvExport GeneratorAudio : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	const AudioCodec* _codec;  ///< Has link (no ownership)
 	Frame* _inputFrame;  ///< Has link (no ownership)
 	AudioFrameDesc _frameDesc;
 };
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
index 3fd12211..e1afc64d 100644
--- a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
+++ b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
@@ -2,29 +2,20 @@
 
 #include <AvTranscoder/transform/VideoTransform.hpp>
 
-#include <stdexcept>
-
 namespace avtranscoder
 {
 
 GeneratorVideo::GeneratorVideo( )
 	: IInputEssence( )
-	, _codec( NULL )
 	, _inputFrame( NULL )
-	, _videoFrameDesc()
+	, _frameDesc()
 	, _numberOfView( 1 )
 {
 }
 
-void GeneratorVideo::setVideoCodec( const VideoCodec& codec )
+void GeneratorVideo::setVideoFrameDesc( const VideoFrameDesc& frameDesc )
 {
-	_codec = &codec;
-	_videoFrameDesc = _codec->getVideoFrameDesc();
-}
-
-const VideoCodec& GeneratorVideo::getVideoCodec()
-{
-	return *_codec;
+	_frameDesc = frameDesc;
 }
 
 void GeneratorVideo::setFrame( Frame& inputFrame )
@@ -37,26 +28,21 @@ bool GeneratorVideo::readNextFrame( Frame& frameBuffer )
 	// Generate black image
 	if( ! _inputFrame )
 	{
-		if( ! _codec )
-		{
-			throw std::runtime_error( "Can't readNextFrame of video generator without knowing codec." );
-		}
-
 		// @todo support PAL (0 to 255) and NTFS (16 to 235)
 		int fillChar = 0;
 
-		if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )
-			frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );
+		if( frameBuffer.getSize() != _frameDesc.getDataSize() )
+			frameBuffer.getBuffer().resize( _frameDesc.getDataSize() );
 
-		VideoFrameDesc desc( _codec->getVideoFrameDesc() );
+		VideoFrameDesc desc( _frameDesc );
 		Pixel rgbPixel;
 		rgbPixel.setColorComponents( eComponentRgb );
 		rgbPixel.setPlanar( false );
 		desc.setPixel( rgbPixel );
 
 		VideoFrame intermediateBuffer( desc );
-		intermediateBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );
-		memset( intermediateBuffer.getPtr(), fillChar, _videoFrameDesc.getDataSize() );
+		intermediateBuffer.getBuffer().resize( _frameDesc.getDataSize() );
+		memset( intermediateBuffer.getPtr(), fillChar, _frameDesc.getDataSize() );
 
 		VideoTransform videoEssenceTransform;
 		videoEssenceTransform.convert( intermediateBuffer, frameBuffer );
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
index 59d027b3..117ef8a0 100644
--- a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
+++ b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
@@ -13,9 +13,7 @@ class AvExport GeneratorVideo : public IInputEssence
 	GeneratorVideo( );
 
 	// Stream properties
-	void setVideoCodec( const VideoCodec& codec );
-
-	const VideoCodec& getVideoCodec();
+	void setVideoFrameDesc( const VideoFrameDesc& frameDesc );
 	
 	void setup() {}
 
@@ -25,9 +23,8 @@ class AvExport GeneratorVideo : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	const VideoCodec* _codec;  ///< Has link (no ownership)
 	Frame* _inputFrame;  ///< Has link (no ownership)
-	VideoFrameDesc _videoFrameDesc;
+	VideoFrameDesc _frameDesc;
 
 	size_t         _numberOfView;
 };
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
index 287b739b..770849c4 100644
--- a/src/AvTranscoder/transcoder/StreamTranscoder.cpp
+++ b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -112,7 +112,7 @@ StreamTranscoder::StreamTranscoder(
 			_transform = new VideoTransform();
 
 			GeneratorVideo* generatorVideo = new GeneratorVideo();
-			generatorVideo->setVideoCodec( outputVideo->getVideoCodec() );
+			generatorVideo->setVideoFrameDesc( outputVideo->getVideoCodec().getVideoFrameDesc() );
 			_generatorEssence = generatorVideo;
 			
 			break;
@@ -147,7 +147,7 @@ StreamTranscoder::StreamTranscoder(
 			_transform = new AudioTransform();
 
 			GeneratorAudio* generatorAudio = new GeneratorAudio();
-			generatorAudio->setAudioCodec( outputAudio->getAudioCodec() );
+			generatorAudio->setAudioFrameDesc( outputAudio->getAudioCodec().getAudioFrameDesc() );
 			_generatorEssence = generatorAudio;
 
 			break;
@@ -192,7 +192,7 @@ StreamTranscoder::StreamTranscoder(
 		// Create input essence based on a given input VideoCodec
 		GeneratorVideo* generatorVideo = new GeneratorVideo();
 		const VideoCodec& inputVideoCodec = static_cast<const VideoCodec&>( inputCodec );
-		generatorVideo->setVideoCodec( inputVideoCodec );
+		generatorVideo->setVideoFrameDesc( inputVideoCodec.getVideoFrameDesc() );
 		_inputEssence = generatorVideo;
 
 		// Create inputFrame, and outputFrame which is based on a given profile
@@ -219,7 +219,7 @@ StreamTranscoder::StreamTranscoder(
 		// Create input essence based on a given input AudioCodec
 		GeneratorAudio* generatorAudio = new GeneratorAudio();
 		const AudioCodec& inputAudioCodec = static_cast<const AudioCodec&>( inputCodec );
-		generatorAudio->setAudioCodec( inputAudioCodec );
+		generatorAudio->setAudioFrameDesc( inputAudioCodec.getAudioFrameDesc() );
 		_inputEssence = generatorAudio;
 
 		// Create inputFrame, and outputFrame which is based on a given profile

From 11fa67f375583fe515a591a2e3f8064b591296eb Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 13:07:58 +0100
Subject: [PATCH 30/39] util: fix getFormats Long / Short Names

Skip the first one which was an undefined codec in the enum list.
---
 src/AvTranscoder/util.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
index 21bca3af..fa3584d1 100644
--- a/src/AvTranscoder/util.cpp
+++ b/src/AvTranscoder/util.cpp
@@ -110,6 +110,10 @@ std::vector<std::string> getFormatsLongNames()
 	AVOutputFormat* fmt = NULL;
 	while( ( fmt = av_oformat_next( fmt ) ) )
 	{
+		// skip undefined codec
+		if( fmt->video_codec == AV_CODEC_ID_NONE )
+			continue;
+
 		if( ! fmt->long_name )
 			continue;
 
@@ -124,6 +128,10 @@ std::vector<std::string> getFormatsShortNames()
 	AVOutputFormat* fmt = NULL;
 	while( ( fmt = av_oformat_next( fmt ) ) )
 	{
+		// skip undefined codec
+		if( fmt->video_codec == AV_CODEC_ID_NONE )
+			continue;
+
 		if( ! fmt->name )
 			continue;
 

From b2aded2fcd567557ad60a0c08ffd64377c994403 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 13:47:49 +0100
Subject: [PATCH 31/39] Transcoder: add method add( StreamTranscoder& stream )

* Manage memory of StreamTranscoder by spliting streams into 2 vectors.
* Add pyTest "testTranscoderAdd" to test if we correctly manage memory.
---
 src/AvTranscoder/transcoder/Transcoder.cpp | 23 ++++++++++++-----
 src/AvTranscoder/transcoder/Transcoder.hpp |  8 +++++-
 test/pyTest/testTranscoderAdd.py           | 30 ++++++++++++++++++++++
 3 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 test/pyTest/testTranscoderAdd.py

diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
index 355bac6f..2faa981e 100644
--- a/src/AvTranscoder/transcoder/Transcoder.cpp
+++ b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -11,6 +11,7 @@ Transcoder::Transcoder( OutputFile& outputFile )
 	: _outputFile( outputFile )
 	, _inputFiles()
 	, _streamTranscoders()
+	, _streamTranscodersAllocated()
 	, _profile( true )
 	, _eProcessMethod ( eProcessMethodLongest )
 	, _mainStreamIndex( 0 )
@@ -25,7 +26,7 @@ Transcoder::~Transcoder()
 	{
 		delete (*it);
 	}
-	for( std::vector< StreamTranscoder* >::iterator it = _streamTranscoders.begin(); it != _streamTranscoders.end(); ++it )
+	for( std::vector< StreamTranscoder* >::iterator it = _streamTranscodersAllocated.begin(); it != _streamTranscodersAllocated.end(); ++it )
 	{
 		delete (*it);
 	}
@@ -189,6 +190,11 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 	addTranscodeStream( filename, streamIndex, subStreamIndex, profileDesc, offset );
 }
 
+void Transcoder::add( StreamTranscoder& stream )
+{
+	_streamTranscoders.push_back( &stream );
+}
+
 void Transcoder::init()
 {
 	for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )
@@ -326,7 +332,8 @@ void Transcoder::setVerbose( bool verbose )
 void Transcoder::addRewrapStream( const std::string& filename, const size_t streamIndex )
 {
 	InputFile* referenceFile = addInputFile( filename, streamIndex );
-	_streamTranscoders.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile ) );
+	_streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile ) );
+	_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 }
 
 void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profile, const size_t offset )
@@ -338,7 +345,8 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 		case AVMEDIA_TYPE_VIDEO:
 		case AVMEDIA_TYPE_AUDIO:
 		{
-			_streamTranscoders.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, profile, -1 , offset ) );
+			_streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, profile, -1 , offset ) );
+			_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 			break;
 		}
 		case AVMEDIA_TYPE_DATA:
@@ -360,7 +368,8 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 		case AVMEDIA_TYPE_VIDEO:
 		case AVMEDIA_TYPE_AUDIO:
 		{
-			_streamTranscoders.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, profile, subStreamIndex, offset ) );
+			_streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, profile, subStreamIndex, offset ) );
+			_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 			break;
 		}
 		case AVMEDIA_TYPE_DATA:
@@ -383,7 +392,8 @@ void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const ICod
 		if( _verbose )
 			std::cout << "add a generated audio stream" << std::endl;
 
-		_streamTranscoders.push_back( new StreamTranscoder( codec, _outputFile, profile ) );
+		_streamTranscodersAllocated.push_back( new StreamTranscoder( codec, _outputFile, profile ) );
+		_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 	}
 
 	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
@@ -391,7 +401,8 @@ void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const ICod
 		if( _verbose )
 			std::cout << "add generated video stream" << std::endl;
 
-		_streamTranscoders.push_back( new StreamTranscoder( codec, _outputFile, profile ) );
+		_streamTranscodersAllocated.push_back( new StreamTranscoder( codec, _outputFile, profile ) );
+		_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 	}
 }
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
index 337b8abb..80b68fd9 100644
--- a/src/AvTranscoder/transcoder/Transcoder.hpp
+++ b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -94,6 +94,11 @@ class AvExport Transcoder
 	 */
 	void add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, ICodec& codec, const size_t offset = 0  );
 
+	/**
+	 * @brief Add the stream
+	 */
+	void add( StreamTranscoder& streamTranscoder);
+
 	/**
 	 * @brief Initialize all streams added, by ensure process necessary frames in case of latency.
 	 * @note This can be called several times with no side effects.
@@ -166,7 +171,8 @@ class AvExport Transcoder
 	OutputFile&                      _outputFile;  ///< The output media file after process.
 	std::vector< InputFile* >        _inputFiles;  ///< The list of input files which contain added streams.
 
-	std::vector< StreamTranscoder* > _streamTranscoders;  ///< The streams of the output media file after process.
+	std::vector< StreamTranscoder* > _streamTranscoders;  ///< All streams of the output media file after process.
+	std::vector< StreamTranscoder* > _streamTranscodersAllocated;  ///< Streams allocated inside the Transcoder.
 
 	Profile _profile;  ///< Objet to get existing profiles, and add new ones for the Transcoder.
 
diff --git a/test/pyTest/testTranscoderAdd.py b/test/pyTest/testTranscoderAdd.py
new file mode 100644
index 00000000..ea5a6f91
--- /dev/null
+++ b/test/pyTest/testTranscoderAdd.py
@@ -0,0 +1,30 @@
+import os
+
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+
+def testAddStreamTranscoder():
+	"""
+	Add a streamTranscoder to the Transcoder, and process rewrap of an audio stream.
+	"""
+	# input
+	inputFile = av.InputFile( os.environ['AVTRANSCODER_TEST_AUDIO_FILE'] )
+	inputIndex = 0
+	inputStream = inputFile.getStream( inputIndex )
+	inputStream.setBufferred( True )
+
+	# output
+	outputFileName = "testAddStreamTranscoder.avi"
+	ouputFile = av.OutputFile( outputFileName )
+
+	streamTranscoder = av.StreamTranscoder( inputStream, ouputFile )
+	transcoder = av.Transcoder( ouputFile )
+	transcoder.add( streamTranscoder)
+
+	# process
+	progress = av.NoDisplayProgress()
+	transcoder.init()
+	transcoder.process( progress )
+

From 5ddc7b4d618f8ab5a707523675dba91d9703355f Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 13:49:01 +0100
Subject: [PATCH 32/39] IInputEssence: add documentation for setFrame

---
 src/AvTranscoder/essenceStream/IInputEssence.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/AvTranscoder/essenceStream/IInputEssence.hpp b/src/AvTranscoder/essenceStream/IInputEssence.hpp
index affe39c7..8e232dc0 100644
--- a/src/AvTranscoder/essenceStream/IInputEssence.hpp
+++ b/src/AvTranscoder/essenceStream/IInputEssence.hpp
@@ -32,6 +32,11 @@ class AvExport IInputEssence
 	 */
 	virtual bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex ) = 0;
 
+	/**
+	 * Set the next frame of the input stream
+	 * @note Not yet implemented for AvInputVideo and AvInputAudio
+	 * @param inputFrame: the new next frame
+	 */
 	virtual void setFrame( Frame& inputFrame ) {}
 };
 

From 8de291251532a5dfa598384d53b39fdb0c5d78f9 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 13:55:25 +0100
Subject: [PATCH 33/39] Transcoder: refactore - get only one addTranscodeStream
 private method

---
 src/AvTranscoder/transcoder/Transcoder.cpp | 27 ++--------------------
 src/AvTranscoder/transcoder/Transcoder.hpp |  2 --
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
index 2faa981e..00fa0c38 100644
--- a/src/AvTranscoder/transcoder/Transcoder.cpp
+++ b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -78,7 +78,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro
 
 	if( _verbose )
 		std::cout << "add transcoding stream" << std::endl;
-	addTranscodeStream( filename, streamIndex, profileDesc, offset );
+	addTranscodeStream( filename, streamIndex, -1, profileDesc, offset );
 }
 
 void Transcoder::add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, ICodec& codec, const size_t offset )
@@ -94,7 +94,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro
 	
 	if( _verbose )
 		std::cout << "add transcoding stream" << std::endl;
-	addTranscodeStream( filename, streamIndex, profileDesc, offset );
+	addTranscodeStream( filename, streamIndex, -1, profileDesc, offset );
 }
 
 void Transcoder::add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const std::string& profileName, const size_t offset )
@@ -336,29 +336,6 @@ void Transcoder::addRewrapStream( const std::string& filename, const size_t stre
 	_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 }
 
-void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profile, const size_t offset )
-{
-	InputFile* referenceFile = addInputFile( filename, streamIndex );
-
-	switch( referenceFile->getStreamType( streamIndex ) )
-	{
-		case AVMEDIA_TYPE_VIDEO:
-		case AVMEDIA_TYPE_AUDIO:
-		{
-			_streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, profile, -1 , offset ) );
-			_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
-			break;
-		}
-		case AVMEDIA_TYPE_DATA:
-		case AVMEDIA_TYPE_SUBTITLE:
-		case AVMEDIA_TYPE_ATTACHMENT:
-		default:
-		{
-			throw std::runtime_error( "unsupported media type in transcode setup" );
-		}
-	}
-}
-
 void Transcoder::addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, Profile::ProfileDesc& profile, const size_t offset )
 {
 	InputFile* referenceFile = addInputFile( filename, streamIndex );
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
index 80b68fd9..e184a4cb 100644
--- a/src/AvTranscoder/transcoder/Transcoder.hpp
+++ b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -142,8 +142,6 @@ class AvExport Transcoder
 
 	void addRewrapStream( const std::string& filename, const size_t streamIndex );
 
-	void addTranscodeStream( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profile, const size_t offset = 0 );
-
 	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, Profile::ProfileDesc& profile, const size_t offset = 0 );
 
 	void addDummyStream( const Profile::ProfileDesc& profile, const ICodec& codec );

From fc4673f54a776668576e4ee87a225d12ebe2fce1 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 13:56:02 +0100
Subject: [PATCH 34/39] Transcoder: refactore addDummyStream

Get only one instruction "new".
---
 src/AvTranscoder/transcoder/Transcoder.cpp | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
index 00fa0c38..8a7b15c8 100644
--- a/src/AvTranscoder/transcoder/Transcoder.cpp
+++ b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -364,23 +364,16 @@ void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const ICod
 	if( ! profile.count( constants::avProfileType ) )
 		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
 
-	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
+	if( _verbose )
 	{
-		if( _verbose )
+		if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
+			std::cout << "add a generated video stream" << std::endl;
+		else if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
 			std::cout << "add a generated audio stream" << std::endl;
-
-		_streamTranscodersAllocated.push_back( new StreamTranscoder( codec, _outputFile, profile ) );
-		_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 	}
 
-	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
-	{
-		if( _verbose )
-			std::cout << "add generated video stream" << std::endl;
-
-		_streamTranscodersAllocated.push_back( new StreamTranscoder( codec, _outputFile, profile ) );
-		_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
-	}
+	_streamTranscodersAllocated.push_back( new StreamTranscoder( codec, _outputFile, profile ) );
+	_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 }
 
 InputFile* Transcoder::addInputFile( const std::string& filename, const size_t streamIndex )

From 75d054e9ad4b2b657f27c78ddfc0f6dd680dbe79 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 15:50:03 +0100
Subject: [PATCH 35/39] GeneratorVideo: remove unused _numberOfView attribute

---
 src/AvTranscoder/essenceStream/GeneratorVideo.cpp | 1 -
 src/AvTranscoder/essenceStream/GeneratorVideo.hpp | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
index e1afc64d..30e8ed3e 100644
--- a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
+++ b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
@@ -9,7 +9,6 @@ GeneratorVideo::GeneratorVideo( )
 	: IInputEssence( )
 	, _inputFrame( NULL )
 	, _frameDesc()
-	, _numberOfView( 1 )
 {
 }
 
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
index 117ef8a0..db12c243 100644
--- a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
+++ b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
@@ -25,8 +25,6 @@ class AvExport GeneratorVideo : public IInputEssence
 private:
 	Frame* _inputFrame;  ///< Has link (no ownership)
 	VideoFrameDesc _frameDesc;
-
-	size_t         _numberOfView;
 };
 
 }

From c55bef77b367a0eb0483c2fde19132ae0396975d Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 3 Nov 2014 16:00:17 +0100
Subject: [PATCH 36/39] Generator Video / Audio: add get Video / Audio
 FrameDesc

---
 src/AvTranscoder/essenceStream/GeneratorAudio.hpp | 1 +
 src/AvTranscoder/essenceStream/GeneratorVideo.hpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
index 8354cb25..2f14c946 100644
--- a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
+++ b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
@@ -12,6 +12,7 @@ class AvExport GeneratorAudio : public IInputEssence
 public:
 	GeneratorAudio( );
 
+	AudioFrameDesc& getAudioFrameDesc() { return _frameDesc; }
 	void setAudioFrameDesc( const AudioFrameDesc& frameDesc );
 	
 	void setup() {}
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
index db12c243..f32513bf 100644
--- a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
+++ b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
@@ -12,7 +12,7 @@ class AvExport GeneratorVideo : public IInputEssence
 public:
 	GeneratorVideo( );
 
-	// Stream properties
+	VideoFrameDesc& getVideoFrameDesc() { return _frameDesc; }
 	void setVideoFrameDesc( const VideoFrameDesc& frameDesc );
 	
 	void setup() {}

From 3ff6616d6cfcb811a634a6a857f9658d8217c54e Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Wed, 5 Nov 2014 11:53:07 +0100
Subject: [PATCH 37/39] Option: refactore getDefaultRatio

Use make_pair.
---
 src/AvTranscoder/option/Option.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvTranscoder/option/Option.cpp b/src/AvTranscoder/option/Option.cpp
index 16aeeafb..eccceb3c 100644
--- a/src/AvTranscoder/option/Option.cpp
+++ b/src/AvTranscoder/option/Option.cpp
@@ -88,7 +88,7 @@ std::string Option::getDefaultString() const
 
 std::pair<int, int> Option::getDefaultRatio() const
 {
-	return std::pair<int, int>( _avOption->default_val.q.num, _avOption->default_val.q.den );
+	return std::make_pair( _avOption->default_val.q.num, _avOption->default_val.q.den );
 }
 //av_make_error_string
 void Option::setFlag( const std::string& flag, const bool enable )

From e5e706e5fcd5d3f1c8c6cbe75d675faddcf186ef Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Wed, 5 Nov 2014 18:03:13 +0100
Subject: [PATCH 38/39] Swig: add Generators in bindings

---
 src/AvTranscoder/avTranscoder.i | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
index c5826f5e..14c97211 100644
--- a/src/AvTranscoder/avTranscoder.i
+++ b/src/AvTranscoder/avTranscoder.i
@@ -42,6 +42,8 @@
 #include <AvTranscoder/essenceStream/IInputEssence.hpp>
 #include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
+#include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
+#include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
 
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/file/OutputFile.hpp>
@@ -95,6 +97,8 @@ namespace std {
 %include <AvTranscoder/essenceStream/IInputEssence.hpp>
 %include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 %include <AvTranscoder/essenceStream/AvInputVideo.hpp>
+%include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
+%include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
 
 %include <AvTranscoder/file/InputFile.hpp>
 %include <AvTranscoder/file/OutputFile.hpp>

From 1b0235f6120ef80bae11cb46b7dd454b819bec00 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Wed, 5 Nov 2014 18:09:02 +0100
Subject: [PATCH 39/39] StreamTranscoder: constructor can take an IInputEssence

* To manage cases with generators: a user can overload his Generator and
create a StreamTranscoder.
* Update testSetFrame.py
---
 .../transcoder/StreamTranscoder.cpp           | 24 ++++----------
 .../transcoder/StreamTranscoder.hpp           |  2 +-
 src/AvTranscoder/transcoder/Transcoder.cpp    | 33 +++++++++++++++----
 src/AvTranscoder/transcoder/Transcoder.hpp    |  8 ++---
 test/pyTest/testSetFrame.py                   | 23 ++++++-------
 5 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
index 770849c4..552c05df 100644
--- a/src/AvTranscoder/transcoder/StreamTranscoder.cpp
+++ b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -162,7 +162,7 @@ StreamTranscoder::StreamTranscoder(
 }
 
 StreamTranscoder::StreamTranscoder(
-		const ICodec& inputCodec,
+		IInputEssence& inputEssence,
 		OutputFile& outputFile,
 		const Profile::ProfileDesc& profile
 	)
@@ -170,7 +170,7 @@ StreamTranscoder::StreamTranscoder(
 	, _outputStream( NULL )
 	, _sourceBuffer( NULL )
 	, _frameBuffer( NULL )
-	, _inputEssence( NULL )
+	, _inputEssence( &inputEssence )
 	, _generatorEssence( NULL )
 	, _currentEssence( NULL )
 	, _outputEssence( NULL )
@@ -189,14 +189,8 @@ StreamTranscoder::StreamTranscoder(
 
 	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
 	{
-		// Create input essence based on a given input VideoCodec
-		GeneratorVideo* generatorVideo = new GeneratorVideo();
-		const VideoCodec& inputVideoCodec = static_cast<const VideoCodec&>( inputCodec );
-		generatorVideo->setVideoFrameDesc( inputVideoCodec.getVideoFrameDesc() );
-		_inputEssence = generatorVideo;
-
 		// Create inputFrame, and outputFrame which is based on a given profile
-		VideoFrameDesc inputFrameDesc = inputVideoCodec.getVideoFrameDesc();
+		VideoFrameDesc inputFrameDesc = static_cast<GeneratorVideo&>( inputEssence ).getVideoFrameDesc();
 		VideoFrameDesc outputFrameDesc = inputFrameDesc;
 		outputFrameDesc.setParameters( profile );
 		_sourceBuffer = new VideoFrame( inputFrameDesc );
@@ -216,14 +210,8 @@ StreamTranscoder::StreamTranscoder(
 	}
 	else if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
 	{
-		// Create input essence based on a given input AudioCodec
-		GeneratorAudio* generatorAudio = new GeneratorAudio();
-		const AudioCodec& inputAudioCodec = static_cast<const AudioCodec&>( inputCodec );
-		generatorAudio->setAudioFrameDesc( inputAudioCodec.getAudioFrameDesc() );
-		_inputEssence = generatorAudio;
-
 		// Create inputFrame, and outputFrame which is based on a given profile
-		AudioFrameDesc inputFrameDesc = inputAudioCodec.getAudioFrameDesc();
+		AudioFrameDesc inputFrameDesc = static_cast<GeneratorAudio&>( inputEssence ).getAudioFrameDesc();
 		AudioFrameDesc outputFrameDesc = inputFrameDesc;
 		outputFrameDesc.setParameters( profile );
 		_sourceBuffer = new AudioFrame( inputFrameDesc );
@@ -251,10 +239,12 @@ StreamTranscoder::~StreamTranscoder()
 {
 	delete _frameBuffer;
 	delete _sourceBuffer;
+	// _inputEssence is a link to an existing InputEssence if _generatorEssence is NULL
+	if( _generatorEssence )
+		delete _inputEssence;
 	delete _generatorEssence;
 	delete _outputEssence;
 	delete _transform;
-	delete _inputEssence;
 }
 
 void StreamTranscoder::init()
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
index 8957898c..e8f487d1 100644
--- a/src/AvTranscoder/transcoder/StreamTranscoder.hpp
+++ b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -36,7 +36,7 @@ class AvExport StreamTranscoder
 	 * @brief encode from a generated stream
 	 * @note offset feature has no sense here
 	 **/
-	StreamTranscoder( const ICodec& inputCodec, OutputFile& outputFile, const Profile::ProfileDesc& profile );
+	StreamTranscoder( IInputEssence& inputEssence, OutputFile& outputFile, const Profile::ProfileDesc& profile );
 
 	~StreamTranscoder();
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
index 8a7b15c8..77d957b7 100644
--- a/src/AvTranscoder/transcoder/Transcoder.cpp
+++ b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -1,5 +1,8 @@
 #include "Transcoder.hpp"
 
+#include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
+#include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
+
 #include <limits>
 #include <iostream>
 #include <algorithm>
@@ -30,6 +33,10 @@ Transcoder::~Transcoder()
 	{
 		delete (*it);
 	}
+	for( std::vector< IInputEssence* >::iterator it = _internalEssences.begin(); it != _internalEssences.end(); ++it )
+	{
+		delete (*it);
+	}
 }
 
 void Transcoder::add( const std::string& filename, const size_t streamIndex, const std::string& profileName, const size_t offset )
@@ -364,16 +371,30 @@ void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const ICod
 	if( ! profile.count( constants::avProfileType ) )
 		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
 
-	if( _verbose )
+	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
 	{
-		if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
+		if( _verbose )
 			std::cout << "add a generated video stream" << std::endl;
-		else if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
-			std::cout << "add a generated audio stream" << std::endl;
+
+		GeneratorVideo* video = new GeneratorVideo();
+		video->setVideoFrameDesc( static_cast<const VideoCodec&>( codec ).getVideoFrameDesc() );
+		_internalEssences.push_back( video );
+
+		_streamTranscodersAllocated.push_back( new StreamTranscoder( *video, _outputFile, profile ) );
+		_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 	}
+	else if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
+	{
+		if( _verbose )
+			std::cout << "add a generated audio stream" << std::endl;
 
-	_streamTranscodersAllocated.push_back( new StreamTranscoder( codec, _outputFile, profile ) );
-	_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
+		GeneratorAudio* audio = new GeneratorAudio();
+		audio->setAudioFrameDesc( static_cast<const AudioCodec&>( codec ).getAudioFrameDesc() );
+		_internalEssences.push_back( audio );
+
+		_streamTranscodersAllocated.push_back( new StreamTranscoder( *audio, _outputFile, profile ) );
+		_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
+	}
 }
 
 InputFile* Transcoder::addInputFile( const std::string& filename, const size_t streamIndex )
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
index e184a4cb..f48820cb 100644
--- a/src/AvTranscoder/transcoder/Transcoder.hpp
+++ b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -6,10 +6,8 @@
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/file/OutputFile.hpp>
 
-#include <AvTranscoder/codedStream/IInputStream.hpp>
-
-#include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
-#include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
+#include <AvTranscoder/essenceStream/IInputEssence.hpp>
+#include <AvTranscoder/essenceStream/IOutputEssence.hpp>
 
 #include <AvTranscoder/progress/IProgress.hpp>
 
@@ -172,6 +170,8 @@ class AvExport Transcoder
 	std::vector< StreamTranscoder* > _streamTranscoders;  ///< All streams of the output media file after process.
 	std::vector< StreamTranscoder* > _streamTranscodersAllocated;  ///< Streams allocated inside the Transcoder.
 
+	std::vector< IInputEssence* > _internalEssences;  ///< Internal essences allocated inside the Transcoder.
+
 	Profile _profile;  ///< Objet to get existing profiles, and add new ones for the Transcoder.
 
 	EProcessMethod _eProcessMethod;
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py
index 7f6461f8..e49d5bba 100644
--- a/test/pyTest/testSetFrame.py
+++ b/test/pyTest/testSetFrame.py
@@ -9,6 +9,7 @@ def testSetVideoFrame():
 	"""
 	Generate a video stream, and set its frame during process.
 	"""
+	profile = av.Profile(True)
 
 	# create output
 	outputFileName = "testSetVideoFrame.mov"
@@ -26,13 +27,13 @@ def testSetVideoFrame():
 
 	imageDesc.setPixel( inputPixel );
 
-	inputVideoCodec = av.VideoCodec( av.eCodecTypeEncoder, "mpeg2video" );
-	inputVideoCodec.setImageParameters( imageDesc );
+	video = av.GeneratorVideo()
+	video.setVideoFrameDesc( imageDesc )
 
 	# create transcoder and add a video stream
 	transcoder = av.Transcoder( ouputFile )
-	transcoder.add(  "", 0, "xdcamhd422", inputVideoCodec )
-	videoEssence = transcoder.getStreamTranscoder( 0 ).getCurrentEssence()
+	streamTranscoder = av.StreamTranscoder( video, ouputFile, profile.getProfile( "xdcamhd422" ) )
+	transcoder.add( streamTranscoder )
 
 	# start process
 	transcoder.init()
@@ -44,7 +45,7 @@ def testSetVideoFrame():
 		# set video frame
 		frame = av.VideoFrame( imageDesc )
 		frame.getBuffer().assign(frame.getBuffer().size(), i)
-		videoEssence.setFrame( frame )
+		video.setFrame( frame )
 
 	# end process
 	ouputFile.endWrap()
@@ -63,11 +64,11 @@ def testSetVideoFrame():
 	assert_equals( 16, dst_videoStream.dar.num )
 	assert_equals( 9, dst_videoStream.dar.den )
 
-
 def testSetAudioFrame():
 	"""
 	Generate a audio stream, and set its frame during process.
 	"""
+	profile = av.Profile(True)
 
 	# create output
 	outputFileName = "testSetAudioFrame.wav"
@@ -79,13 +80,13 @@ def testSetAudioFrame():
 	audioDesc.setChannels( 1 )
 	audioDesc.setSampleFormat( "s32" )
 
-	inputAudioCodec = av.AudioCodec( av.eCodecTypeEncoder, "pcm_s24le" );
-	inputAudioCodec.setAudioParameters( audioDesc );
+	audio = av.GeneratorAudio()
+	audio.setAudioFrameDesc( audioDesc )
 
 	# create transcoder and add a video stream
 	transcoder = av.Transcoder( ouputFile )
-	transcoder.add(  "", 0, "wave24b48kmono", inputAudioCodec )
-	audioEssence = transcoder.getStreamTranscoder( 0 ).getCurrentEssence()
+	streamTranscoder = av.StreamTranscoder( audio, ouputFile, profile.getProfile( "wave24b48kmono" ) )
+	transcoder.add(  streamTranscoder )
 
 	# start process
 	transcoder.init()
@@ -97,7 +98,7 @@ def testSetAudioFrame():
 		# set video frame
 		frame = av.AudioFrame( audioDesc )
 		frame.getBuffer().assign(frame.getBuffer().size(), i)
-		audioEssence.setFrame( frame )
+		audio.setFrame( frame )
 
 	# end process
 	ouputFile.endWrap()