FormatContext: do not add stream start time before each seek

Clement Champetier · Clement Champetier · commit 9b78c0e292e6 · 2015-11-04T16:10:15.000+01:00
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -142,11 +142,8 @@ AVStream& FormatContext::addAVStream( const AVCodec& avCodec )
 	return *stream;
 }
 
-bool FormatContext::seek( uint64_t position, const int flag )
+bool FormatContext::seek( const uint64_t position, const int flag )
 {
-	if( (int)getStartTime() != AV_NOPTS_VALUE )
-		position += getStartTime();
-
 	LOG_INFO( "Seek in '" << _avFormatContext->filename << "' at " << position << " (in AV_TIME_BASE units)" )
 	int err = av_seek_frame( _avFormatContext, -1, position, flag );
 	if( err < 0 )
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -77,10 +77,10 @@ class AvExport FormatContext
 	 * @brief Seek at a specific position
 	 * @param position: can be in AV_TIME_BASE units, in frames... depending on the flag value
 	 * @param flag: seeking mode (AVSEEK_FLAG_xxx)
-	 * @note before seek, add offset of start time
 	 * @return seek status
+	 * @see flushDecoder
 	 */
-	bool seek( uint64_t position, const int flag );
+	bool seek( const uint64_t position, const int flag );
 
 	size_t getNbStreams() const { return _avFormatContext->nb_streams; }
 	/// Get duration of the program, in seconds

Original file line number	Diff line number	Diff line change
`@@ -142,11 +142,8 @@ AVStream& FormatContext::addAVStream( const AVCodec& avCodec )`
`142`	`142`	`return *stream;`
`143`	`143`	`}`
`144`	`144`
`145`		`-bool FormatContext::seek( uint64_t position, const int flag )`
	`145`	`+bool FormatContext::seek( const uint64_t position, const int flag )`
`146`	`146`	`{`
`147`		`- if( (int)getStartTime() != AV_NOPTS_VALUE )`
`148`		`- position += getStartTime();`
`149`		`-`
`150`	`147`	`LOG_INFO( "Seek in '" << _avFormatContext->filename << "' at " << position << " (in AV_TIME_BASE units)" )`
`151`	`148`	`int err = av_seek_frame( _avFormatContext, -1, position, flag );`
`152`	`149`	`if( err < 0 )`