Transcoder: fixed how to get the progressDuration during a process

Clement Champetier · Clement Champetier · commit 087c3aa76dcb · 2016-01-04T17:17:05.000+01:00
Added getCurrentOutputDuration private method.
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -265,7 +265,7 @@ ProcessStat Transcoder::process( IProgress& progress )
 	bool frameProcessed = true;
 	while( frameProcessed )
 	{
-		const float progressDuration = _outputFile.getStream( 0 ).getStreamDuration();
+		const float progressDuration = getCurrentOutputDuration();
 
 		// check if JobStatusCancel
 		if( progress.progress( ( progressDuration > outputDuration ) ? outputDuration : progressDuration, outputDuration ) == eJobStatusCancel )
@@ -501,6 +501,20 @@ float Transcoder::getOutputDuration() const
 	}	
 }
 
+float Transcoder::getCurrentOutputDuration() const
+{
+	float currentOutputDuration = -1;
+	for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )
+	{
+		const float currentStreamDuration = _outputFile.getStream( streamIndex ).getStreamDuration();
+		if( currentOutputDuration == -1 )
+			currentOutputDuration = currentStreamDuration;
+		else if( currentStreamDuration < currentOutputDuration )
+			currentOutputDuration = currentStreamDuration;
+	}
+	return currentOutputDuration;
+}
+
 void Transcoder::manageSwitchToGenerator()
 {
 	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -185,6 +185,13 @@ class AvExport Transcoder
          */
 	float getOutputDuration() const;
 
+	/**
+	 * @brief Get the current duration of the output program
+	 * @note Returns the duration of the smallest stream.
+	 * @return -1 if there is no output stream.
+	 */
+	float getCurrentOutputDuration() const;
+
 	/**
 	 * @brief Set for each StreamTranscoder if it can switch to generator at the end.
          */
