Include StreamTranscoder into Transcoder

Valentin Noel · Valentin Noel · commit e9bae725d727 · 2014-06-12T19:13:20.000+02:00
diff --git a/src/AvTranscoder/Transcoder.hpp b/src/AvTranscoder/Transcoder.hpp
@@ -7,7 +7,7 @@
 #include <AvTranscoder/ProgressListener.hpp>
 #include <AvTranscoder/DummyInputStream.hpp>
 
-// #include <AvTranscoder/StreamTranscoder.hpp>
+#include <AvTranscoder/StreamTranscoder.hpp>
 
 #include <string>
 #include <vector>
@@ -47,7 +47,7 @@ class Transcoder
 	std::vector< InputFile* >        _inputFiles;
 
 	std::vector< InputStream* >      _inputStreams;
-	// std::vector< StreamTranscoder* > _streamTranscoders;
+	std::vector< StreamTranscoder* > _streamTranscoders;
 
 	std::vector< DummyInputStream* > _dummyInputStreams;
 };
diff --git a/src/AvTranscoder/Transcoder.tcc b/src/AvTranscoder/Transcoder.tcc
@@ -68,19 +68,19 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 		{
 			std::cout << "[Transcoder::add] AVMEDIA_TYPE_VIDEO" << std::endl;
 			_inputStreams.push_back( & referenceFile->getStream( streamIndex ) );
-			// StreamTranscoder streamTranscoder( referenceFile->getStream( streamIndex ), true );
-			// streamTranscoder.init( profile );
-			// _streamTranscoders.push_back( & streamTranscoder );
+			StreamTranscoder streamTranscoder( referenceFile->getStream( streamIndex ), true );
+			streamTranscoder.init( profile );
+			_streamTranscoders.push_back( & streamTranscoder );
 			_outputFile.addVideoStream( _inputStreams.back()->getVideoDesc() );
 			break;
 		}
 		case AVMEDIA_TYPE_AUDIO:
 		{
 			std::cout << "[Transcoder::add] AVMEDIA_TYPE_AUDIO" << std::endl;
 			_inputStreams.push_back( & referenceFile->getStream( streamIndex ) );
-			// StreamTranscoder streamTranscoder( referenceFile->getStream( streamIndex ), false );
-			// streamTranscoder.init( profile );
-			// _streamTranscoders.push_back( & streamTranscoder );
+			StreamTranscoder streamTranscoder( referenceFile->getStream( streamIndex ), false );
+			streamTranscoder.init( profile );
+			_streamTranscoders.push_back( & streamTranscoder );
 			_outputFile.addAudioStream( _inputStreams.back()->getAudioDesc() );
 			break;
 		}
@@ -110,7 +110,7 @@ void Transcoder::add( const StreamDefinitions& streamDefs )
 		     streamDefs.at( streamDest ).transcodeProfile );
 	}
 	std::cout << "[Transcoder::add]      _inputStreams: " << _inputStreams.size() << std::endl;
-	// std::cout << "[Transcoder::add] _streamTranscoders: " << _streamTranscoders.size() << std::endl;
+	std::cout << "[Transcoder::add] _streamTranscoders: " << _streamTranscoders.size() << std::endl;
 	return;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,19 +68,19 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con`
`68`	`68`	`{`
`69`	`69`	`std::cout << "[Transcoder::add] AVMEDIA_TYPE_VIDEO" << std::endl;`
`70`	`70`	`_inputStreams.push_back( & referenceFile->getStream( streamIndex ) );`
`71`		`- // StreamTranscoder streamTranscoder( referenceFile->getStream( streamIndex ), true );`
`72`		`- // streamTranscoder.init( profile );`
`73`		`- // _streamTranscoders.push_back( & streamTranscoder );`
	`71`	`+ StreamTranscoder streamTranscoder( referenceFile->getStream( streamIndex ), true );`
	`72`	`+ streamTranscoder.init( profile );`
	`73`	`+ _streamTranscoders.push_back( & streamTranscoder );`
`74`	`74`	`_outputFile.addVideoStream( _inputStreams.back()->getVideoDesc() );`
`75`	`75`	`break;`
`76`	`76`	`}`
`77`	`77`	`case AVMEDIA_TYPE_AUDIO:`
`78`	`78`	`{`
`79`	`79`	`std::cout << "[Transcoder::add] AVMEDIA_TYPE_AUDIO" << std::endl;`
`80`	`80`	`_inputStreams.push_back( & referenceFile->getStream( streamIndex ) );`
`81`		`- // StreamTranscoder streamTranscoder( referenceFile->getStream( streamIndex ), false );`
`82`		`- // streamTranscoder.init( profile );`
`83`		`- // _streamTranscoders.push_back( & streamTranscoder );`
	`81`	`+ StreamTranscoder streamTranscoder( referenceFile->getStream( streamIndex ), false );`
	`82`	`+ streamTranscoder.init( profile );`
	`83`	`+ _streamTranscoders.push_back( & streamTranscoder );`
`84`	`84`	`_outputFile.addAudioStream( _inputStreams.back()->getAudioDesc() );`
`85`	`85`	`break;`
`86`	`86`	`}`
`@@ -110,7 +110,7 @@ void Transcoder::add( const StreamDefinitions& streamDefs )`
`110`	`110`	`streamDefs.at( streamDest ).transcodeProfile );`
`111`	`111`	`}`
`112`	`112`	`std::cout << "[Transcoder::add] _inputStreams: " << _inputStreams.size() << std::endl;`
`113`		`- // std::cout << "[Transcoder::add] _streamTranscoders: " << _streamTranscoders.size() << std::endl;`
	`113`	`+ std::cout << "[Transcoder::add] _streamTranscoders: " << _streamTranscoders.size() << std::endl;`
`114`	`114`	`return;`
`115`	`115`	`}`
`116`	`116`