Merge pull request #245 from cchampet/fix_outputStreamDuration

valnoel · valnoel · commit c2170ccd4d03 · 2015-10-05T14:06:45.000+02:00
Fix output stream duration
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -75,6 +75,13 @@ IOutputStream& OutputFile::addAudioStream( const AudioCodec& audioDesc )
 	stream.codec->channels = audioDesc.getAVCodecContext().channels;
 	stream.codec->sample_fmt = audioDesc.getAVCodecContext().sample_fmt;
 
+	// need to set the time_base on the AVCodecContext of the AVStream
+	av_reduce(
+		&stream.codec->time_base.num,
+		&stream.codec->time_base.den,
+		audioDesc.getAVCodecContext().time_base.num,
+		audioDesc.getAVCodecContext().time_base.den,
+		INT_MAX );
 
 	OutputStream* outputStream = new OutputStream( *this, _formatContext.getNbStreams() - 1 );
 	_outputStreams.push_back( outputStream );
diff --git a/src/AvTranscoder/stream/IOutputStream.hpp b/src/AvTranscoder/stream/IOutputStream.hpp
@@ -25,7 +25,15 @@ class AvExport IOutputStream
 	virtual ~IOutputStream() {};
 
 	virtual size_t getStreamIndex() const = 0;
+
+	/**
+	 * @return The current duration of the stream, in seconds.
+	 */
 	virtual float getStreamDuration() const = 0;
+
+	/**
+	 * @return The current number of frame of the stream.
+	 */
 	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
@@ -118,7 +118,7 @@ float InputStream::getDuration() const
 	return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex ).getDuration();
 }
 
-void InputStream::addPacket( AVPacket& packet )
+void InputStream::addPacket( const AVPacket& packet )
 {
 	// Do not cache data if the stream is declared as unused in process
 	if( ! _isActivated )
diff --git a/src/AvTranscoder/stream/InputStream.hpp b/src/AvTranscoder/stream/InputStream.hpp
@@ -40,7 +40,7 @@ class AvExport InputStream : public IInputStream
 	 */
 	void activate( const bool activate = true ){ _isActivated = activate; };
 	bool isActivated() const { return _isActivated; };
-	void addPacket( AVPacket& packet );
+	void addPacket( const AVPacket& packet );
 	void clearBuffering();
 	//@}
 
diff --git a/src/AvTranscoder/stream/OutputStream.cpp b/src/AvTranscoder/stream/OutputStream.cpp
@@ -9,40 +9,55 @@ namespace avtranscoder
 
 OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )
 	: IOutputStream()
-	, _outputFile( &outputFile )
+	, _outputFile( outputFile )
+	, _outputAVStream( outputFile.getFormatContext().getAVStream( streamIndex ) )
 	, _streamIndex( streamIndex )
+	, _wrappedPacketsDuration( 0 )
 {
 }
 
 float OutputStream::getStreamDuration() const
 {
-	const AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );
+	const AVFrac& outputPTS = _outputAVStream.pts;
+	const AVRational& outputTimeBase = _outputAVStream.time_base;
 
 	// check floating point exception
-	if( outputStream.time_base.den == 0 || outputStream.pts.den == 0 )
+	if( outputTimeBase.den == 0 || outputPTS.den == 0 )
 	{
 		LOG_WARN( "Cannot compute stream duration of output stream at index " << _streamIndex )
 		return 0.f;
 	}
 
+	// if stream PTS is not set, use the duration of all packets wrapped
+	if( ! outputPTS.val )
+	{
+		LOG_WARN( "PTS generation when outputting stream " << _streamIndex << " is not set." )
+		if( _wrappedPacketsDuration )
+			return av_q2d( _outputAVStream.codec->time_base ) * _wrappedPacketsDuration;
+	}
+
 #if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55, 40, 100)
 	// returns the pts of the last muxed packet, converted from timebase to seconds
-	return av_q2d( outputStream.time_base ) * av_stream_get_end_pts( &outputStream );
+	return av_q2d( outputTimeBase ) * av_stream_get_end_pts( &_outputAVStream );
 #else
-	return av_q2d( outputStream.time_base ) * ( outputStream.pts.val + ( outputStream.pts.num / outputStream.pts.den ) );
+	return av_q2d( outputTimeBase ) * ( outputPTS.val + ( outputPTS.num / outputPTS.den ) );
 #endif
 }
 
 size_t OutputStream::getNbFrames() const
 {
-	const AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );
-	return outputStream.nb_frames;
+	return _outputAVStream.nb_frames;
 }
 
 IOutputStream::EWrappingStatus OutputStream::wrap( const CodedData& data )
 {
-	assert( _outputFile != NULL );
-	return _outputFile->wrap( data, _streamIndex );
+	// wrap packet
+	IOutputStream::EWrappingStatus status = _outputFile.wrap( data, _streamIndex );
+
+	// append duration of the packet to the stream
+	_wrappedPacketsDuration += data.getAVPacket().duration;
+
+	return status;
 }
 
 }
diff --git a/src/AvTranscoder/stream/OutputStream.hpp b/src/AvTranscoder/stream/OutputStream.hpp
@@ -3,6 +3,8 @@
 
 #include "IOutputStream.hpp"
 
+struct AVStream;
+
 namespace avtranscoder
 {
 
@@ -20,9 +22,17 @@ class AvExport OutputStream : public IOutputStream
 	IOutputStream::EWrappingStatus wrap( const CodedData& data );
 
 private:
-	OutputFile* _outputFile;  ///< Has link (no ownership)
+	OutputFile& _outputFile;  ///< Has link (no ownership)
+	const AVStream& _outputAVStream;  ///< Has link (no ownership)
 
 	size_t _streamIndex;  ///<  Index of the stream in the output file
+
+	/**
+	 * @brief This will help us to getStreamDuration if PTS of outputStream is not properly set during wrapping.
+	 * It corresponds to the addition of the duration of all packets wrapped by this stream.
+	 * @see getStreamDuration
+	 */
+	size_t _wrappedPacketsDuration;
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ float InputStream::getDuration() const`
`118`	`118`	`return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex ).getDuration();`
`119`	`119`	`}`
`120`	`120`
`121`		`-void InputStream::addPacket( AVPacket& packet )`
	`121`	`+void InputStream::addPacket( const AVPacket& packet )`
`122`	`122`	`{`
`123`	`123`	`// Do not cache data if the stream is declared as unused in process`
`124`	`124`	`if( ! _isActivated )`
Original file line number	Diff line number	Diff line change
`@@ -9,40 +9,55 @@ namespace avtranscoder`
`9`	`9`
`10`	`10`	`OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )`
`11`	`11`	`: IOutputStream()`
`12`		`- , _outputFile( &outputFile )`
	`12`	`+ , _outputFile( outputFile )`
	`13`	`+ , _outputAVStream( outputFile.getFormatContext().getAVStream( streamIndex ) )`
`13`	`14`	`, _streamIndex( streamIndex )`
	`15`	`+ , _wrappedPacketsDuration( 0 )`
`14`	`16`	`{`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`float OutputStream::getStreamDuration() const`
`18`	`20`	`{`
`19`		`- const AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );`
	`21`	`+ const AVFrac& outputPTS = _outputAVStream.pts;`
	`22`	`+ const AVRational& outputTimeBase = _outputAVStream.time_base;`
`20`	`23`
`21`	`24`	`// check floating point exception`
`22`		`- if( outputStream.time_base.den == 0 \|\| outputStream.pts.den == 0 )`
	`25`	`+ if( outputTimeBase.den == 0 \|\| outputPTS.den == 0 )`
`23`	`26`	`{`
`24`	`27`	`LOG_WARN( "Cannot compute stream duration of output stream at index " << _streamIndex )`
`25`	`28`	`return 0.f;`
`26`	`29`	`}`
`27`	`30`
	`31`	`+ // if stream PTS is not set, use the duration of all packets wrapped`
	`32`	`+ if( ! outputPTS.val )`
	`33`	`+ {`
	`34`	`+ LOG_WARN( "PTS generation when outputting stream " << _streamIndex << " is not set." )`
	`35`	`+ if( _wrappedPacketsDuration )`
	`36`	`+ return av_q2d( _outputAVStream.codec->time_base ) * _wrappedPacketsDuration;`
	`37`	`+ }`
	`38`	`+`
`28`	`39`	`#if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55, 40, 100)`
`29`	`40`	`// returns the pts of the last muxed packet, converted from timebase to seconds`
`30`		`- return av_q2d( outputStream.time_base ) * av_stream_get_end_pts( &outputStream );`
	`41`	`+ return av_q2d( outputTimeBase ) * av_stream_get_end_pts( &_outputAVStream );`
`31`	`42`	`#else`
`32`		`- return av_q2d( outputStream.time_base ) * ( outputStream.pts.val + ( outputStream.pts.num / outputStream.pts.den ) );`
	`43`	`+ return av_q2d( outputTimeBase ) * ( outputPTS.val + ( outputPTS.num / outputPTS.den ) );`
`33`	`44`	`#endif`
`34`	`45`	`}`
`35`	`46`
`36`	`47`	`size_t OutputStream::getNbFrames() const`
`37`	`48`	`{`
`38`		`- const AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );`
`39`		`- return outputStream.nb_frames;`
	`49`	`+ return _outputAVStream.nb_frames;`
`40`	`50`	`}`
`41`	`51`
`42`	`52`	`IOutputStream::EWrappingStatus OutputStream::wrap( const CodedData& data )`
`43`	`53`	`{`
`44`		`- assert( _outputFile != NULL );`
`45`		`- return _outputFile->wrap( data, _streamIndex );`
	`54`	`+ // wrap packet`
	`55`	`+ IOutputStream::EWrappingStatus status = _outputFile.wrap( data, _streamIndex );`
	`56`	`+`
	`57`	`+ // append duration of the packet to the stream`
	`58`	`+ _wrappedPacketsDuration += data.getAVPacket().duration;`
	`59`	`+`
	`60`	`+ return status;`
`46`	`61`	`}`
`47`	`62`
`48`	`63`	`}`