Manage duration as a float

Clement Champetier · Clement Champetier · commit eaf480e1c8ff · 2015-06-22T17:52:16.000+02:00
Double type is not constructed the same way in C++ and Java, and does
not exist in python. Our bindings of 'C++ double' could create issues,
and since a fps with a simple precision is enough, we decided to return
fps as float.
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -157,7 +157,7 @@ double FileProperties::getStartTime() const
 	return  1.0 * (unsigned int)_avFormatContext->start_time / AV_TIME_BASE;
 }
 
-double FileProperties::getDuration() const
+float FileProperties::getDuration() const
 {
 	if( ! _avFormatContext )
 		throw std::runtime_error( "unknown format context" );
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -44,7 +44,7 @@ class AvExport FileProperties
 
 	size_t getProgramsCount() const;
 	double getStartTime() const;
-	double getDuration() const;  ///< in seconds
+	float getDuration() const;  ///< in seconds
 	size_t getBitRate() const;  ///< total stream bitrate in bit/s, 0 if not available (result of a computation by ffmpeg)
 	size_t getPacketSize() const;
 
diff --git a/src/AvTranscoder/mediaProperty/StreamProperties.cpp b/src/AvTranscoder/mediaProperty/StreamProperties.cpp
@@ -37,11 +37,10 @@ Rational StreamProperties::getTimeBase() const
 	return timeBase;
 }
 
-double StreamProperties::getDuration() const
+float StreamProperties::getDuration() const
 {
 	Rational timeBase = getTimeBase();
-	double duration = ( timeBase.num / (double) timeBase.den ) * _formatContext->streams[_streamIndex]->duration;
-	return duration;
+	return ( timeBase.num / (float) timeBase.den ) * _formatContext->streams[_streamIndex]->duration;
 }
 
 PropertyVector StreamProperties::getPropertiesAsVector() const
diff --git a/src/AvTranscoder/mediaProperty/StreamProperties.hpp b/src/AvTranscoder/mediaProperty/StreamProperties.hpp
@@ -18,7 +18,7 @@ class AvExport StreamProperties
 	size_t getStreamIndex() const { return _streamIndex; }
 	size_t getStreamId() const;
 	Rational getTimeBase() const;
-	double getDuration() const;  ///< in seconds
+	float getDuration() const;  ///< in seconds
 	const PropertyVector& getMetadatas() const { return _metadatas; }
 
 #ifndef SWIG
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -523,8 +523,8 @@ float VideoProperties::getFps() const
 	const size_t nbFrames = getNbFrames();
 	if( nbFrames )
 	{
-		double duration = getDuration();
-		double epsilon = std::numeric_limits<double>::epsilon();
+		const float duration = getDuration();
+		const float epsilon = std::numeric_limits<float>::epsilon();
 		if( duration > epsilon )
 			return nbFrames / duration;
 	}
diff --git a/src/AvTranscoder/stat/AudioStat.hpp b/src/AvTranscoder/stat/AudioStat.hpp
@@ -12,13 +12,13 @@ namespace avtranscoder
 class AvExport AudioStat
 {
 public:
-	AudioStat( const double duration, const size_t nbPackets )
+	AudioStat( const float duration, const size_t nbPackets )
 	: _duration( duration )
 	, _nbPackets( nbPackets )
 	{}
 
 public:
-	double _duration;
+	float _duration;
 	size_t _nbPackets;
 };
 
diff --git a/src/AvTranscoder/stat/VideoStat.hpp b/src/AvTranscoder/stat/VideoStat.hpp
@@ -12,7 +12,7 @@ namespace avtranscoder
 class AvExport VideoStat
 {
 public:
-	VideoStat( const double duration, const size_t nbFrames )
+	VideoStat( const float duration, const size_t nbFrames )
 	: _duration( duration )
 	, _nbFrames( nbFrames )
 	, _quality( 0 )
@@ -23,7 +23,7 @@ class AvExport VideoStat
 	static double psnr( const double d );
 
 public:
-	double _duration;
+	float _duration;
 	size_t _nbFrames;
 	size_t _quality;  ///< Between 1 (good) and FF_LAMBDA_MAX (bad). 0 if unknown.
 	double _psnr;  ///< 0 if unknown.
diff --git a/src/AvTranscoder/stream/IInputStream.hpp b/src/AvTranscoder/stream/IInputStream.hpp
@@ -22,7 +22,7 @@ class AvExport IInputStream
 	virtual bool readNextPacket( CodedData& data ) = 0;
 
 	virtual size_t getStreamIndex() const = 0;
-	virtual double getDuration() const = 0;
+	virtual float getDuration() const = 0;
 	virtual AVMediaType getStreamType() const = 0;
 
 	//@{
diff --git a/src/AvTranscoder/stream/IOutputStream.hpp b/src/AvTranscoder/stream/IOutputStream.hpp
@@ -25,7 +25,7 @@ class AvExport IOutputStream
 	virtual ~IOutputStream() {};
 
 	virtual size_t getStreamIndex() const = 0;
-	virtual double getStreamDuration() const = 0;
+	virtual float getStreamDuration() const = 0;
 	virtual size_t getNbFrames() const = 0;
 
 	virtual EWrappingStatus wrap( const CodedData& data ) = 0;
diff --git a/src/AvTranscoder/stream/InputStream.cpp b/src/AvTranscoder/stream/InputStream.cpp
@@ -111,7 +111,7 @@ AVMediaType InputStream::getStreamType() const
 	return _inputFile->getFormatContext().getAVStream( _streamIndex ).codec->codec_type;
 }
 
-double InputStream::getDuration() const
+float InputStream::getDuration() const
 {
 	return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex ).getDuration();
 }
diff --git a/src/AvTranscoder/stream/InputStream.hpp b/src/AvTranscoder/stream/InputStream.hpp
@@ -26,7 +26,7 @@ class AvExport InputStream : public IInputStream
 
 	size_t getStreamIndex() const { return _streamIndex; }
 	/// Get duration of the stream, in seconds
-	double getDuration() const;
+	float getDuration() const;
 	AVMediaType getStreamType() const;
 
 	VideoCodec& getVideoCodec();
diff --git a/src/AvTranscoder/stream/OutputStream.cpp b/src/AvTranscoder/stream/OutputStream.cpp
@@ -14,7 +14,7 @@ OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )
 {
 }
 
-double OutputStream::getStreamDuration() const
+float OutputStream::getStreamDuration() const
 {
 	AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );
 #if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55, 40, 100)
diff --git a/src/AvTranscoder/stream/OutputStream.hpp b/src/AvTranscoder/stream/OutputStream.hpp
@@ -14,7 +14,7 @@ class AvExport OutputStream : public IOutputStream
 	OutputStream( OutputFile& outputFile, const size_t streamIndex );
 
 	size_t getStreamIndex() const { return _streamIndex; }
-	double getStreamDuration() const;
+	float getStreamDuration() const;
 	size_t getNbFrames() const;  ///< If audio stream, returns number of packets
 
 	IOutputStream::EWrappingStatus wrap( const CodedData& data );
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -482,11 +482,11 @@ void StreamTranscoder::switchToInputDecoder()
 	assert( _currentDecoder != NULL );
 }
 
-double StreamTranscoder::getDuration() const
+float StreamTranscoder::getDuration() const
 {	
 	if( _inputStream )
 	{
-		double totalDuration = _inputStream->getDuration() + _offset;
+		const float totalDuration = _inputStream->getDuration() + _offset;
 		if( totalDuration < 0 )
 		{
 			LOG_WARN( "Offset of " << _offset << "s applied to a stream with a duration of " << _inputStream->getDuration() << "s. Set its duration to 0s." )
@@ -495,7 +495,7 @@ double StreamTranscoder::getDuration() const
 		return totalDuration;
 	}
 	else
-		return std::numeric_limits<double>::max();
+		return std::numeric_limits<float>::max();
 }
 
 StreamTranscoder::EProcessCase StreamTranscoder::getProcessCase() const
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -68,7 +68,7 @@ class AvExport StreamTranscoder
 	 * @note if it's a generated stream, return limit of double.
 	 * @note if offset > duration of the stream, return 0
 	 */
-	double getDuration() const;
+	float getDuration() const;
 
 	/// Returns a reference to the current decoder (from input file or from generator)
 	IDecoder& getCurrentDecoder() const { return *_currentDecoder; }
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -435,34 +435,32 @@ ProfileLoader::Profile Transcoder::getProfileFromFile( InputFile& inputFile, con
 	return profile;
 }
 
-double Transcoder::getStreamDuration( size_t indexStream ) const
+float Transcoder::getStreamDuration( size_t indexStream ) const
 {
 	return _streamTranscoders.at( indexStream )->getDuration();
 }
 
-double Transcoder::getMinTotalDuration() const
+float Transcoder::getMinTotalDuration() const
 {
-	double minTotalDuration = std::numeric_limits<double>::max();
-	
+	float minTotalDuration = std::numeric_limits<float>::max();
 	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
 	{
 		minTotalDuration = std::min( getStreamDuration( i ), minTotalDuration );
 	}
 	return minTotalDuration;
 }
 
-double Transcoder::getMaxTotalDuration() const
+float Transcoder::getMaxTotalDuration() const
 {
-	double maxTotalDuration = 0;
-	
+	float maxTotalDuration = 0;
 	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
 	{
 		maxTotalDuration = std::max( getStreamDuration( i ), maxTotalDuration );
 	}
 	return maxTotalDuration;
 }
 
-double Transcoder::getOutputDuration() const
+float Transcoder::getOutputDuration() const
 {
 	switch( _eProcessMethod )
 	{
@@ -475,7 +473,7 @@ double Transcoder::getOutputDuration() const
 		case eProcessMethodBasedOnDuration :
 			return _outputDuration;
 		case eProcessMethodInfinity :
-			return std::numeric_limits<double>::max();
+			return std::numeric_limits<float>::max();
 		default:
 			return getMaxTotalDuration();
 	}	
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -167,23 +167,23 @@ class AvExport Transcoder
 	 * @brief Get the duration of the stream, in seconds
 	 * @note If the stream is a generator, return limit of double.
 	 */
-	double getStreamDuration( size_t indexStream ) const;
+	float getStreamDuration( size_t indexStream ) const;
 
 	/**
 	* @brief Get the duration of the shortest stream, in seconds
 	*/
-	double getMinTotalDuration() const;
+	float getMinTotalDuration() const;
 
 	/**
 	 * @brief Get the duration of the longest stream, in seconds
 	 */
-	double getMaxTotalDuration() const;
+	float getMaxTotalDuration() const;
 
 	/**
 	 * @brief Get the duration of the output program
 	 * @note Depends on the streams, the process method, and the main stream index.
          */
-	double getOutputDuration() const;
+	float getOutputDuration() const;
 
 	/**
 	 * @brief Set for each StreamTranscoder if it can switch to generator at the end.
@@ -206,7 +206,7 @@ class AvExport Transcoder
 
 	EProcessMethod _eProcessMethod;  ///< Transcoding policy
 	size_t _mainStreamIndex;  ///< Index of stream used to stop the process of transcode in case of eProcessMethodBasedOnStream.
-	double _outputDuration;  ///< Duration of output media used to stop the process of transcode in case of eProcessMethodBasedOnDuration.
+	float _outputDuration;  ///< Duration of output media used to stop the process of transcode in case of eProcessMethodBasedOnDuration.
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ double FileProperties::getStartTime() const`
`157`	`157`	`return 1.0 * (unsigned int)_avFormatContext->start_time / AV_TIME_BASE;`
`158`	`158`	`}`
`159`	`159`
`160`		`-double FileProperties::getDuration() const`
	`160`	`+float FileProperties::getDuration() const`
`161`	`161`	`{`
`162`	`162`	`if( ! _avFormatContext )`
`163`	`163`	`throw std::runtime_error( "unknown format context" );`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,10 @@ Rational StreamProperties::getTimeBase() const`
`37`	`37`	`return timeBase;`
`38`	`38`	`}`
`39`	`39`
`40`		`-double StreamProperties::getDuration() const`
	`40`	`+float StreamProperties::getDuration() const`
`41`	`41`	`{`
`42`	`42`	`Rational timeBase = getTimeBase();`
`43`		`- double duration = ( timeBase.num / (double) timeBase.den ) * _formatContext->streams[_streamIndex]->duration;`
`44`		`- return duration;`
	`43`	`+ return ( timeBase.num / (float) timeBase.den ) * _formatContext->streams[_streamIndex]->duration;`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`PropertyVector StreamProperties::getPropertiesAsVector() const`
Original file line number	Diff line number	Diff line change
`@@ -523,8 +523,8 @@ float VideoProperties::getFps() const`
`523`	`523`	`const size_t nbFrames = getNbFrames();`
`524`	`524`	`if( nbFrames )`
`525`	`525`	`{`
`526`		`- double duration = getDuration();`
`527`		`- double epsilon = std::numeric_limits<double>::epsilon();`
	`526`	`+ const float duration = getDuration();`
	`527`	`+ const float epsilon = std::numeric_limits<float>::epsilon();`
`528`	`528`	`if( duration > epsilon )`
`529`	`529`	`return nbFrames / duration;`
`530`	`530`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ AVMediaType InputStream::getStreamType() const`
`111`	`111`	`return _inputFile->getFormatContext().getAVStream( _streamIndex ).codec->codec_type;`
`112`	`112`	`}`
`113`	`113`
`114`		`-double InputStream::getDuration() const`
	`114`	`+float InputStream::getDuration() const`
`115`	`115`	`{`
`116`	`116`	`return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex ).getDuration();`
`117`	`117`	`}`