Merge pull request #161 from cchampet/dev_setProfileAddLog

valnoel · valnoel · commit c67abcbb824a · 2015-04-16T14:37:58.000+02:00
Log profile in debug when setProfile
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -147,6 +147,8 @@ bool AudioDecoder::decodeNextFrame()
 
 void AudioDecoder::setProfile( const ProfileLoader::Profile& profile )
 {
+	LOG_DEBUG( "Set profile of audio decoder with:\n" << profile )
+
 	AudioCodec& codec = _inputStream->getAudioCodec();
 
 	// set threads before any other options
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -105,7 +105,9 @@ void VideoDecoder::flushDecoder()
 }
 
 void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )
-{
+{	
+	LOG_DEBUG( "Set profile of video decoder with:\n" << profile )
+
 	VideoCodec& codec = _inputStream->getVideoCodec();
 
 	// set threads before any other options
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -135,6 +135,8 @@ bool AudioEncoder::encodeFrame( Frame& codedFrame )
 
 void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const AudioFrameDesc& frameDesc  )
 {
+	LOG_DEBUG( "Set profile of audio encoder with:\n" << profile )
+
 	// set sampleRate, number of channels, sample format
 	_codec.setAudioParameters( frameDesc );
 
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -128,6 +128,8 @@ bool VideoEncoder::encodeFrame( Frame& codedFrame )
 
 void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtranscoder::VideoFrameDesc& frameDesc )
 {
+	LOG_DEBUG( "Set profile of video encoder with:\n" << profile )
+
 	// set width, height, pixel format, fps
 	_codec.setImageParameters( frameDesc );
 
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -199,7 +199,9 @@ double InputFile::getFps()
 }
 
 void InputFile::setProfile( const ProfileLoader::Profile& profile )
-{	
+{
+	LOG_DEBUG( "Set profile of input file with:\n" << profile )
+
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{
 		if( (*it).first == constants::avProfileIdentificator ||
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -147,6 +147,8 @@ void OutputFile::addMetadata( const std::string& key, const std::string& value )
 
 void OutputFile::setProfile( const ProfileLoader::Profile& profile )
 {
+	LOG_DEBUG( "Set profile of output file with:\n" << profile )
+
 	// check if output format indicated is valid with the filename extension
 	if( ! matchFormat( profile.find( constants::avProfileFormat )->second, _filename ) )
 	{

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ bool AudioDecoder::decodeNextFrame()`
`147`	`147`
`148`	`148`	`void AudioDecoder::setProfile( const ProfileLoader::Profile& profile )`
`149`	`149`	`{`
	`150`	`+ LOG_DEBUG( "Set profile of audio decoder with:\n" << profile )`
	`151`	`+`
`150`	`152`	`AudioCodec& codec = _inputStream->getAudioCodec();`
`151`	`153`
`152`	`154`	`// set threads before any other options`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,9 @@ void VideoDecoder::flushDecoder()`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )`
`108`		`-{`
	`108`	`+{`
	`109`	`+ LOG_DEBUG( "Set profile of video decoder with:\n" << profile )`
	`110`	`+`
`109`	`111`	`VideoCodec& codec = _inputStream->getVideoCodec();`
`110`	`112`
`111`	`113`	`// set threads before any other options`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,8 @@ bool AudioEncoder::encodeFrame( Frame& codedFrame )`
`135`	`135`
`136`	`136`	`void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const AudioFrameDesc& frameDesc )`
`137`	`137`	`{`
	`138`	`+ LOG_DEBUG( "Set profile of audio encoder with:\n" << profile )`
	`139`	`+`
`138`	`140`	`// set sampleRate, number of channels, sample format`
`139`	`141`	`_codec.setAudioParameters( frameDesc );`
`140`	`142`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,8 @@ bool VideoEncoder::encodeFrame( Frame& codedFrame )`
`128`	`128`
`129`	`129`	`void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtranscoder::VideoFrameDesc& frameDesc )`
`130`	`130`	`{`
	`131`	`+ LOG_DEBUG( "Set profile of video encoder with:\n" << profile )`
	`132`	`+`
`131`	`133`	`// set width, height, pixel format, fps`
`132`	`134`	`_codec.setImageParameters( frameDesc );`
`133`	`135`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,9 @@ double InputFile::getFps()`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`void InputFile::setProfile( const ProfileLoader::Profile& profile )`
`202`		`-{`
	`202`	`+{`
	`203`	`+ LOG_DEBUG( "Set profile of input file with:\n" << profile )`
	`204`	`+`
`203`	`205`	`for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )`
`204`	`206`	`{`
`205`	`207`	`if( (*it).first == constants::avProfileIdentificator \|\|`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ void OutputFile::addMetadata( const std::string& key, const std::string& value )`
`147`	`147`
`148`	`148`	`void OutputFile::setProfile( const ProfileLoader::Profile& profile )`
`149`	`149`	`{`
	`150`	`+ LOG_DEBUG( "Set profile of output file with:\n" << profile )`
	`151`	`+`
`150`	`152`	`// check if output format indicated is valid with the filename extension`
`151`	`153`	`if( ! matchFormat( profile.find( constants::avProfileFormat )->second, _filename ) )`
`152`	`154`	`{`