IInputStream: remove getDuration

Clement Champetier · Clement Champetier · commit 447392a9e68e · 2015-10-30T12:06:10.000+01:00
diff --git a/src/AvTranscoder/stream/IInputStream.hpp b/src/AvTranscoder/stream/IInputStream.hpp
@@ -31,7 +31,6 @@ class AvExport IInputStream
 	 */
 	virtual const StreamProperties& getProperties() const = 0;
 	virtual size_t getStreamIndex() const = 0;
-	virtual float getDuration() const = 0;  ///< Get duration of the stream, in seconds
 
 	//@{
 	/**
diff --git a/src/AvTranscoder/stream/InputStream.cpp b/src/AvTranscoder/stream/InputStream.cpp
@@ -113,11 +113,6 @@ const StreamProperties& InputStream::getProperties() const
 	return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex );
 }
 
-float InputStream::getDuration() const
-{
-	return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex ).getDuration();
-}
-
 void InputStream::addPacket( const AVPacket& packet )
 {
 	// Do not cache data if the stream is declared as unused in process
diff --git a/src/AvTranscoder/stream/InputStream.hpp b/src/AvTranscoder/stream/InputStream.hpp
@@ -26,7 +26,6 @@ class AvExport InputStream : public IInputStream
 
 	const StreamProperties& getProperties() const;
 	size_t getStreamIndex() const { return _streamIndex; }
-	float getDuration() const;
 
 	VideoCodec& getVideoCodec();
 	AudioCodec& getAudioCodec();
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -383,7 +383,7 @@ bool StreamTranscoder::processFrame()
 	}
 	else if( _offset < 0 )
 	{
-		const bool endOfStream = _outputStream->getStreamDuration() >= ( _inputStream->getDuration() + _offset );
+		const bool endOfStream = _outputStream->getStreamDuration() >= ( _inputStream->getProperties().getDuration() + _offset );
 		if( endOfStream )
 		{
 			LOG_INFO( "End of negative offset" )
@@ -516,10 +516,11 @@ float StreamTranscoder::getDuration() const
 {
 	if( _inputStream )
 	{
-		const float totalDuration = _inputStream->getDuration() + _offset;
+		const StreamProperties& streamProperties = _inputStream->getProperties();
+		const float totalDuration = streamProperties.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." )
+			LOG_WARN( "Offset of " << _offset << "s applied to a stream with a duration of " << streamProperties.getDuration() << "s. Set its duration to 0s." )
 			return 0.;
 		}
 		return totalDuration;

Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,6 @@ const StreamProperties& InputStream::getProperties() const`
`113`	`113`	`return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex );`
`114`	`114`	`}`
`115`	`115`
`116`		`-float InputStream::getDuration() const`
`117`		`-{`
`118`		`- return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex ).getDuration();`
`119`		`-}`
`120`		`-`
`121`	`116`	`void InputStream::addPacket( const AVPacket& packet )`
`122`	`117`	`{`
`123`	`118`	`// Do not cache data if the stream is declared as unused in process`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ bool StreamTranscoder::processFrame()`
`383`	`383`	`}`
`384`	`384`	`else if( _offset < 0 )`
`385`	`385`	`{`
`386`		`- const bool endOfStream = _outputStream->getStreamDuration() >= ( _inputStream->getDuration() + _offset );`
	`386`	`+ const bool endOfStream = _outputStream->getStreamDuration() >= ( _inputStream->getProperties().getDuration() + _offset );`
`387`	`387`	`if( endOfStream )`
`388`	`388`	`{`
`389`	`389`	`LOG_INFO( "End of negative offset" )`
`@@ -516,10 +516,11 @@ float StreamTranscoder::getDuration() const`
`516`	`516`	`{`
`517`	`517`	`if( _inputStream )`
`518`	`518`	`{`
`519`		`- const float totalDuration = _inputStream->getDuration() + _offset;`
	`519`	`+ const StreamProperties& streamProperties = _inputStream->getProperties();`
	`520`	`+ const float totalDuration = streamProperties.getDuration() + _offset;`
`520`	`521`	`if( totalDuration < 0 )`
`521`	`522`	`{`
`522`		`- LOG_WARN( "Offset of " << _offset << "s applied to a stream with a duration of " << _inputStream->getDuration() << "s. Set its duration to 0s." )`
	`523`	`+ LOG_WARN( "Offset of " << _offset << "s applied to a stream with a duration of " << streamProperties.getDuration() << "s. Set its duration to 0s." )`
`523`	`524`	`return 0.;`
`524`	`525`	`}`
`525`	`526`	`return totalDuration;`