Merge pull request #61 from cchampet/fix_defaultDurationIsBasedOnStream

valnoel · valnoel · commit 11b77d264460 · 2015-01-28T14:08:18.000+01:00
Default transcoding policy is based on stream 0
Clean getOutputDuration Transcoder method
diff --git a/app/avProcessor/avProcessor.cpp b/app/avProcessor/avProcessor.cpp
@@ -107,7 +107,6 @@ int main( int argc, char** argv )
 
 		// set verbose of all stream
 		transcoder.setVerbose( verbose );
-		transcoder.setProcessMethod( avtranscoder::eProcessMethodLongest );
 		
 		if( verbose )
 			std::cout << "start Transcode" << std::endl;
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -17,7 +17,7 @@ Transcoder::Transcoder( OutputFile& outputFile )
 	, _streamTranscoders()
 	, _streamTranscodersAllocated()
 	, _profileLoader( true )
-	, _eProcessMethod ( eProcessMethodLongest )
+	, _eProcessMethod ( eProcessMethodBasedOnStream )
 	, _mainStreamIndex( 0 )
 	, _verbose( false )
 {
@@ -277,7 +277,7 @@ void Transcoder::process( IProgress& progress )
 
 	preProcessCodecLatency();
 
-	double totalDuration = getTotalDurationFromProcessMethod();
+	double totalDuration = getOutputDuration();
 
 	size_t frame = 0;
 	bool frameProcessed = true;
@@ -478,7 +478,7 @@ double Transcoder::getMaxTotalDuration() const
 	return maxTotalDuration;
 }
 
-double Transcoder::getTotalDurationFromProcessMethod() const
+double Transcoder::getOutputDuration() const
 {
 	switch( _eProcessMethod )
 	{
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -18,9 +18,9 @@ namespace avtranscoder
 /**
  * @brief Enum to set a policy of how we manage the transcode in case of several streams.
  * eProcessMethodShortest: stop transcode at the end of the shortest stream.
- * eProcessMethodLongest: stop transcode at the end of the longest stream (default method).
- * eProcessMethodBasedOnStream: stop transcode at the end of an indicated stream (@see _indexBasedStream of Transcoder).
- * eProcessMethodInfinity: stop transcode by outside of avTranscoder.
+ * 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).
+ * eProcessMethodInfinity: stop transcode by outside of avTranscoder (streaming mode)
  */
 enum EProcessMethod
 {
@@ -121,8 +121,8 @@ class AvExport Transcoder
 	StreamTranscoder& getStreamTranscoder( size_t streamIndex ) const { return *_streamTranscoders.at( streamIndex ); }
 
 	/**
-	 * @brief Set the transcodage politic.
-	 * @note By default eProcessMethodLongest.
+	 * @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.
 	 */
 	void setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream = 0 );
@@ -146,26 +146,25 @@ class AvExport Transcoder
 
 	/**
 	 * @brief Get the duration of the stream.
+	 * @note If the stream is a generator, return limit of double.
 	 */
 	double getStreamDuration( size_t indexStream ) const;
 
 	/**
 	* @brief Get the duration of the shortest stream.
-	* @note if there is only generated streams, return limit of double.
 	*/
 	double getMinTotalDuration() const;
 
 	/**
 	 * @brief Get the duration of the longest stream.
-	 * @note if there is only generated streams, return limit of double.
 	 */
 	double getMaxTotalDuration() const;
 
 	/**
 	 * @brief Get the duration of the output program
 	 * @note Depends on the streams, the process method, and the main stream index.
          */
-	double getTotalDurationFromProcessMethod() const;
+	double getOutputDuration() const;
 
 	/**
 	 * @brief Set for each StreamTranscoder if it is an infinity stream (switch to generator at the end of the stream).

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ Transcoder::Transcoder( OutputFile& outputFile )`
`17`	`17`	`, _streamTranscoders()`
`18`	`18`	`, _streamTranscodersAllocated()`
`19`	`19`	`, _profileLoader( true )`
`20`		`- , _eProcessMethod ( eProcessMethodLongest )`
	`20`	`+ , _eProcessMethod ( eProcessMethodBasedOnStream )`
`21`	`21`	`, _mainStreamIndex( 0 )`
`22`	`22`	`, _verbose( false )`
`23`	`23`	`{`
`@@ -277,7 +277,7 @@ void Transcoder::process( IProgress& progress )`
`277`	`277`
`278`	`278`	`preProcessCodecLatency();`
`279`	`279`
`280`		`- double totalDuration = getTotalDurationFromProcessMethod();`
	`280`	`+ double totalDuration = getOutputDuration();`
`281`	`281`
`282`	`282`	`size_t frame = 0;`
`283`	`283`	`bool frameProcessed = true;`
`@@ -478,7 +478,7 @@ double Transcoder::getMaxTotalDuration() const`
`478`	`478`	`return maxTotalDuration;`
`479`	`479`	`}`
`480`	`480`
`481`		`-double Transcoder::getTotalDurationFromProcessMethod() const`
	`481`	`+double Transcoder::getOutputDuration() const`
`482`	`482`	`{`
`483`	`483`	`switch( _eProcessMethod )`
`484`	`484`	`{`