fix transcoder for dummy streams

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit b664bf3e3c91 · 2014-07-02T08:13:07.000-04:00
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -110,39 +110,36 @@ StreamTranscoder::StreamTranscoder(
 	, _outputEssence( NULL )
 	, _transcodeStream( true )
 {
-	// create an encoder case from a dummy
-	switch( _inputStream->getStreamType() )
+	if( ! profile.count( Profile::avProfileType ) )
+		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
+
+	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeAudio )
 	{
-		case AVMEDIA_TYPE_VIDEO :
-		{
-			OutputVideo* outputVideo = new OutputVideo();
-			_outputEssence = outputVideo;
+		OutputAudio* outputAudio = new OutputAudio();
 
-			_outputEssence->setProfile( profile );
-			_outputStream = &outputFile.addVideoStream( outputVideo->getVideoDesc() );
-			_videoFrameBuffer = new Image( outputVideo->getVideoDesc().getImageDesc() );
-			_frameBuffer = _videoFrameBuffer;
-			
-			break;
-		}
-		case AVMEDIA_TYPE_AUDIO :
-		{
-			OutputAudio* outputAudio = new OutputAudio();
-			_outputEssence = outputAudio;
+		_outputEssence = outputAudio;
+		_outputEssence->setProfile( profile );
 
-			_outputEssence->setProfile( profile );
-			_outputStream = &outputFile.addAudioStream( outputAudio->getAudioDesc() );
-			_audioFrameBuffer = new AudioFrame( outputAudio->getAudioDesc().getFrameDesc() );
-			_frameBuffer = _audioFrameBuffer;
-			
-			break;
-		}
-		default:
-		{
-			throw std::runtime_error( "unupported stream type" );
-			break;
-		}
+		_outputStream = &outputFile.addAudioStream( outputAudio->getAudioDesc() );
+		_audioFrameBuffer = new AudioFrame( outputAudio->getAudioDesc().getFrameDesc() );
+		_frameBuffer = _audioFrameBuffer;
+		return;
 	}
+
+	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeVideo )
+	{
+		OutputVideo* outputVideo = new OutputVideo();
+
+		_outputEssence = outputVideo;
+		_outputEssence->setProfile( profile );
+
+		_outputStream = &outputFile.addVideoStream( outputVideo->getVideoDesc() );
+		_videoFrameBuffer = new Image( outputVideo->getVideoDesc().getImageDesc() );
+		_frameBuffer = _videoFrameBuffer;
+		return;
+	}
+
+	throw std::runtime_error( "unupported stream type" );
 }
 
 StreamTranscoder::~StreamTranscoder()
@@ -182,19 +179,24 @@ bool StreamTranscoder::processTranscode()
 	assert( _outputEssence != NULL );
 	assert( _frameBuffer   != NULL );
 
+	std::cout << "transcode" << std::endl; 
+
 	DataStream dataStream;
 	if( _inputEssence->readNextFrame( *_frameBuffer ) )
 	{
+		std::cout << "encode" << std::endl;
 		_outputEssence->encodeFrame( *_frameBuffer, dataStream );
 	}
 	else
 	{
+		std::cout << "encode last frame" << std::endl;
 		if( ! _outputEssence->encodeFrame( dataStream ) )
 		{
 			return false;
 		}
 	}
 
+	std::cout << "wrap" << std::endl;
 	_outputStream->wrap( dataStream );
 	return true;
 }
diff --git a/src/AvTranscoder/Transcoder/Transcoder.cpp b/src/AvTranscoder/Transcoder/Transcoder.cpp
@@ -66,17 +66,17 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro
 
 bool Transcoder::processFrame()
 {
-	for( size_t streamIndex = 0; streamIndex < _inputStreams.size(); ++streamIndex )
+	if( _verbose )
+		std::cout << "process frame" << std::endl;
+	for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )
 	{
-		if( ( _streamTranscoders.size() > streamIndex ) &&
-			! _streamTranscoders.at( streamIndex )->processFrame() )
+		if( ! _streamTranscoders.at( streamIndex )->processFrame() )
 		{
-			//_inputStreams.erase( _inputStreams.begin() + streamIndex );
-			_inputStreams.clear();
+			_streamTranscoders.clear();
 		}
 	}
 
-	if( _inputStreams.size() == 0 )
+	if( _streamTranscoders.size() == 0 )
 	{
 		return false;
 	}
@@ -164,13 +164,15 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 		default:
 		{
 			throw std::runtime_error( "unsupported media type in transcode setup" );
-			return;
 		}
 	}
 }
 
 void Transcoder::addDummyStream( Profile::ProfileDesc& profile )
 {
+	if( ! profile.count( Profile::avProfileType ) )
+		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
+
 	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeAudio )
 	{
 		_dummyAudio.push_back( new DummyAudio() );

Original file line number	Diff line number	Diff line change
`@@ -66,17 +66,17 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro`
`66`	`66`
`67`	`67`	`bool Transcoder::processFrame()`
`68`	`68`	`{`
`69`		`- for( size_t streamIndex = 0; streamIndex < _inputStreams.size(); ++streamIndex )`
	`69`	`+ if( _verbose )`
	`70`	`+ std::cout << "process frame" << std::endl;`
	`71`	`+ for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )`
`70`	`72`	`{`
`71`		`- if( ( _streamTranscoders.size() > streamIndex ) &&`
`72`		`- ! _streamTranscoders.at( streamIndex )->processFrame() )`
	`73`	`+ if( ! _streamTranscoders.at( streamIndex )->processFrame() )`
`73`	`74`	`{`
`74`		`- //_inputStreams.erase( _inputStreams.begin() + streamIndex );`
`75`		`- _inputStreams.clear();`
	`75`	`+ _streamTranscoders.clear();`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`- if( _inputStreams.size() == 0 )`
	`79`	`+ if( _streamTranscoders.size() == 0 )`
`80`	`80`	`{`
`81`	`81`	`return false;`
`82`	`82`	`}`
`@@ -164,13 +164,15 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s`
`164`	`164`	`default:`
`165`	`165`	`{`
`166`	`166`	`throw std::runtime_error( "unsupported media type in transcode setup" );`
`167`		`- return;`
`168`	`167`	`}`
`169`	`168`	`}`
`170`	`169`	`}`
`171`	`170`
`172`	`171`	`void Transcoder::addDummyStream( Profile::ProfileDesc& profile )`
`173`	`172`	`{`
	`173`	`+ if( ! profile.count( Profile::avProfileType ) )`
	`174`	`+ throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );`
	`175`	`+`
`174`	`176`	`if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeAudio )`
`175`	`177`	`{`
`176`	`178`	`_dummyAudio.push_back( new DummyAudio() );`