adding virtual for managing DummyInputStream and AvInputStream

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 274b159d532a · 2014-06-27T11:45:40.000-04:00
diff --git a/src/AvTranscoder/StreamTranscoder.cpp b/src/AvTranscoder/StreamTranscoder.cpp
@@ -1,10 +1,12 @@
 
 #include "StreamTranscoder.hpp"
 
+#include <AvTranscoder/AvInputStream.hpp>
+
 namespace avtranscoder
 {
 
-StreamTranscoder::StreamTranscoder( AvInputStream& stream, OutputFile& outputFile, const size_t& streamId )
+StreamTranscoder::StreamTranscoder( InputStream& stream, OutputFile& outputFile, const size_t& streamId )
 	: _stream( &stream )
 	, _frameBuffer( NULL )
 	, _inputEssence( NULL )
@@ -33,7 +35,7 @@ void StreamTranscoder::init( const std::string& profile )
 	{
 		case AVMEDIA_TYPE_VIDEO :
 		{
-			_inputEssence = new InputVideo( *_stream );
+			_inputEssence = new InputVideo( *static_cast<AvInputStream*>( _stream ) );
 			_inputEssence->setup();
 
 			// re-wrap only, get output descriptor from input
@@ -55,7 +57,7 @@ void StreamTranscoder::init( const std::string& profile )
 		}
 		case AVMEDIA_TYPE_AUDIO :
 		{
-			_inputEssence = new InputAudio( *_stream );
+			_inputEssence = new InputAudio( *static_cast<AvInputStream*>( _stream ) );
 			_inputEssence->setup();
 
 			// re-wrap only, get output descriptor from input
diff --git a/src/AvTranscoder/StreamTranscoder.hpp b/src/AvTranscoder/StreamTranscoder.hpp
@@ -1,7 +1,6 @@
 #ifndef _AV_TRANSCODER_STREAM_TRANSCODER_HPP_
 #define _AV_TRANSCODER_STREAM_TRANSCODER_HPP_
 
-#include <AvTranscoder/AvInputStream.hpp>
 #include <AvTranscoder/InputStream.hpp>
 
 #include <AvTranscoder/EssenceStream/InputVideo.hpp>
@@ -19,7 +18,7 @@ namespace avtranscoder
 class StreamTranscoder
 {
 public:
-	StreamTranscoder( AvInputStream& stream, OutputFile& outputFile, const size_t& streamId );
+	StreamTranscoder( InputStream& stream, OutputFile& outputFile, const size_t& streamId );
 	~StreamTranscoder();
 
 	void init( const std::string& profile );
diff --git a/src/AvTranscoder/Transcoder.cpp b/src/AvTranscoder/Transcoder.cpp
@@ -33,19 +33,25 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 {
 	if( ! filename.length() )
 	{
+		try
+		{
+			// be sure the first inputStream is an AvInputStream created from an audio file
+			dynamic_cast<AvInputStream*>( _inputStreams.at( 0 ) );
+		}
+		catch( std::exception& e)
+		{
+			throw std::runtime_error( "dummy stream can't be the first audio channel" );
+		}
+
 		_dummyInputStreams.push_back( new DummyInputStream() );
 		
 		_inputStreams.push_back( _dummyInputStreams.back() );
 		
-		if( _inputStreams.at( 1 ) )
-		{
-			_dummyInputStreams.back()->setAudioDesc( _inputStreams.at( 1 )->getAudioDesc() );
-			_outputFile.addAudioStream( _inputStreams.back()->getAudioDesc() );
-		}
-		else
-			std::cout << "dummy can't be the first audio channel" << std::endl;
+		_dummyInputStreams.back()->setAudioDesc( _inputStreams.at( 0 )->getAudioDesc() );
+		_outputFile.addAudioStream( _inputStreams.back()->getAudioDesc() );
 		
-		_streamTranscoders.push_back( NULL );
+		StreamTranscoder* streamTranscoder = new StreamTranscoder( *_dummyInputStreams.back(), _outputFile, _streamTranscoders.size() );
+		_streamTranscoders.push_back( streamTranscoder );
 
 		return;
 	}
@@ -107,7 +113,7 @@ void Transcoder::add( const InputStreamsDesc& streamDefs )
 		     streamDefs.at( streamDest ).transcodeProfile );
 	}
 	if( _inputStreams.size() != _streamTranscoders.size() )
-		throw std::runtime_error( "_inputStreams and _streamTranscoders must have the same number of streams" );
+		throw std::runtime_error( "error during settings streams and transcoders" );
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`
`2`	`2`	`#include "StreamTranscoder.hpp"`
`3`	`3`
	`4`	`+#include <AvTranscoder/AvInputStream.hpp>`
	`5`	`+`
`4`	`6`	`namespace avtranscoder`
`5`	`7`	`{`
`6`	`8`
`7`		`-StreamTranscoder::StreamTranscoder( AvInputStream& stream, OutputFile& outputFile, const size_t& streamId )`
	`9`	`+StreamTranscoder::StreamTranscoder( InputStream& stream, OutputFile& outputFile, const size_t& streamId )`
`8`	`10`	`: _stream( &stream )`
`9`	`11`	`, _frameBuffer( NULL )`
`10`	`12`	`, _inputEssence( NULL )`
`@@ -33,7 +35,7 @@ void StreamTranscoder::init( const std::string& profile )`
`33`	`35`	`{`
`34`	`36`	`case AVMEDIA_TYPE_VIDEO :`
`35`	`37`	`{`
`36`		`- _inputEssence = new InputVideo( *_stream );`
	`38`	`+ _inputEssence = new InputVideo( static_cast<AvInputStream>( _stream ) );`
`37`	`39`	`_inputEssence->setup();`
`38`	`40`
`39`	`41`	`// re-wrap only, get output descriptor from input`
`@@ -55,7 +57,7 @@ void StreamTranscoder::init( const std::string& profile )`
`55`	`57`	`}`
`56`	`58`	`case AVMEDIA_TYPE_AUDIO :`
`57`	`59`	`{`
`58`		`- _inputEssence = new InputAudio( *_stream );`
	`60`	`+ _inputEssence = new InputAudio( static_cast<AvInputStream>( _stream ) );`
`59`	`61`	`_inputEssence->setup();`
`60`	`62`
`61`	`63`	`// re-wrap only, get output descriptor from input`