adding EssenceTransform in StreamTranscoder

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit ffeece9d48af · 2014-07-03T07:06:31.000-04:00
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -3,6 +3,9 @@
 
 #include <AvTranscoder/CodedStream/AvInputStream.hpp>
 
+#include <AvTranscoder/EssenceTransform/AudioEssenceTransform.hpp>
+#include <AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp>
+
 #include <cassert>
 
 namespace avtranscoder
@@ -14,11 +17,13 @@ StreamTranscoder::StreamTranscoder(
 	)
 	: _inputStream( &inputStream )
 	, _outputStream( NULL )
+	, _sourceBuffer( NULL )
 	, _frameBuffer( NULL )
 	, _videoFrameBuffer( NULL )
 	, _audioFrameBuffer( NULL )
 	, _inputEssence( NULL )
 	, _outputEssence( NULL )
+	, _transform( NULL )
 	, _transcodeStream( false )
 {
 	// create a re-wrapping case
@@ -46,11 +51,13 @@ StreamTranscoder::StreamTranscoder(
 	)
 	: _inputStream( &inputStream )
 	, _outputStream( NULL )
+	, _sourceBuffer( NULL )
 	, _frameBuffer( NULL )
 	, _videoFrameBuffer( NULL )
 	, _audioFrameBuffer( NULL )
 	, _inputEssence( NULL )
 	, _outputEssence( NULL )
+	, _transform( NULL )
 	, _transcodeStream( true )
 {
 	// create a transcode case
@@ -67,9 +74,13 @@ StreamTranscoder::StreamTranscoder(
 			_outputEssence->setProfile( profile );
 			
 			_outputStream = &outputFile.addVideoStream( outputVideo->getVideoDesc() );
+
+			_sourceBuffer = new Image( _inputStream->getVideoDesc().getImageDesc() );
 			_videoFrameBuffer = new Image( outputVideo->getVideoDesc().getImageDesc() );
 			_frameBuffer = _videoFrameBuffer;
 			
+			_transform = new VideoEssenceTransform();
+
 			break;
 		}
 		case AVMEDIA_TYPE_AUDIO :
@@ -83,9 +94,13 @@ StreamTranscoder::StreamTranscoder(
 			_outputEssence->setProfile( profile );
 
 			_outputStream = &outputFile.addAudioStream( outputAudio->getAudioDesc() );
+
+			_sourceBuffer = new AudioFrame( _inputStream->getAudioDesc().getFrameDesc() );
 			_audioFrameBuffer = new AudioFrame( outputAudio->getAudioDesc().getFrameDesc() );
 			_frameBuffer = _audioFrameBuffer;
 			
+			_transform = new AudioEssenceTransform();
+
 			break;
 		}
 		default:
@@ -103,11 +118,13 @@ StreamTranscoder::StreamTranscoder(
 	)
 	: _inputStream( NULL )
 	, _outputStream( NULL )
+	, _sourceBuffer( NULL )
 	, _frameBuffer( NULL )
 	, _videoFrameBuffer( NULL )
 	, _audioFrameBuffer( NULL )
 	, _inputEssence( &inputEssence )
 	, _outputEssence( NULL )
+	, _transform( NULL )
 	, _transcodeStream( true )
 {
 	if( ! profile.count( Profile::avProfileType ) )
@@ -177,14 +194,15 @@ bool StreamTranscoder::processTranscode()
 {
 	assert( _inputEssence  != NULL );
 	assert( _outputEssence != NULL );
+	assert( _sourceBuffer  != NULL );
 	assert( _frameBuffer   != NULL );
 
 	std::cout << "transcode" << std::endl; 
 
 	DataStream dataStream;
-	if( _inputEssence->readNextFrame( *_frameBuffer ) )
+	if( _inputEssence->readNextFrame( *_sourceBuffer ) )
 	{
-		std::cout << "encode" << std::endl;
+		_transform->convert( *_sourceBuffer, *_frameBuffer );
 		_outputEssence->encodeFrame( *_frameBuffer, dataStream );
 	}
 	else
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.hpp b/src/AvTranscoder/Transcoder/StreamTranscoder.hpp
@@ -16,6 +16,8 @@
 namespace avtranscoder
 {
 
+class EssenceTransform;
+
 class StreamTranscoder
 {
 public:
@@ -52,13 +54,16 @@ class StreamTranscoder
 	InputStream*   _inputStream;
 	OutputStream*  _outputStream;
 
+	Frame*         _sourceBuffer;
 	Frame*         _frameBuffer;
 	Image*         _videoFrameBuffer;
 	AudioFrame*    _audioFrameBuffer;
 
 	InputEssence*  _inputEssence;
 	OutputEssence* _outputEssence;
 
+	EssenceTransform* _transform;
+
 	bool _transcodeStream;
 
 
