OutputStream: fix getStreamDuration (use av_stream_get_end_pts)

Clement Champetier · Clement Champetier · commit 9e0c9426010b · 2015-04-21T17:50:36.000+02:00
Fix #165
diff --git a/src/AvTranscoder/stream/OutputStream.cpp b/src/AvTranscoder/stream/OutputStream.cpp
@@ -17,7 +17,12 @@ OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )
 double OutputStream::getStreamDuration() const
 {
 	AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );
-	return av_q2d( outputStream.time_base ) * outputStream.cur_dts;
+#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 );
+#else
+	return av_q2d( outputStream.time_base ) * ( outputStream.pts.val + ( outputStream.pts.num / outputStream.pts.den ) );
+#endif
 }
 
 IOutputStream::EWrappingStatus OutputStream::wrap( const CodedData& data )

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,12 @@ OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )`
`17`	`17`	`double OutputStream::getStreamDuration() const`
`18`	`18`	`{`
`19`	`19`	`AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );`
`20`		`- return av_q2d( outputStream.time_base ) * outputStream.cur_dts;`
	`20`	`+#if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55, 40, 100)`
	`21`	`+ // returns the pts of the last muxed packet, converted from timebase to seconds`
	`22`	`+ return av_q2d( outputStream.time_base ) * av_stream_get_end_pts( &outputStream );`
	`23`	`+#else`
	`24`	`+ return av_q2d( outputStream.time_base ) * ( outputStream.pts.val + ( outputStream.pts.num / outputStream.pts.den ) );`
	`25`	`+#endif`
`21`	`26`	`}`
`22`	`27`
`23`	`28`	`IOutputStream::EWrappingStatus OutputStream::wrap( const CodedData& data )`