Merge pull request #106 from cchampet/feature/FTDMAT-326

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 5ebabd0d8bde · 2014-10-08T03:13:47.000-07:00
Transcoder: add process method based on stream
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -17,6 +17,7 @@ Transcoder::Transcoder( OutputFile& outputFile )
 	, _outputFps( 25 )
 	, _finalisedStreams( 0 )
 	, _eProcessMethod ( eProcessMethodLongest )
+	, _mainStreamIndex( 0 )
 	, _verbose( false )
 {
 	_outputFile.setup();
@@ -275,6 +276,9 @@ void Transcoder::process( IProgress& progress )
 		case eProcessMethodLongest :
 			totalDuration = getMaxTotalDuration();
 			break;
+		case eProcessMethodBasedOnStream :
+			totalDuration = getStreamDuration( _mainStreamIndex );
+			break;
 		case eProcessMethodInfinity :
 			totalDuration = std::numeric_limits<double>::max();
 			break;
@@ -304,9 +308,10 @@ void Transcoder::process( IProgress& progress )
 	_outputFile.endWrap();
 }
 
-void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod )
+void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream )
 {
 	_eProcessMethod	= eProcessMethod;
+	_mainStreamIndex = indexBasedStream;
 
 	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
 	{
@@ -324,6 +329,12 @@ void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod )
 				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;
@@ -447,13 +458,18 @@ InputFile* Transcoder::addInputFile( const std::string& filename, const size_t s
 	return referenceFile;
 }
 
+double Transcoder::getStreamDuration( size_t indexStream ) const
+{
+	return _streamTranscoders.at( indexStream )->getDuration();
+}
+
 double Transcoder::getMinTotalDuration() const
 {
 	double minTotalDuration = std::numeric_limits<double>::max();
 	
 	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
 	{
-		minTotalDuration = std::min( _streamTranscoders.at( i )->getDuration(), minTotalDuration );
+		minTotalDuration = std::min( getStreamDuration( i ), minTotalDuration );
 	}
 	return minTotalDuration;
 }
@@ -464,7 +480,7 @@ double Transcoder::getMaxTotalDuration() const
 	
 	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
 	{
-		maxTotalDuration = std::max( _streamTranscoders.at( i )->getDuration(), maxTotalDuration );
+		maxTotalDuration = std::max( getStreamDuration( i ), maxTotalDuration );
 	}
 	return maxTotalDuration;
 }
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -27,12 +27,14 @@ 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).
  * eProcessMethodInfinity: stop transcode by outside of avTranscoder.
  */
 enum EProcessMethod
 {
 	eProcessMethodShortest = 0,
 	eProcessMethodLongest,
+	eProcessMethodBasedOnStream,
 	eProcessMethodInfinity,
 };
 
@@ -116,8 +118,9 @@ class Transcoder
 	/**
 	 * @brief Set the transcodage politic.
 	 * @note If you call it before adding the streams, the process will stop at the end of the shortest stream.
+	 * @param indexBasedStream: in case of process method eProcessMethodBasedOnStream, stop transcode at the end of the indicated stream.
 	 */
-	void setProcessMethod( const EProcessMethod eProcessMethod );
+	void setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream = 0 );
 
 	/**
 	 * @brief Set verbose mode for the Transcoder and his streams.
@@ -139,9 +142,14 @@ class Transcoder
 
 	InputFile* addInputFile( const std::string& filename, const size_t streamIndex );
 
+	/**
+	 * @brief Get the duration of the stream.
+	 */
+	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.
+	* @note if there is only generated streams, return limit of double.
 	*/
 	double getMinTotalDuration() const;
 
@@ -168,6 +176,8 @@ class Transcoder
 	size_t _finalisedStreams;
 	EProcessMethod _eProcessMethod;
 
+	size_t _mainStreamIndex;  ///< Index of stream used to stop the process of transcode in case of eProcessMethodBasedOnStream.
+
 	bool    _verbose;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ Transcoder::Transcoder( OutputFile& outputFile )`
`17`	`17`	`, _outputFps( 25 )`
`18`	`18`	`, _finalisedStreams( 0 )`
`19`	`19`	`, _eProcessMethod ( eProcessMethodLongest )`
	`20`	`+ , _mainStreamIndex( 0 )`
`20`	`21`	`, _verbose( false )`
`21`	`22`	`{`
`22`	`23`	`_outputFile.setup();`
`@@ -275,6 +276,9 @@ void Transcoder::process( IProgress& progress )`
`275`	`276`	`case eProcessMethodLongest :`
`276`	`277`	`totalDuration = getMaxTotalDuration();`
`277`	`278`	`break;`
	`279`	`+ case eProcessMethodBasedOnStream :`
	`280`	`+ totalDuration = getStreamDuration( _mainStreamIndex );`
	`281`	`+ break;`
`278`	`282`	`case eProcessMethodInfinity :`
`279`	`283`	`totalDuration = std::numeric_limits<double>::max();`
`280`	`284`	`break;`
`@@ -304,9 +308,10 @@ void Transcoder::process( IProgress& progress )`
`304`	`308`	`_outputFile.endWrap();`
`305`	`309`	`}`
`306`	`310`
`307`		`-void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod )`
	`311`	`+void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream )`
`308`	`312`	`{`
`309`	`313`	`_eProcessMethod = eProcessMethod;`
	`314`	`+ _mainStreamIndex = indexBasedStream;`
`310`	`315`
`311`	`316`	`for( size_t i = 0; i < _streamTranscoders.size(); ++i )`
`312`	`317`	`{`
`@@ -324,6 +329,12 @@ void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod )`
`324`	`329`	`else`
`325`	`330`	`_streamTranscoders.at( i )->setInfinityStream( true );`
`326`	`331`	`break;`
	`332`	`+ case eProcessMethodBasedOnStream :`
	`333`	`+ if( i != _mainStreamIndex )`
	`334`	`+ _streamTranscoders.at( i )->setInfinityStream( true );`
	`335`	`+ else`
	`336`	`+ _streamTranscoders.at( i )->setInfinityStream( false );`
	`337`	`+ break;`
`327`	`338`	`case eProcessMethodInfinity :`
`328`	`339`	`_streamTranscoders.at( i )->setInfinityStream( true );`
`329`	`340`	`break;`
`@@ -447,13 +458,18 @@ InputFile* Transcoder::addInputFile( const std::string& filename, const size_t s`
`447`	`458`	`return referenceFile;`
`448`	`459`	`}`
`449`	`460`
	`461`	`+double Transcoder::getStreamDuration( size_t indexStream ) const`
	`462`	`+{`
	`463`	`+ return _streamTranscoders.at( indexStream )->getDuration();`
	`464`	`+}`
	`465`	`+`
`450`	`466`	`double Transcoder::getMinTotalDuration() const`
`451`	`467`	`{`
`452`	`468`	`double minTotalDuration = std::numeric_limits<double>::max();`
`453`	`469`
`454`	`470`	`for( size_t i = 0; i < _streamTranscoders.size(); ++i )`
`455`	`471`	`{`
`456`		`- minTotalDuration = std::min( _streamTranscoders.at( i )->getDuration(), minTotalDuration );`
	`472`	`+ minTotalDuration = std::min( getStreamDuration( i ), minTotalDuration );`
`457`	`473`	`}`
`458`	`474`	`return minTotalDuration;`
`459`	`475`	`}`
`@@ -464,7 +480,7 @@ double Transcoder::getMaxTotalDuration() const`
`464`	`480`
`465`	`481`	`for( size_t i = 0; i < _streamTranscoders.size(); ++i )`
`466`	`482`	`{`
`467`		`- maxTotalDuration = std::max( _streamTranscoders.at( i )->getDuration(), maxTotalDuration );`
	`483`	`+ maxTotalDuration = std::max( getStreamDuration( i ), maxTotalDuration );`
`468`	`484`	`}`
`469`	`485`	`return maxTotalDuration;`
`470`	`486`	`}`