Transcoder: renamed private method getOutputDuration to getExpectedOutputDuration

Clement Champetier · Clement Champetier · commit a2eb3773c93e · 2016-01-04T17:23:48.000+01:00
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -258,8 +258,8 @@ ProcessStat Transcoder::process( IProgress& progress )
 
 	preProcessCodecLatency();
 
-	const float outputDuration = getOutputDuration();
-	LOG_INFO( "Output duration of the process will be " << outputDuration << "s." )
+	const float expectedOutputDuration = getExpectedOutputDuration();
+	LOG_INFO( "Output duration of the process will be " << expectedOutputDuration << "s." )
 
 	size_t frame = 0;
 	bool frameProcessed = true;
@@ -268,16 +268,16 @@ ProcessStat Transcoder::process( IProgress& progress )
 		const float progressDuration = getCurrentOutputDuration();
 
 		// check if JobStatusCancel
-		if( progress.progress( ( progressDuration > outputDuration ) ? outputDuration : progressDuration, outputDuration ) == eJobStatusCancel )
+		if( progress.progress( ( progressDuration > expectedOutputDuration ) ? expectedOutputDuration : progressDuration, expectedOutputDuration ) == eJobStatusCancel )
 		{
 			LOG_INFO( "End of process because the job was canceled." )
 			break;
 		}
 
 		// check progressDuration
-		if( progressDuration >= outputDuration )
+		if( progressDuration >= expectedOutputDuration )
 		{
-			LOG_INFO( "End of process because the output program duration (" << progressDuration << "s) is equal or upper than " << outputDuration << "s." )
+			std::cout << "End of process because the output program duration (" << progressDuration << "s) is equal or upper than " << expectedOutputDuration << "s." << std::endl;
 			break;
 		}
 
@@ -482,7 +482,7 @@ float Transcoder::getMaxTotalDuration() const
 	return maxTotalDuration;
 }
 
-float Transcoder::getOutputDuration() const
+float Transcoder::getExpectedOutputDuration() const
 {
 	switch( _eProcessMethod )
 	{
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -180,10 +180,10 @@ class AvExport Transcoder
 	float getMaxTotalDuration() const;
 
 	/**
-	 * @brief Get the duration of the output program
+	 * @brief Get the expected duration of the output program
 	 * @note Depends on the streams, the process method, and the main stream index.
          */
-	float getOutputDuration() const;
+	float getExpectedOutputDuration() const;
 
 	/**
 	 * @brief Get the current duration of the output program

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,8 @@ ProcessStat Transcoder::process( IProgress& progress )`
`258`	`258`
`259`	`259`	`preProcessCodecLatency();`
`260`	`260`
`261`		`- const float outputDuration = getOutputDuration();`
`262`		`- LOG_INFO( "Output duration of the process will be " << outputDuration << "s." )`
	`261`	`+ const float expectedOutputDuration = getExpectedOutputDuration();`
	`262`	`+ LOG_INFO( "Output duration of the process will be " << expectedOutputDuration << "s." )`
`263`	`263`
`264`	`264`	`size_t frame = 0;`
`265`	`265`	`bool frameProcessed = true;`
`@@ -268,16 +268,16 @@ ProcessStat Transcoder::process( IProgress& progress )`
`268`	`268`	`const float progressDuration = getCurrentOutputDuration();`
`269`	`269`
`270`	`270`	`// check if JobStatusCancel`
`271`		`- if( progress.progress( ( progressDuration > outputDuration ) ? outputDuration : progressDuration, outputDuration ) == eJobStatusCancel )`
	`271`	`+ if( progress.progress( ( progressDuration > expectedOutputDuration ) ? expectedOutputDuration : progressDuration, expectedOutputDuration ) == eJobStatusCancel )`
`272`	`272`	`{`
`273`	`273`	`LOG_INFO( "End of process because the job was canceled." )`
`274`	`274`	`break;`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`// check progressDuration`
`278`		`- if( progressDuration >= outputDuration )`
	`278`	`+ if( progressDuration >= expectedOutputDuration )`
`279`	`279`	`{`
`280`		`- LOG_INFO( "End of process because the output program duration (" << progressDuration << "s) is equal or upper than " << outputDuration << "s." )`
	`280`	`+ std::cout << "End of process because the output program duration (" << progressDuration << "s) is equal or upper than " << expectedOutputDuration << "s." << std::endl;`
`281`	`281`	`break;`
`282`	`282`	`}`
`283`	`283`
`@@ -482,7 +482,7 @@ float Transcoder::getMaxTotalDuration() const`
`482`	`482`	`return maxTotalDuration;`
`483`	`483`	`}`
`484`	`484`
`485`		`-float Transcoder::getOutputDuration() const`
	`485`	`+float Transcoder::getExpectedOutputDuration() const`
`486`	`486`	`{`
`487`	`487`	`switch( _eProcessMethod )`
`488`	`488`	`{`