Add EssenceTransform into StreamTranscoder

Valentin Noel · Valentin Noel · commit c4fec74c425b · 2014-06-25T18:56:26.000+02:00
diff --git a/src/AvTranscoder/StreamTranscoder.cpp b/src/AvTranscoder/StreamTranscoder.cpp
@@ -1,12 +1,17 @@
 
+#include <AvTranscoder/EssenceTransform/AudioTransform.hpp>
+#include <AvTranscoder/EssenceTransform/ColorTransform.hpp>
+
 #include "StreamTranscoder.hpp"
 
 namespace avtranscoder
 {
 
 StreamTranscoder::StreamTranscoder( AvInputStream& stream, OutputFile& outputFile, const size_t& streamId )
 	: _stream( &stream )
+	, _sourceBuffer( NULL )
 	, _frameBuffer( NULL )
+	, _transform( NULL )
 	, _inputStreamReader( NULL )
 	, _outputStreamWriter( NULL )
 	, _outputFile( &outputFile )
@@ -17,6 +22,8 @@ StreamTranscoder::StreamTranscoder( AvInputStream& stream, OutputFile& outputFil
 
 StreamTranscoder::~StreamTranscoder()
 {
+	if( _sourceBuffer )
+		delete _sourceBuffer;
 	if( _frameBuffer )
 		delete _frameBuffer;
 	if( _inputStreamReader )
@@ -33,16 +40,20 @@ void StreamTranscoder::init( const std::string& profile )
 	{
 		case AVMEDIA_TYPE_VIDEO :
 		{
-			_inputStreamReader = new InputStreamVideo( *_stream );
-			_inputStreamReader->setup();
-
 			// re-wrap only, get output descriptor from input
 			if( profile.empty() )
 			{
 				_outputFile->addVideoStream( _stream->getVideoDesc() );
 				break;
 			}
 
+			_inputStreamReader = new InputStreamVideo( *_stream );
+			_inputStreamReader->setup();
+
+			_sourceBuffer = new Image( _stream->getVideoDesc().getImageDesc() );
+
+			_transform = new ColorTransform();
+
 			OutputStreamVideo* outputStreamVideo = new OutputStreamVideo();
 			_outputStreamWriter = outputStreamVideo;
 
@@ -55,16 +66,20 @@ void StreamTranscoder::init( const std::string& profile )
 		}
 		case AVMEDIA_TYPE_AUDIO :
 		{
-			_inputStreamReader = new InputStreamAudio( *_stream );
-			_inputStreamReader->setup();
-
 			// re-wrap only, get output descriptor from input
 			if( profile.empty() )
 			{
 				_outputFile->addAudioStream( _stream->getAudioDesc() );
 				break;
 			}
-			
+
+			_inputStreamReader = new InputStreamAudio( *_stream );
+			_inputStreamReader->setup();
+
+			_sourceBuffer = new AudioFrame( _stream->getAudioDesc().getFrameDesc() );
+
+			_transform = new AudioTransform();
+
 			OutputStreamAudio* outputStreamAudio = new OutputStreamAudio();
 			_outputStreamWriter = outputStreamAudio;
 
@@ -92,9 +107,9 @@ bool StreamTranscoder::processFrame()
 	}
 
 	// std::cout << "encode & wrap" << _streamIndex << std::endl;
-
-	if( _inputStreamReader->readNextFrame( *_frameBuffer ) )
+	if( _inputStreamReader->readNextFrame( *_sourceBuffer ) )
 	{
+		_transform->convert( *_sourceBuffer, *_frameBuffer );
 		_outputStreamWriter->encodeFrame( *_frameBuffer, dataStream );
 	}
 	else if( ! _outputStreamWriter->encodeFrame( dataStream ) )
diff --git a/src/AvTranscoder/StreamTranscoder.hpp b/src/AvTranscoder/StreamTranscoder.hpp
@@ -12,6 +12,7 @@
 
 #include <AvTranscoder/File/OutputFile.hpp>
 
+#include <AvTranscoder/EssenceTransform/EssenceTransform.hpp>
 
 namespace avtranscoder
 {
@@ -31,10 +32,13 @@ class StreamTranscoder
 private:
 	AvInputStream* _stream;
 
+	Frame*      _sourceBuffer;
 	Frame*      _frameBuffer;
 	Image*      _videoFrameBuffer;
 	AudioFrame* _audioFrameBuffer;
 
+	EssenceTransform* _transform;
+
 	InputStreamReader*  _inputStreamReader;
 	OutputStreamWriter* _outputStreamWriter;
 	OutputFile* _outputFile;
