Merge pull request #77 from cchampet/dev_addMethodBasedOnDuration

cchampet · cchampet · commit b9b48539751e · 2015-02-05T14:18:54.000+01:00
Add transcoding policy eProcessMethodBasedOnDuration
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -19,6 +19,7 @@ Transcoder::Transcoder( IOutputFile& outputFile )
 	, _profileLoader( true )
 	, _eProcessMethod ( eProcessMethodBasedOnStream )
 	, _mainStreamIndex( 0 )
+	, _outputDuration( 0 )
 	, _verbose( false )
 {
 	// Initialize the OutputFile
@@ -268,7 +269,7 @@ void Transcoder::process( IProgress& progress )
 	if( _streamTranscoders.size() == 0 )
 		throw std::runtime_error( "missing input streams in transcoder" );
 
-	manageInfinityStreamFromProcessMethod();
+	manageSwitchToGenerator();
 
 	if( _verbose )
 		std::cout << "begin transcoding" << std::endl;
@@ -277,7 +278,7 @@ void Transcoder::process( IProgress& progress )
 
 	preProcessCodecLatency();
 
-	double totalDuration = getOutputDuration();
+	double outputDuration = getOutputDuration();
 
 	size_t frame = 0;
 	bool frameProcessed = true;
@@ -289,7 +290,13 @@ void Transcoder::process( IProgress& progress )
 		frameProcessed =  processFrame();
 
 		double progressDuration = _outputFile.getStream( 0 ).getStreamDuration();
-		if( progress.progress( ( progressDuration > totalDuration )? totalDuration : progressDuration, totalDuration ) == eJobStatusCancel )
+
+		// check progressDuration
+		if( progressDuration > outputDuration )
+			break;
+
+		// check if JobStatusCancel
+		if( progress.progress( ( progressDuration > outputDuration ) ? outputDuration : progressDuration, outputDuration ) == eJobStatusCancel )
 			break;
 
 		++frame;
@@ -301,10 +308,11 @@ void Transcoder::process( IProgress& progress )
 	_outputFile.endWrap();
 }
 
-void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream )
+void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream, const double outputDuration )
 {
 	_eProcessMethod	= eProcessMethod;
 	_mainStreamIndex = indexBasedStream;
+	_outputDuration = outputDuration;
 }
 
 void Transcoder::setVerbose( bool verbose )
@@ -487,14 +495,16 @@ double Transcoder::getOutputDuration() const
 			return getMaxTotalDuration();
 		case eProcessMethodBasedOnStream :
 			return getStreamDuration( _mainStreamIndex );
+		case eProcessMethodBasedOnDuration :
+			return _outputDuration;
 		case eProcessMethodInfinity :
 			return std::numeric_limits<double>::max();
 		default:
 			return getMaxTotalDuration();
 	}	
 }
 
-void Transcoder::manageInfinityStreamFromProcessMethod()
+void Transcoder::manageSwitchToGenerator()
 {
 	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
 	{
@@ -518,6 +528,12 @@ void Transcoder::manageInfinityStreamFromProcessMethod()
 				else
 					_streamTranscoders.at( i )->canSwitchToGenerator( false );
 				break;
+			case eProcessMethodBasedOnDuration :
+				if( _streamTranscoders.at( i )->getDuration() > _outputDuration )
+					_streamTranscoders.at( i )->canSwitchToGenerator( false );
+				else
+					_streamTranscoders.at( i )->canSwitchToGenerator( true );
+				break;
 			case eProcessMethodInfinity :
 				_streamTranscoders.at( i )->canSwitchToGenerator( true );
 				break;
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -20,13 +20,15 @@ namespace avtranscoder
  * eProcessMethodShortest: stop transcode at the end of the shortest stream.
  * eProcessMethodLongest: stop transcode at the end of the longest stream.
  * eProcessMethodBasedOnStream: stop transcode at the end of an indicated stream (@see _indexBasedStream attribute of Transcoder).
+ * eProcessMethodBasedOnDuration: stop transcode at the end of an indicated duration, in seconds (@see _outputDuration attribute of Transcoder).
  * eProcessMethodInfinity: stop transcode by outside of avTranscoder (streaming mode)
  */
 enum EProcessMethod
 {
 	eProcessMethodShortest = 0,
 	eProcessMethodLongest,
 	eProcessMethodBasedOnStream,
+	eProcessMethodBasedOnDuration,
 	eProcessMethodInfinity,
 };
 
@@ -125,8 +127,9 @@ class AvExport Transcoder
 	 * @brief Set the transcoding policy.
 	 * @note By default eProcessMethodBasedOnStream at index 0.
 	 * @param indexBasedStream: in case of process method eProcessMethodBasedOnStream, stop transcode at the end of the indicated stream.
+	 * @param outputDuration: in case of process method eProcessMethodBasedOnDuration, stop transcode at the end of the indicated duration.
 	 */
-	void setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream = 0 );
+	void setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream = 0, const double outputDuration = 0 );
 
 	/**
 	 * @brief Set verbose mode for the Transcoder, its streams, and its output file.
@@ -168,9 +171,9 @@ class AvExport Transcoder
 	double getOutputDuration() const;
 
 	/**
-	 * @brief Set for each StreamTranscoder if it is an infinity stream (switch to generator at the end of the stream).
+	 * @brief Set for each StreamTranscoder if it can switch to generator at the end.
          */
-	void manageInfinityStreamFromProcessMethod();
+	void manageSwitchToGenerator();
 
 private:
 	IOutputFile& _outputFile;  ///< The output media file after process (has link)
@@ -183,6 +186,7 @@ class AvExport Transcoder
 
 	EProcessMethod _eProcessMethod;  ///< Transcoding policy
 	size_t _mainStreamIndex;  ///< Index of stream used to stop the process of transcode in case of eProcessMethodBasedOnStream.
+	double _outputDuration;  ///< Duration of output media used to stop the process of transcode in case of eProcessMethodBasedOnDuration.
 
 	bool    _verbose;
 };
