StreamTranscoder: rename setInfinityStream to canSwitchToGenerator

Clement Champetier · Clement Champetier · commit 78eb62481fda · 2015-02-04T15:57:07.000+01:00
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -37,9 +37,9 @@ StreamTranscoder::StreamTranscoder(
 	, _frameProcessed( 0 )
 	, _offset( 0 )
 	, _takeFromGenerator( false )
+	, _canSwitchToGenerator( false )
 	, _verbose( false )
 	, _offsetPassed( false )
-	, _infinityStream( false )
 {
 	// create a re-wrapping case
 	switch( _inputStream->getStreamType() )
@@ -84,9 +84,9 @@ StreamTranscoder::StreamTranscoder(
 	, _frameProcessed( 0 )
 	, _offset( offset )
 	, _takeFromGenerator( false )
+	, _canSwitchToGenerator( false )
 	, _verbose( false )
 	, _offsetPassed( false )
-	, _infinityStream( false )
 {
 	// create a transcode case
 	switch( _inputStream->getStreamType() )
@@ -184,9 +184,9 @@ StreamTranscoder::StreamTranscoder(
 	, _frameProcessed( 0 )
 	, _offset( 0 )
 	, _takeFromGenerator( false )
+	, _canSwitchToGenerator( false )
 	, _verbose( false )
 	, _offsetPassed( false )
-	, _infinityStream( false )
 {
 	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
 	{
@@ -336,7 +336,7 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 	if( _offset &&
 		_frameProcessed > _offset &&
 		! _offsetPassed &&
-		_takeFromGenerator )
+		_canSwitchToGenerator )
 	{
 		switchToInputDecoder();
 		_offsetPassed = true;
@@ -364,7 +364,7 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 			std::cout << "encode last frame(s)" << std::endl;
 		if( ! _outputEncoder->encodeFrame( data ) )
 		{
-			if( _infinityStream )
+			if( _canSwitchToGenerator )
 			{
 				switchToGeneratorDecoder();
 				return processTranscode();
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -70,7 +70,11 @@ class AvExport StreamTranscoder
 
 	void setVerbose( bool verbose = true ){ _verbose = verbose; }
 
-	void setInfinityStream( bool isInfinity ) { _infinityStream = isInfinity; }
+	/**
+	 * @brief Returns if the stream can switch to a generator when ended
+	 * @note Not applicable for rewrap and generator cases
+	 */
+	void canSwitchToGenerator( bool canSwitch ) { _canSwitchToGenerator = canSwitch; }
 
 	void setOffset( bool offset = true ){ _offset = offset; }
 
@@ -98,9 +102,9 @@ class AvExport StreamTranscoder
 	size_t _offset;  ///< Offset, in frame, at the beginning of the StreamTranscoder.
 
 	bool _takeFromGenerator;  ///< Is the data processed are taken from a generator.
+	bool _canSwitchToGenerator;  ///< Automatically switch to a generator at the end of the stream
 	bool _verbose;
 	bool _offsetPassed;  ///< Is the offset at the beginning of the stream is finished.
-	bool _infinityStream;  ///< Automatically switch to a generator at the end of the stream (not applicable when rewrap);
 };
 
 }
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -502,24 +502,24 @@ void Transcoder::manageInfinityStreamFromProcessMethod()
 		{
 			case eProcessMethodShortest :
 				if( _streamTranscoders.at( i )->getDuration() == getMinTotalDuration() )
-					_streamTranscoders.at( i )->setInfinityStream( false );
+					_streamTranscoders.at( i )->canSwitchToGenerator( false );
 				else
-					_streamTranscoders.at( i )->setInfinityStream( true );
+					_streamTranscoders.at( i )->canSwitchToGenerator( true );
 				break;
 			case eProcessMethodLongest :
 				if( _streamTranscoders.at( i )->getDuration() == getMaxTotalDuration() )
-					_streamTranscoders.at( i )->setInfinityStream( false );
+					_streamTranscoders.at( i )->canSwitchToGenerator( false );
 				else
-					_streamTranscoders.at( i )->setInfinityStream( true );
+					_streamTranscoders.at( i )->canSwitchToGenerator( true );
 				break;
 			case eProcessMethodBasedOnStream :
 				if( i != _mainStreamIndex )
-					_streamTranscoders.at( i )->setInfinityStream( true );
+					_streamTranscoders.at( i )->canSwitchToGenerator( true );
 				else
-					_streamTranscoders.at( i )->setInfinityStream( false );
+					_streamTranscoders.at( i )->canSwitchToGenerator( false );
 				break;
 			case eProcessMethodInfinity :
-				_streamTranscoders.at( i )->setInfinityStream( true );
+				_streamTranscoders.at( i )->canSwitchToGenerator( true );
 				break;
 		}
 	}
