StreamTranscoder: refactoring - constructors with const ProfileDesc

Clement Champetier · Clement Champetier · commit d2bd6ed11b0a · 2014-07-21T15:11:11.000+02:00
* Use "const ProfileDesc" instead of "ProfileDesc" when instanciate a
StreamTranscoder.
* Consequences:
     * OutputAudio: setProfile with a const ProfileDesc.
     * OutputVideo: setProfile with a const ProfileDesc.
     * use find instead of [] to access the elements of ProfileDesc.
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.cpp b/src/AvTranscoder/EssenceStream/OutputAudio.cpp
@@ -176,23 +176,23 @@ bool OutputAudio::encodeFrame( DataStream& codedFrame )
 #endif
 }
 
-void OutputAudio::setProfile( Profile::ProfileDesc& desc, const AudioFrameDesc& frameDesc  )
+void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrameDesc& frameDesc  )
 {
 	if( ! desc.count( Profile::avProfileCodec ) || 		
 		! desc.count( Profile::avProfileSampleFormat ) || 
 		! desc.count( Profile::avProfileSampleRate ) || 
 		! desc.count( Profile::avProfileChannel ) )
 	{
-		throw std::runtime_error( "The profile " + desc[ Profile::avProfileIdentificatorHuman ] + " is invalid." );
+		throw std::runtime_error( "The profile " + desc.find( Profile::avProfileIdentificatorHuman )->second + " is invalid." );
 	}
 	
-	_audioDesc.setCodec( desc[ Profile::avProfileCodec ] );
+	_audioDesc.setCodec( desc.find( Profile::avProfileCodec )->second );
 	
-	size_t sample_rate = std::strtoul( desc[ Profile::avProfileSampleRate ].c_str(), NULL, 0 );
-	size_t channels = std::strtoul( desc[ Profile::avProfileChannel ].c_str(), NULL, 0 );
-	_audioDesc.setAudioParameters( sample_rate, channels, av_get_sample_fmt( desc[ Profile::avProfileSampleFormat ].c_str() ) );
+	size_t sample_rate = std::strtoul( desc.find( Profile::avProfileSampleRate )->second.c_str(), NULL, 0 );
+	size_t channels = std::strtoul( desc.find( Profile::avProfileChannel )->second.c_str(), NULL, 0 );
+	_audioDesc.setAudioParameters( sample_rate, channels, av_get_sample_fmt( desc.find( Profile::avProfileSampleFormat )->second.c_str() ) );
 	
-	for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )
+	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
 		if( (*it).first == Profile::avProfileIdentificator ||
 			(*it).first == Profile::avProfileIdentificatorHuman ||
@@ -215,7 +215,7 @@ void OutputAudio::setProfile( Profile::ProfileDesc& desc, const AudioFrameDesc&
 
 	setup();
 
-	for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )
+	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
 		if( (*it).first == Profile::avProfileIdentificator ||
 			(*it).first == Profile::avProfileIdentificatorHuman ||
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.hpp b/src/AvTranscoder/EssenceStream/OutputAudio.hpp
@@ -29,7 +29,7 @@ class OutputAudio : public OutputEssence
 	 */
 	bool encodeFrame( DataStream& codedFrame );
 	
-	void setProfile( Profile::ProfileDesc& desc, const AudioFrameDesc& frameDesc );
+	void setProfile( const Profile::ProfileDesc& desc, const AudioFrameDesc& frameDesc );
 
 	AudioDesc& getAudioDesc() { return _audioDesc; }
 
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.cpp b/src/AvTranscoder/EssenceStream/OutputVideo.cpp
@@ -186,23 +186,23 @@ bool OutputVideo::encodeFrame( DataStream& codedFrame )
 #endif
 }
 
-void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc )
+void OutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc )
 {
 	if( ! desc.count( Profile::avProfileCodec ) ||
 		! desc.count( Profile::avProfilePixelFormat ) || 
 		! desc.count( Profile::avProfileFrameRate ) )
 	{
-		throw std::runtime_error( "The profile " + desc[ Profile::avProfileIdentificatorHuman ] + " is invalid." );
+		throw std::runtime_error( "The profile " + desc.find( Profile::avProfileIdentificatorHuman )->second + " is invalid." );
 	}
 	
-	_videoDesc.setCodec( desc[ Profile::avProfileCodec ] );
+	_videoDesc.setCodec( desc.find( Profile::avProfileCodec )->second );
 	
-	const size_t frameRate = std::strtoul( desc[ Profile::avProfileFrameRate ].c_str(), NULL, 0 );
+	const size_t frameRate = std::strtoul( desc.find( Profile::avProfileFrameRate )->second.c_str(), NULL, 0 );
 	_videoDesc.setTimeBase( 1, frameRate );
 	
 	_videoDesc.setImageParameters( imageDesc );
 
-	for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )
+	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
 		if( (*it).first == Profile::avProfileIdentificator ||
 			(*it).first == Profile::avProfileIdentificatorHuman ||
@@ -224,7 +224,7 @@ void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::Im
 
 	setup();
 
-	for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )
+	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
 		if( (*it).first == Profile::avProfileIdentificator ||
 			(*it).first == Profile::avProfileIdentificatorHuman ||
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.hpp b/src/AvTranscoder/EssenceStream/OutputVideo.hpp
@@ -44,7 +44,7 @@ class AvExport OutputVideo : public OutputEssence
 	 */
 	bool encodeFrame( DataStream& codedFrame );
 
-	void setProfile( Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc );
+	void setProfile( const Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc );
 	
 	VideoDesc& getVideoDesc() { return _videoDesc; }
 
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -50,7 +50,7 @@ StreamTranscoder::StreamTranscoder(
 StreamTranscoder::StreamTranscoder(
 		InputStream& inputStream,
 		OutputFile& outputFile,
-		Profile::ProfileDesc& profile,
+		const Profile::ProfileDesc& profile,
 		const int subStreamIndex
 	)
 	: _inputStream( &inputStream )
@@ -78,7 +78,7 @@ StreamTranscoder::StreamTranscoder(
 
 			ImageDesc outputImageDesc = _inputStream->getVideoDesc().getImageDesc();
 
-			outputImageDesc.setPixel( Pixel( profile[ Profile::avProfilePixelFormat ].c_str() ) );
+			outputImageDesc.setPixel( Pixel( profile.find( Profile::avProfilePixelFormat )->second.c_str() ) );
 
 			outputVideo->setProfile( profile, outputImageDesc );
 			
@@ -129,7 +129,7 @@ StreamTranscoder::StreamTranscoder(
 StreamTranscoder::StreamTranscoder(
 		InputEssence& inputEssence,
 		OutputFile& outputFile,
-		Profile::ProfileDesc& profile
+		const Profile::ProfileDesc& profile
 	)
 	: _inputStream( NULL )
 	, _outputStream( NULL )
@@ -151,8 +151,8 @@ StreamTranscoder::StreamTranscoder(
 		OutputAudio* outputAudio = new OutputAudio();
 
 		_outputEssence = outputAudio;
-		AudioFrameDesc srcAudioFrameDesc; // @todo better solution ?
-		outputAudio->setProfile( profile, srcAudioFrameDesc );
+		AudioFrameDesc inputAudioFrameDesc = static_cast<DummyAudio*>( _inputEssence )->getAudioDesc().getFrameDesc();
+		outputAudio->setProfile( profile, inputAudioFrameDesc );
 		
 		static_cast<DummyAudio*>( _inputEssence )->setAudioDesc( outputAudio->getAudioDesc() );
 		
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.hpp b/src/AvTranscoder/Transcoder/StreamTranscoder.hpp
@@ -29,12 +29,12 @@ class StreamTranscoder
 	/**
 	 * @brief transcode stream
 	 **/
-	StreamTranscoder( InputStream& inputStream, OutputFile& outputFile, Profile::ProfileDesc& profile, const int subStreamIndex = -1 );
+	StreamTranscoder( InputStream& inputStream, OutputFile& outputFile, const Profile::ProfileDesc& profile, const int subStreamIndex = -1 );
 
 	/**
 	 * @brief encode from dummy stream
 	 **/
-	StreamTranscoder( InputEssence& inputEssence, OutputFile& outputFile, Profile::ProfileDesc& profile );
+	StreamTranscoder( InputEssence& inputEssence, OutputFile& outputFile, const Profile::ProfileDesc& profile );
 
 	~StreamTranscoder();
 

Original file line number	Diff line number	Diff line change
`@@ -176,23 +176,23 @@ bool OutputAudio::encodeFrame( DataStream& codedFrame )`
`176`	`176`	`#endif`
`177`	`177`	`}`
`178`	`178`
`179`		`-void OutputAudio::setProfile( Profile::ProfileDesc& desc, const AudioFrameDesc& frameDesc )`
	`179`	`+void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrameDesc& frameDesc )`
`180`	`180`	`{`
`181`	`181`	`if( ! desc.count( Profile::avProfileCodec ) \|\|`
`182`	`182`	`! desc.count( Profile::avProfileSampleFormat ) \|\|`
`183`	`183`	`! desc.count( Profile::avProfileSampleRate ) \|\|`
`184`	`184`	`! desc.count( Profile::avProfileChannel ) )`
`185`	`185`	`{`
`186`		`- throw std::runtime_error( "The profile " + desc[ Profile::avProfileIdentificatorHuman ] + " is invalid." );`
	`186`	`+ throw std::runtime_error( "The profile " + desc.find( Profile::avProfileIdentificatorHuman )->second + " is invalid." );`
`187`	`187`	`}`
`188`	`188`
`189`		`- _audioDesc.setCodec( desc[ Profile::avProfileCodec ] );`
	`189`	`+ _audioDesc.setCodec( desc.find( Profile::avProfileCodec )->second );`
`190`	`190`
`191`		`- size_t sample_rate = std::strtoul( desc[ Profile::avProfileSampleRate ].c_str(), NULL, 0 );`
`192`		`- size_t channels = std::strtoul( desc[ Profile::avProfileChannel ].c_str(), NULL, 0 );`
`193`		`- _audioDesc.setAudioParameters( sample_rate, channels, av_get_sample_fmt( desc[ Profile::avProfileSampleFormat ].c_str() ) );`
	`191`	`+ size_t sample_rate = std::strtoul( desc.find( Profile::avProfileSampleRate )->second.c_str(), NULL, 0 );`
	`192`	`+ size_t channels = std::strtoul( desc.find( Profile::avProfileChannel )->second.c_str(), NULL, 0 );`
	`193`	`+ _audioDesc.setAudioParameters( sample_rate, channels, av_get_sample_fmt( desc.find( Profile::avProfileSampleFormat )->second.c_str() ) );`
`194`	`194`
`195`		`- for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )`
	`195`	`+ for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )`
`196`	`196`	`{`
`197`	`197`	`if( (*it).first == Profile::avProfileIdentificator \|\|`
`198`	`198`	`(*it).first == Profile::avProfileIdentificatorHuman \|\|`
`@@ -215,7 +215,7 @@ void OutputAudio::setProfile( Profile::ProfileDesc& desc, const AudioFrameDesc&`
`215`	`215`
`216`	`216`	`setup();`
`217`	`217`
`218`		`- for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )`
	`218`	`+ for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )`
`219`	`219`	`{`
`220`	`220`	`if( (*it).first == Profile::avProfileIdentificator \|\|`
`221`	`221`	`(*it).first == Profile::avProfileIdentificatorHuman \|\|`
Original file line number	Diff line number	Diff line change
`@@ -186,23 +186,23 @@ bool OutputVideo::encodeFrame( DataStream& codedFrame )`
`186`	`186`	`#endif`
`187`	`187`	`}`
`188`	`188`
`189`		`-void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc )`
	`189`	`+void OutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc )`
`190`	`190`	`{`
`191`	`191`	`if( ! desc.count( Profile::avProfileCodec ) \|\|`
`192`	`192`	`! desc.count( Profile::avProfilePixelFormat ) \|\|`
`193`	`193`	`! desc.count( Profile::avProfileFrameRate ) )`
`194`	`194`	`{`
`195`		`- throw std::runtime_error( "The profile " + desc[ Profile::avProfileIdentificatorHuman ] + " is invalid." );`
	`195`	`+ throw std::runtime_error( "The profile " + desc.find( Profile::avProfileIdentificatorHuman )->second + " is invalid." );`
`196`	`196`	`}`
`197`	`197`
`198`		`- _videoDesc.setCodec( desc[ Profile::avProfileCodec ] );`
	`198`	`+ _videoDesc.setCodec( desc.find( Profile::avProfileCodec )->second );`
`199`	`199`
`200`		`- const size_t frameRate = std::strtoul( desc[ Profile::avProfileFrameRate ].c_str(), NULL, 0 );`
	`200`	`+ const size_t frameRate = std::strtoul( desc.find( Profile::avProfileFrameRate )->second.c_str(), NULL, 0 );`
`201`	`201`	`_videoDesc.setTimeBase( 1, frameRate );`
`202`	`202`
`203`	`203`	`_videoDesc.setImageParameters( imageDesc );`
`204`	`204`
`205`		`- for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )`
	`205`	`+ for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )`
`206`	`206`	`{`
`207`	`207`	`if( (*it).first == Profile::avProfileIdentificator \|\|`
`208`	`208`	`(*it).first == Profile::avProfileIdentificatorHuman \|\|`
`@@ -224,7 +224,7 @@ void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::Im`
`224`	`224`
`225`	`225`	`setup();`
`226`	`226`
`227`		`- for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )`
	`227`	`+ for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )`
`228`	`228`	`{`
`229`	`229`	`if( (*it).first == Profile::avProfileIdentificator \|\|`
`230`	`230`	`(*it).first == Profile::avProfileIdentificatorHuman \|\|`