Merge pull request #43 from cchampet/dev_StreamTranscoder_Dummy

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 3e97128390eb · 2014-08-05T11:01:29.000+02:00
Stream transcoder: update constructor from dummy stream
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -176,13 +176,17 @@ StreamTranscoder::StreamTranscoder(
 		OutputVideo* outputVideo = new OutputVideo();
 		
 		_outputEssence = outputVideo;
-		VideoFrameDesc inputVideoFrameDesc = static_cast<DummyVideo*>( _inputEssence )->getVideoDesc().getVideoFrameDesc();
-		outputVideo->setProfile( profile, inputVideoFrameDesc );
+
+		VideoFrameDesc inputFrameDesc = static_cast<DummyVideo*>( _inputEssence )->getVideoDesc().getVideoFrameDesc();
+
+		VideoFrameDesc outputFrameDesc = inputFrameDesc;
+		outputFrameDesc.setParameters( profile );
+		outputVideo->setProfile( profile, outputFrameDesc );
 
 		_outputStream = &outputFile.addVideoStream( outputVideo->getVideoDesc() );
-		_sourceBuffer = new VideoFrame( outputVideo->getVideoDesc().getVideoFrameDesc() );
-		_frameBuffer  = new VideoFrame( outputVideo->getVideoDesc().getVideoFrameDesc() );
-		
+		_sourceBuffer = new VideoFrame( inputFrameDesc );
+		_frameBuffer  = new VideoFrame( outputFrameDesc );
+
 		_transform = new VideoEssenceTransform();
 
 		_currentEssence = _inputEssence;		
@@ -195,14 +199,16 @@ StreamTranscoder::StreamTranscoder(
 		OutputAudio* outputAudio = new OutputAudio();
 
 		_outputEssence = outputAudio;
-		AudioFrameDesc inputAudioFrameDesc = static_cast<DummyAudio*>( _inputEssence )->getAudioDesc().getFrameDesc();
-		outputAudio->setProfile( profile, inputAudioFrameDesc );
-		
-		static_cast<DummyAudio*>( _inputEssence )->setAudioDesc( outputAudio->getAudioDesc() );
-		
+
+		AudioFrameDesc inputFrameDesc = static_cast<DummyAudio*>( _inputEssence )->getAudioDesc().getFrameDesc();
+
+		AudioFrameDesc outputFrameDesc = inputFrameDesc;
+		outputFrameDesc.setParameters( profile );
+		outputAudio->setProfile( profile, outputFrameDesc );
+
 		_outputStream = &outputFile.addAudioStream( outputAudio->getAudioDesc() );
-		_sourceBuffer = new AudioFrame( outputAudio->getAudioDesc().getFrameDesc() );
-		_frameBuffer  = new AudioFrame( outputAudio->getAudioDesc().getFrameDesc() );
+		_sourceBuffer = new AudioFrame( inputFrameDesc );
+		_frameBuffer  = new AudioFrame( outputFrameDesc );
 
 		_transform = new AudioEssenceTransform();
 		
@@ -292,7 +298,7 @@ bool StreamTranscoder::processTranscode()
 	if( _verbose )
 		std::cout << "transcode a frame " << std::endl;
 	if( _currentEssence->readNextFrame( *_sourceBuffer ) )
-	{ 
+	{
 		if( _verbose )
 			std::cout << "convert " << _sourceBuffer->getSize() << std::endl;
 		_transform->convert( *_sourceBuffer, *_frameBuffer );
