ICodec: setCodec is a private function

Clement Champetier · Clement Champetier · commit b72c595d0026 · 2015-01-12T18:05:27.000+01:00
Need to create a new codec object if we need to set the codec.
diff --git a/src/AvTranscoder/codec/ICodec.hpp b/src/AvTranscoder/codec/ICodec.hpp
@@ -35,9 +35,6 @@ class AvExport ICodec
 	OptionMap& getOptionsMap() { return _options; }  ///< Get options as map
 
 	Option& getOption( const std::string& optionName ) { return _options.at(optionName); }
-
-	void setCodec( const ECodecType type, const std::string& codecName );
-	void setCodec( const ECodecType type, const AVCodecID codecId );
 	
 #ifndef SWIG
 	AVCodecContext& getAVCodecContext() { return *_avCodecContext; }
@@ -47,6 +44,8 @@ class AvExport ICodec
 #endif
 
 private:
+	void setCodec( const ECodecType type, const std::string& codecName );
+	void setCodec( const ECodecType type, const AVCodecID codecId );
 	void allocateContext();
 	void loadCodecOptions();
 
diff --git a/src/AvTranscoder/essenceStream/AvOutputAudio.cpp b/src/AvTranscoder/essenceStream/AvOutputAudio.cpp
@@ -166,7 +166,6 @@ void AvOutputAudio::setProfile( const ProfileLoader::Profile& profile, const Aud
 		throw std::runtime_error( "The profile " + profile.find( constants::avProfileIdentificatorHuman )->second + " is invalid." );
 	}
 	
-	_codec.setCodec( eCodecTypeEncoder, profile.find( constants::avProfileCodec )->second );
 	_codec.setAudioParameters( frameDesc );
 	
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
diff --git a/src/AvTranscoder/essenceStream/AvOutputVideo.cpp b/src/AvTranscoder/essenceStream/AvOutputVideo.cpp
@@ -153,8 +153,6 @@ void AvOutputVideo::setProfile( const ProfileLoader::Profile& profile, const avt
 	{
 		throw std::runtime_error( "The profile " + profile.find( constants::avProfileIdentificatorHuman )->second + " is invalid." );
 	}
-	
-	_codec.setCodec( eCodecTypeEncoder, profile.find( constants::avProfileCodec )->second );
 
 	const size_t frameRate = std::strtoul( profile.find( constants::avProfileFrameRate )->second.c_str(), NULL, 0 );
 	_codec.setTimeBase( 1, frameRate );

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ void AvOutputAudio::setProfile( const ProfileLoader::Profile& profile, const Aud`
`166`	`166`	`throw std::runtime_error( "The profile " + profile.find( constants::avProfileIdentificatorHuman )->second + " is invalid." );`
`167`	`167`	`}`
`168`	`168`
`169`		`- _codec.setCodec( eCodecTypeEncoder, profile.find( constants::avProfileCodec )->second );`
`170`	`169`	`_codec.setAudioParameters( frameDesc );`
`171`	`170`
`172`	`171`	`for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )`
Original file line number	Diff line number	Diff line change
`@@ -153,8 +153,6 @@ void AvOutputVideo::setProfile( const ProfileLoader::Profile& profile, const avt`
`153`	`153`	`{`
`154`	`154`	`throw std::runtime_error( "The profile " + profile.find( constants::avProfileIdentificatorHuman )->second + " is invalid." );`
`155`	`155`	`}`
`156`		`-`
`157`		`- _codec.setCodec( eCodecTypeEncoder, profile.find( constants::avProfileCodec )->second );`
`158`	`156`
`159`	`157`	`const size_t frameRate = std::strtoul( profile.find( constants::avProfileFrameRate )->second.c_str(), NULL, 0 );`
`160`	`158`	`_codec.setTimeBase( 1, frameRate );`