Transcoder: remove _outputFps attribute

Clement Champetier · Clement Champetier · commit c90265e22d49 · 2014-11-03T12:17:01.000+01:00
* The method setOutputFps does not do what the user expected: the fps of
Transcoder is only used for progress bar (no consequencies in transcode
process !).
* This kind of method must be implemented in the outputStream on which
we want to update the fps.
diff --git a/app/genericProcessor/genericProcessor.cpp b/app/genericProcessor/genericProcessor.cpp
@@ -116,7 +116,6 @@ int main( int argc, char** argv )
 		// set verbose of all stream
 		transcoder.setVerbose( verbose );
 		transcoder.setProcessMethod( avtranscoder::eProcessMethodLongest );
-		//transcoder.setOutputFps( 12 );
 		transcoder.init();
 		
 		if( verbose )
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -12,7 +12,6 @@ Transcoder::Transcoder( OutputFile& outputFile )
 	, _inputFiles()
 	, _streamTranscoders()
 	, _profile( true )
-	, _outputFps( 25 )
 	, _eProcessMethod ( eProcessMethodLongest )
 	, _mainStreamIndex( 0 )
 	, _verbose( false )
@@ -266,7 +265,7 @@ void Transcoder::process( IProgress& progress )
 		if( ! processFrame() )
 			break;
 		
-		if( progress.progress( 1 / _outputFps * ( frame ), totalDuration ) == eJobStatusCancel )
+		if( progress.progress( 1 / 25. * ( frame ), totalDuration ) == eJobStatusCancel )
 		{
 			break;
 		}
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -133,12 +133,6 @@ class AvExport Transcoder
 	 */
 	void setVerbose( bool verbose = true );
 
-	/**
-	 * @brief Set FPS of output media file.
-	 * @note By default 25 frames per second.
-     */
-	void setOutputFps( double fps ) { _outputFps = fps; }
-
 private:
 
 	void addRewrapStream( const std::string& filename, const size_t streamIndex );
@@ -176,8 +170,6 @@ class AvExport Transcoder
 
 	Profile _profile;  ///< Objet to get existing profiles, and add new ones for the Transcoder.
 
-	double _outputFps;
-
 	EProcessMethod _eProcessMethod;
 
 	size_t _mainStreamIndex;  ///< Index of stream used to stop the process of transcode in case of eProcessMethodBasedOnStream.
