Transcoder: add private method manageInfinityStreamFromProcessMethod

Clement Champetier · Clement Champetier · commit 3088120e8381 · 2014-12-03T16:45:53.000+01:00
Can call setProcessMethod before adding the streams.
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -277,6 +277,8 @@ void Transcoder::process( IProgress& progress )
 	if( _streamTranscoders.size() == 0 )
 		throw std::runtime_error( "missing input streams in transcoder" );
 
+	manageInfinityStreamFromProcessMethod();
+
 	if( _verbose )
 		std::cout << "begin transcoding" << std::endl;
 	init();
@@ -313,34 +315,6 @@ void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod, const si
 {
 	_eProcessMethod	= eProcessMethod;
 	_mainStreamIndex = indexBasedStream;
-
-	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
-	{
-		switch( _eProcessMethod )
-		{
-			case eProcessMethodShortest :
-				if( _streamTranscoders.at( i )->getDuration() == getMinTotalDuration() )
-					_streamTranscoders.at( i )->setInfinityStream( false );
-				else
-					_streamTranscoders.at( i )->setInfinityStream( true );
-				break;
-			case eProcessMethodLongest :
-				if( _streamTranscoders.at( i )->getDuration() == getMaxTotalDuration() )
-					_streamTranscoders.at( i )->setInfinityStream( false );
-				else
-					_streamTranscoders.at( i )->setInfinityStream( true );
-				break;
-			case eProcessMethodBasedOnStream :
-				if( i != _mainStreamIndex )
-					_streamTranscoders.at( i )->setInfinityStream( true );
-				else
-					_streamTranscoders.at( i )->setInfinityStream( false );
-				break;
-			case eProcessMethodInfinity :
-				_streamTranscoders.at( i )->setInfinityStream( true );
-				break;
-		}
-	}
 }
 
 void Transcoder::setVerbose( bool verbose )
@@ -523,4 +497,35 @@ double Transcoder::getTotalDurationFromProcessMethod() const
 	}	
 }
 
+void Transcoder::manageInfinityStreamFromProcessMethod()
+{
+	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
+	{
+		switch( _eProcessMethod )
+		{
+			case eProcessMethodShortest :
+				if( _streamTranscoders.at( i )->getDuration() == getMinTotalDuration() )
+					_streamTranscoders.at( i )->setInfinityStream( false );
+				else
+					_streamTranscoders.at( i )->setInfinityStream( true );
+				break;
+			case eProcessMethodLongest :
+				if( _streamTranscoders.at( i )->getDuration() == getMaxTotalDuration() )
+					_streamTranscoders.at( i )->setInfinityStream( false );
+				else
+					_streamTranscoders.at( i )->setInfinityStream( true );
+				break;
+			case eProcessMethodBasedOnStream :
+				if( i != _mainStreamIndex )
+					_streamTranscoders.at( i )->setInfinityStream( true );
+				else
+					_streamTranscoders.at( i )->setInfinityStream( false );
+				break;
+			case eProcessMethodInfinity :
+				_streamTranscoders.at( i )->setInfinityStream( true );
+				break;
+		}
+	}
+}
+
 }
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -125,7 +125,6 @@ class AvExport Transcoder
 
 	/**
 	 * @brief Set the transcodage politic.
-	 * @note Call it after adding the streams.
 	 * @note By default eProcessMethodLongest.
 	 * @param indexBasedStream: in case of process method eProcessMethodBasedOnStream, stop transcode at the end of the indicated stream.
 	 */
@@ -170,6 +169,11 @@ class AvExport Transcoder
          */
 	double getTotalDurationFromProcessMethod() const;
 
+	/**
+	 * @brief Set for each StreamTranscoder if it is an infinity stream (switch to generator at the end of the stream).
+         */
+	void manageInfinityStreamFromProcessMethod();
+
 private:
 	OutputFile&                      _outputFile;  ///< The output media file after process.
 	std::vector< InputFile* >        _inputFiles;  ///< The list of input files which contain added streams.
