Merge pull request #201 from cchampet/dev_StreamTranscoderGetProcessCase

valnoel · valnoel · commit 9b9005b767ca · 2015-06-08T18:23:51.000+02:00
StreamTranscoder: refactor how to get the current process case
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -309,7 +309,7 @@ void StreamTranscoder::preProcessCodecLatency()
 		return;
 
 	// set a decoder to preload generated frames
-	if( isRewrapCase() )
+	if( getProcessCase() == eProcessCaseRewrap )
 		switchToGeneratorDecoder();
 
 	while( ( latency-- ) > 0 )
@@ -328,7 +328,7 @@ bool StreamTranscoder::processFrame()
 		{
 			LOG_INFO( "End of positive offset" )
 
-			if( isTranscodeCase() )
+			if( getProcessCase() == eProcessCaseTranscode )
 				switchToInputDecoder();
 			else
 				_currentDecoder = NULL;
@@ -356,7 +356,7 @@ bool StreamTranscoder::processFrame()
 		}
  	}
 
-	if( isRewrapCase() )
+	if( getProcessCase() == eProcessCaseRewrap )
 		return processRewrap();
 
 	return processTranscode( _subStreamIndex );	
@@ -495,19 +495,14 @@ double StreamTranscoder::getDuration() const
 		return std::numeric_limits<double>::max();
 }
 
-bool StreamTranscoder::isTranscodeCase() const
+StreamTranscoder::EProcessCase StreamTranscoder::getProcessCase() const
 {
-	return _inputStream && _inputDecoder;
-}
-
-bool StreamTranscoder::isRewrapCase() const
-{
-	return _inputStream && ! _inputDecoder;
-}
-
-bool StreamTranscoder::isGeneratorCase() const
-{
-	return ! _inputStream;
+	if( _inputStream && _inputDecoder )
+		return eProcessCaseTranscode;
+	else if( _inputStream && ! _inputDecoder )
+		return eProcessCaseRewrap;
+	else
+		return eProcessCaseGenerator;
 }
 
 }
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -95,9 +95,15 @@ class AvExport StreamTranscoder
 	bool processRewrap();
 	bool processTranscode( const int subStreamIndex = -1 );  ///< By default transcode all channels
 
-	bool isTranscodeCase() const;
-	bool isRewrapCase() const;
-	bool isGeneratorCase() const;
+	//@{
+	// Get the current process case.
+	enum EProcessCase {
+	    eProcessCaseTranscode,
+	    eProcessCaseRewrap,
+	    eProcessCaseGenerator
+	};
+	EProcessCase getProcessCase() const;
+	//@}
 
 private:
 	IInputStream* _inputStream;  ///< Input stream to read next packet (has link, no ownership)
