Merge branch 'master' into develop

Clement Champetier · Clement Champetier · commit 4122382bda46 · 2015-07-16T11:32:35.000+02:00
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -82,22 +82,40 @@ void FileProperties::extractStreamProperties( IProgress& progress, const EAnalys
 
 	// once the streams vectors are filled, add their references the base streams vector
 	for( size_t streamIndex = 0; streamIndex < _videoStreams.size(); ++streamIndex )
-		_streams[ _videoStreams.at( streamIndex ).getStreamIndex() ] = &_videoStreams.at( streamIndex );
+	{
+		const size_t videoStreamIndex = _videoStreams.at( streamIndex ).getStreamIndex();
+		_streams[ videoStreamIndex ] = &_videoStreams.at( streamIndex );
+	}
 
 	for( size_t streamIndex = 0; streamIndex < _audioStreams.size(); ++ streamIndex )
-		_streams[ _audioStreams.at(streamIndex).getStreamIndex() ] = &_audioStreams.at(streamIndex);
+	{
+		const size_t audioStreamIndex = _audioStreams.at( streamIndex ).getStreamIndex();
+		_streams[ audioStreamIndex ] = &_audioStreams.at(streamIndex);
+	}
 
 	for( size_t streamIndex = 0; streamIndex < _dataStreams.size(); ++ streamIndex )
-		_streams[ _dataStreams.at(streamIndex).getStreamIndex() ] = &_dataStreams.at(streamIndex);
+	{
+		const size_t dataStreamIndex = _dataStreams.at( streamIndex ).getStreamIndex();
+		_streams[ dataStreamIndex ] = &_dataStreams.at(streamIndex);
+	}
 
 	for( size_t streamIndex = 0; streamIndex < _subtitleStreams.size(); ++ streamIndex )
-		_streams[ _subtitleStreams.at(streamIndex).getStreamIndex() ] = &_subtitleStreams.at(streamIndex);
+	{
+		const size_t subtitleStreamIndex = _subtitleStreams.at( streamIndex ).getStreamIndex();
+		_streams[ subtitleStreamIndex ] = &_subtitleStreams.at(streamIndex);
+	}
 
 	for( size_t streamIndex = 0; streamIndex < _attachementStreams.size(); ++ streamIndex )
-		_streams[ _attachementStreams.at(streamIndex).getStreamIndex() ] = &_attachementStreams.at(streamIndex);
+	{
+		const size_t attachementStreamIndex = _attachementStreams.at( streamIndex ).getStreamIndex();
+		_streams[ attachementStreamIndex ] = &_attachementStreams.at(streamIndex);
+	}
 
 	for( size_t streamIndex = 0; streamIndex < _unknownStreams.size(); ++ streamIndex )
-		_streams[ _unknownStreams.at(streamIndex).getStreamIndex() ] = &_unknownStreams.at(streamIndex);
+	{
+		const size_t unknownStreamIndex = _unknownStreams.at( streamIndex ).getStreamIndex();
+		_streams[ unknownStreamIndex ] = &_unknownStreams.at(streamIndex);
+	}
 
 	// if the analysis level has decoded some streams parts, return at the beginning
 	if( level > eAnalyseLevelHeader )
@@ -139,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
@@ -518,20 +518,20 @@ int VideoProperties::getLevel() const
 	return _codecContext->level;
 }
 
-double VideoProperties::getFps() const
+float VideoProperties::getFps() const
 {
-	size_t nbFrames = getNbFrames();
+	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;
 	}
 
 	// if nbFrames of stream is unknwon
 	Rational timeBase = getTimeBase();
-	double fps = timeBase.den / (double) timeBase.num;
+	float fps = timeBase.den / (double) timeBase.num;
 	if( std::isinf( fps ) )
 	{
 		std::ostringstream os;
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -56,7 +56,7 @@ class AvExport VideoProperties : public StreamProperties
 	int getProfile() const;
 	int getLevel() const;
 
-	double getFps() const;
+	float getFps() const;
 
 	bool hasBFrames() const;
 	//bool isClosedGop() const;
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.cpp b/src/AvTranscoder/stat/VideoStat.cpp
@@ -7,7 +7,7 @@ namespace avtranscoder
 
 double VideoStat::psnr( const double d )
 {
-	return -10.0 * log(d) / log(10.0);
+	return -10.0 * log10(d);
 }
 
 }
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
@@ -23,7 +23,7 @@ namespace avtranscoder
 StreamTranscoder::StreamTranscoder(
 		IInputStream& inputStream,
 		IOutputFile& outputFile,
-		const double offset
+		const float offset
 	)
 	: _inputStream( &inputStream )
 	, _outputStream( NULL )
@@ -109,7 +109,7 @@ StreamTranscoder::StreamTranscoder(
 		IOutputFile& outputFile,
 		const ProfileLoader::Profile& profile,
 		const int subStreamIndex,
-		const double offset
+		const float offset
 	)
 	: _inputStream( &inputStream )
 	, _outputStream( NULL )
@@ -400,7 +400,7 @@ bool StreamTranscoder::processRewrap()
 			return true;
 		case IOutputStream::eWrappingWaitingForData:
 			// the wrapper needs more data to write the current packet
-			return processRewrap();
+			return processFrame();
 		case IOutputStream::eWrappingError:
 			return false;
 	}
@@ -458,7 +458,7 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 			return true;
 		case IOutputStream::eWrappingWaitingForData:
 			// the wrapper needs more data to write the current packet
-			return processTranscode( subStreamIndex );
+			return processFrame();
 		case IOutputStream::eWrappingError:
 			return false;
 	}
@@ -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
@@ -29,12 +29,12 @@ class AvExport StreamTranscoder
 	 * @brief rewrap stream
 	 * @note offset feature when rewrap a stream is not supported
 	 **/
-	StreamTranscoder( IInputStream& inputStream, IOutputFile& outputFile, const double offset = 0 );
+	StreamTranscoder( IInputStream& inputStream, IOutputFile& outputFile, const float offset = 0 );
 
 	/**
 	 * @brief transcode stream
 	 **/
-	StreamTranscoder( IInputStream& inputStream, IOutputFile& outputFile, const ProfileLoader::Profile& profile, const int subStreamIndex = -1, const double offset = 0 );
+	StreamTranscoder( IInputStream& inputStream, IOutputFile& outputFile, const ProfileLoader::Profile& profile, const int subStreamIndex = -1, const float offset = 0 );
 
 	/**
 	 * @brief encode from a generated stream
@@ -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; }
@@ -121,7 +121,7 @@ class AvExport StreamTranscoder
 
 	int  _subStreamIndex;  ///< Index of channel that is processed from the input stream (<0 if no demultiplexing).
 
-	double _offset;  ///< Offset, in seconds, at the beginning of the StreamTranscoder.
+	float _offset;  ///< Offset, in seconds, at the beginning of the StreamTranscoder.
 
 	bool _canSwitchToGenerator;  ///< Automatically switch to a generator at the end of the stream
 };
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

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
`@@ -518,20 +518,20 @@ int VideoProperties::getLevel() const`
`518`	`518`	`return _codecContext->level;`
`519`	`519`	`}`
`520`	`520`
`521`		`-double VideoProperties::getFps() const`
	`521`	`+float VideoProperties::getFps() const`
`522`	`522`	`{`
`523`		`- size_t nbFrames = getNbFrames();`
	`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`	`}`
`531`	`531`
`532`	`532`	`// if nbFrames of stream is unknwon`
`533`	`533`	`Rational timeBase = getTimeBase();`
`534`		`- double fps = timeBase.den / (double) timeBase.num;`
	`534`	`+ float fps = timeBase.den / (double) timeBase.num;`
`535`	`535`	`if( std::isinf( fps ) )`
`536`	`536`	`{`
`537`	`537`	`std::ostringstream os;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace avtranscoder`
`7`	`7`
`8`	`8`	`double VideoStat::psnr( const double d )`
`9`	`9`	`{`
`10`		`- return -10.0 * log(d) / log(10.0);`
	`10`	`+ return -10.0 * log10(d);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`}`