AvOutputVideo/Audio: need the codec name to construct the encoder

Clement Champetier · Clement Champetier · commit 6b1c304ca96d · 2015-01-12T17:54:10.000+01:00
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -36,7 +36,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 	VideoFrame sourceImage( VideoFrameDesc );
 
 	// init video encoder
-	AvOutputVideo outputVideo;
+	AvOutputVideo outputVideo( "mpeg2video" );
 	outputVideo.setProfile( profileLoader.getProfile( "xdcamhd422" ), VideoFrameDesc );
 	VideoFrame imageToEncode( outputVideo.getVideoCodec().getVideoFrameDesc() );
 	
diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
@@ -27,13 +27,13 @@ int main( int argc, char** argv )
 		try{
 			if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeVideo )
 			{
-				avtranscoder::AvOutputVideo outputVideo;
+				avtranscoder::AvOutputVideo outputVideo( profile.at( avtranscoder::constants::avProfileCodec ) );
 				outputVideo.setProfile( profile, outputVideo.getVideoCodec().getVideoFrameDesc() );
 			}
 
 			if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )
 			{
-				avtranscoder::AvOutputAudio outputAudio;
+				avtranscoder::AvOutputAudio outputAudio( profile.at( avtranscoder::constants::avProfileCodec ) );
 				outputAudio.setProfile( profile, outputAudio.getAudioCodec().getAudioFrameDesc() );
 			}
 		}
diff --git a/src/AvTranscoder/essenceStream/AvOutputAudio.cpp b/src/AvTranscoder/essenceStream/AvOutputAudio.cpp
@@ -12,8 +12,8 @@ extern "C" {
 namespace avtranscoder
 {
 
-AvOutputAudio::AvOutputAudio()
-	: _codec( eCodecTypeEncoder, "pcm_s16le" )
+AvOutputAudio::AvOutputAudio( const std::string& audioCodecName )
+	: _codec( eCodecTypeEncoder, audioCodecName )
 	, _verbose( false )
 {
 }
diff --git a/src/AvTranscoder/essenceStream/AvOutputAudio.hpp b/src/AvTranscoder/essenceStream/AvOutputAudio.hpp
@@ -11,7 +11,7 @@ namespace avtranscoder
 class AvExport AvOutputAudio : public IOutputEssence
 {
 public:
-	AvOutputAudio();
+	AvOutputAudio( const std::string& audioCodecName );
 	
 	void setup();
 
diff --git a/src/AvTranscoder/essenceStream/AvOutputVideo.cpp b/src/AvTranscoder/essenceStream/AvOutputVideo.cpp
@@ -13,8 +13,8 @@ extern "C" {
 namespace avtranscoder
 {
 
-AvOutputVideo::AvOutputVideo( )
-	: _codec( eCodecTypeEncoder, "mpeg2video" )
+AvOutputVideo::AvOutputVideo( const std::string& videoCodecName )
+	: _codec( eCodecTypeEncoder, videoCodecName )
 	, _verbose( false )
 {
 }
diff --git a/src/AvTranscoder/essenceStream/AvOutputVideo.hpp b/src/AvTranscoder/essenceStream/AvOutputVideo.hpp
@@ -11,7 +11,7 @@ namespace avtranscoder
 class AvExport AvOutputVideo : public IOutputEssence
 {
 public:
-	AvOutputVideo();
+	AvOutputVideo( const std::string& videoCodecName );
 
 	void setup();
 
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -96,7 +96,7 @@ StreamTranscoder::StreamTranscoder(
 			_inputEssence = new AvInputVideo( *static_cast<AvInputStream*>( _inputStream ) );
 			_inputEssence->setup();
 
-			AvOutputVideo* outputVideo = new AvOutputVideo();
+			AvOutputVideo* outputVideo = new AvOutputVideo( profile.at( constants::avProfileCodec ) );
 
 			_outputEssence = outputVideo;
 
@@ -122,7 +122,7 @@ StreamTranscoder::StreamTranscoder(
 			_inputEssence = new AvInputAudio( *static_cast<AvInputStream*>( _inputStream ) );
 			_inputEssence->setup();
 			
-			AvOutputAudio* outputAudio = new AvOutputAudio();
+			AvOutputAudio* outputAudio = new AvOutputAudio( profile.at( constants::avProfileCodec )  );
 
 			_outputEssence = outputAudio;
 			
@@ -203,7 +203,7 @@ StreamTranscoder::StreamTranscoder(
 		_frameBuffer  = new VideoFrame( outputFrameDesc );
 
 		// Create output essence
-		AvOutputVideo* outputVideo = new AvOutputVideo();
+		AvOutputVideo* outputVideo = new AvOutputVideo( profile.at( constants::avProfileCodec ) );
 		outputVideo->setProfile( profile, outputFrameDesc );
 		_outputEssence = outputVideo;
 
@@ -230,7 +230,7 @@ StreamTranscoder::StreamTranscoder(
 		_frameBuffer  = new AudioFrame( outputFrameDesc );
 
 		// Create output essence
-		AvOutputAudio* outputAudio = new AvOutputAudio();
+		AvOutputAudio* outputAudio = new AvOutputAudio( profile.at( constants::avProfileCodec ) );
 		outputAudio->setProfile( profile, outputFrameDesc );
 		_outputEssence = outputAudio;
 

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ int main( int argc, char** argv )`
`27`	`27`	`try{`
`28`	`28`	`if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeVideo )`
`29`	`29`	`{`
`30`		`- avtranscoder::AvOutputVideo outputVideo;`
	`30`	`+ avtranscoder::AvOutputVideo outputVideo( profile.at( avtranscoder::constants::avProfileCodec ) );`
`31`	`31`	`outputVideo.setProfile( profile, outputVideo.getVideoCodec().getVideoFrameDesc() );`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )`
`35`	`35`	`{`
`36`		`- avtranscoder::AvOutputAudio outputAudio;`
	`36`	`+ avtranscoder::AvOutputAudio outputAudio( profile.at( avtranscoder::constants::avProfileCodec ) );`
`37`	`37`	`outputAudio.setProfile( profile, outputAudio.getAudioCodec().getAudioFrameDesc() );`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ extern "C" {`
`12`	`12`	`namespace avtranscoder`
`13`	`13`	`{`
`14`	`14`
`15`		`-AvOutputAudio::AvOutputAudio()`
`16`		`- : _codec( eCodecTypeEncoder, "pcm_s16le" )`
	`15`	`+AvOutputAudio::AvOutputAudio( const std::string& audioCodecName )`
	`16`	`+ : _codec( eCodecTypeEncoder, audioCodecName )`
`17`	`17`	`, _verbose( false )`
`18`	`18`	`{`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace avtranscoder`
`11`	`11`	`class AvExport AvOutputAudio : public IOutputEssence`
`12`	`12`	`{`
`13`	`13`	`public:`
`14`		`- AvOutputAudio();`
	`14`	`+ AvOutputAudio( const std::string& audioCodecName );`
`15`	`15`
`16`	`16`	`void setup();`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ extern "C" {`
`13`	`13`	`namespace avtranscoder`
`14`	`14`	`{`
`15`	`15`
`16`		`-AvOutputVideo::AvOutputVideo( )`
`17`		`- : _codec( eCodecTypeEncoder, "mpeg2video" )`
	`16`	`+AvOutputVideo::AvOutputVideo( const std::string& videoCodecName )`
	`17`	`+ : _codec( eCodecTypeEncoder, videoCodecName )`
`18`	`18`	`, _verbose( false )`
`19`	`19`	`{`
`20`	`20`	`}`