Merge pull request #55 from cchampet/dev_clean

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 3dc7599feac5 · 2014-08-13T12:58:53.000+02:00
Clean
diff --git a/src/AvTranscoder/CodedStructures/CodedDesc.hpp b/src/AvTranscoder/CodedStructures/CodedDesc.hpp
@@ -1,10 +1,10 @@
 #ifndef _AV_TRANSCODER_CODED_STRUCTURES_ESSENCE_DESC_HPP_
 #define	_AV_TRANSCODER_CODED_STRUCTURES_ESSENCE_DESC_HPP_
 
-#include <string>
-
 #include <AvTranscoder/common.hpp>
 
+#include <string>
+
 class AVCodec;
 class AVCodecContext;
 
diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.cpp b/src/AvTranscoder/EssenceStream/DummyVideo.cpp
@@ -38,7 +38,7 @@ bool DummyVideo::readNextFrame( Frame& frameBuffer )
 {
 	if( ! _inputFrame )
 	{
-		// @todo support PAL (0 to 255) and NTFC (16 to 235)
+		// @todo support PAL (0 to 255) and NTFS (16 to 235)
 		int fillChar = 0;
 
 		if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )
diff --git a/src/AvTranscoder/EssenceStream/InputAudio.cpp b/src/AvTranscoder/EssenceStream/InputAudio.cpp
@@ -72,12 +72,6 @@ void InputAudio::setup()
 	
 	_codecContext->channels = _inputStream->getAudioDesc().getChannels();
 	
-	// std::cout << "Audio codec Id : " << _codecContext->codec_id << std::endl;
-	// std::cout << "Audio codec Id : " << _codec->name << std::endl;
-	// std::cout << "Audio codec Id : " << _codec->long_name << std::endl;
-
-	_codecContext->channels = _inputStream->getAudioDesc().getCodecContext()->channels;
-	
 	int ret = avcodec_open2( _codecContext, _codec, NULL );
 
 	if( ret < 0 || _codecContext == NULL || _codec == NULL )
diff --git a/src/AvTranscoder/EssenceStream/InputVideo.cpp b/src/AvTranscoder/EssenceStream/InputVideo.cpp
@@ -164,7 +164,7 @@ void InputVideo::setProfile( const Profile::ProfileDesc& desc )
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "InputVideo warning: " << e.what() << std::endl;
+			std::cout << "[InputVideo] warning: " << e.what() << std::endl;
 		}
 	}
 }
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.cpp b/src/AvTranscoder/EssenceStream/OutputAudio.cpp
@@ -201,7 +201,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "OutputAudio warning: " << e.what() << std::endl;
+			//std::cout << "[OutputAudio] warning: " << e.what() << std::endl;
 		}
 	}
 
@@ -222,7 +222,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "OutputAudio 2.warning: " << e.what() << std::endl;
+			std::cout << "[OutputAudio] warning: " << e.what() << std::endl;
 		}
 	}
 }
diff --git a/src/AvTranscoder/File/InputFile.cpp b/src/AvTranscoder/File/InputFile.cpp
@@ -230,7 +230,7 @@ void InputFile::setProfile( const Profile::ProfileDesc& desc )
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "InputFile warning: " << e.what() << std::endl;
+			std::cout << "[InputFile] warning: " << e.what() << std::endl;
 		}
 	}
 }
diff --git a/src/AvTranscoder/File/OutputFile.cpp b/src/AvTranscoder/File/OutputFile.cpp
@@ -252,7 +252,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "OutputFile warning: " << e.what() << std::endl;
+			//std::cout << "[OutputFile] warning: " << e.what() << std::endl;
 		}
 	}
 	
@@ -272,7 +272,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "OutputFile 2.warning: " << e.what() << std::endl;
+			std::cout << "[OutputFile] warning: " << e.what() << std::endl;
 		}
 	}
 }
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -274,22 +274,21 @@ void StreamTranscoder::init()
 bool StreamTranscoder::processFrame()
 {
 	++_frameProcessed;
-	if( _transform )
+
+	if( ! _inputEssence )
 	{
 		if( _subStreamIndex < 0 )
 		{
-			return processTranscode();
+			return processRewrap();
 		}
-
-		return processTranscode( _subStreamIndex );
+		return processRewrap( _subStreamIndex );
 	}
 
 	if( _subStreamIndex < 0 )
 	{
-		return processRewrap();
+		return processTranscode();
 	}
-
-	return processRewrap( _subStreamIndex );	
+	return processTranscode( _subStreamIndex );	
 }
 
 bool StreamTranscoder::processRewrap()

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ bool DummyVideo::readNextFrame( Frame& frameBuffer )`
`38`	`38`	`{`
`39`	`39`	`if( ! _inputFrame )`
`40`	`40`	`{`
`41`		`- // @todo support PAL (0 to 255) and NTFC (16 to 235)`
	`41`	`+ // @todo support PAL (0 to 255) and NTFS (16 to 235)`
`42`	`42`	`int fillChar = 0;`
`43`	`43`
`44`	`44`	`if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ void InputVideo::setProfile( const Profile::ProfileDesc& desc )`
`164`	`164`	`}`
`165`	`165`	`catch( std::exception& e )`
`166`	`166`	`{`
`167`		`- std::cout << "InputVideo warning: " << e.what() << std::endl;`
	`167`	`+ std::cout << "[InputVideo] warning: " << e.what() << std::endl;`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame`
`201`	`201`	`}`
`202`	`202`	`catch( std::exception& e )`
`203`	`203`	`{`
`204`		`- std::cout << "OutputAudio warning: " << e.what() << std::endl;`
	`204`	`+ //std::cout << "[OutputAudio] warning: " << e.what() << std::endl;`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`
`@@ -222,7 +222,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame`
`222`	`222`	`}`
`223`	`223`	`catch( std::exception& e )`
`224`	`224`	`{`
`225`		`- std::cout << "OutputAudio 2.warning: " << e.what() << std::endl;`
	`225`	`+ std::cout << "[OutputAudio] warning: " << e.what() << std::endl;`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ void InputFile::setProfile( const Profile::ProfileDesc& desc )`
`230`	`230`	`}`
`231`	`231`	`catch( std::exception& e )`
`232`	`232`	`{`
`233`		`- std::cout << "InputFile warning: " << e.what() << std::endl;`
	`233`	`+ std::cout << "[InputFile] warning: " << e.what() << std::endl;`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )`
`252`	`252`	`}`
`253`	`253`	`catch( std::exception& e )`
`254`	`254`	`{`
`255`		`- std::cout << "OutputFile warning: " << e.what() << std::endl;`
	`255`	`+ //std::cout << "[OutputFile] warning: " << e.what() << std::endl;`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`
`@@ -272,7 +272,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )`
`272`	`272`	`}`
`273`	`273`	`catch( std::exception& e )`
`274`	`274`	`{`
`275`		`- std::cout << "OutputFile 2.warning: " << e.what() << std::endl;`
	`275`	`+ std::cout << "[OutputFile] warning: " << e.what() << std::endl;`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -274,22 +274,21 @@ void StreamTranscoder::init()`
`274`	`274`	`bool StreamTranscoder::processFrame()`
`275`	`275`	`{`
`276`	`276`	`++_frameProcessed;`
`277`		`- if( _transform )`
	`277`	`+`
	`278`	`+ if( ! _inputEssence )`
`278`	`279`	`{`
`279`	`280`	`if( _subStreamIndex < 0 )`
`280`	`281`	`{`
`281`		`- return processTranscode();`
	`282`	`+ return processRewrap();`
`282`	`283`	`}`
`283`		`-`
`284`		`- return processTranscode( _subStreamIndex );`
	`284`	`+ return processRewrap( _subStreamIndex );`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`if( _subStreamIndex < 0 )`
`288`	`288`	`{`
`289`		`- return processRewrap();`
	`289`	`+ return processTranscode();`
`290`	`290`	`}`
`291`		`-`
`292`		`- return processRewrap( _subStreamIndex );`
	`291`	`+ return processTranscode( _subStreamIndex );`
`293`	`292`	`}`
`294`	`293`
`295`	`294`	`bool StreamTranscoder::processRewrap()`