Move InputFile::seek to FormatContext::seek

Clement Champetier · Clement Champetier · commit 108b7dffe7e0 · 2015-04-21T18:02:21.000+02:00
Note: remove useless InputStreams clearBuffering call.
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -133,6 +133,17 @@ AVStream& FormatContext::addAVStream( const AVCodec& avCodec )
 	return *stream;
 }
 
+void FormatContext::seek( uint64_t position )
+{
+	if( (int)getStartTime() != AV_NOPTS_VALUE )
+		position += getStartTime();
+
+	if( av_seek_frame( _avFormatContext, -1, position, AVSEEK_FLAG_BACKWARD ) < 0 )
+	{
+		LOG_ERROR( "Error when seek at " << position << " (in AV_TIME_BASE units) in file" )
+	}
+}
+
 std::vector<Option> FormatContext::getOptions()
 {
 	std::vector<Option> optionsArray;
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -61,6 +61,13 @@ class AvExport FormatContext
 	void addMetaData( const std::string& key, const std::string& value );
 	AVStream& addAVStream( const AVCodec& avCodec );
 
+	/**
+	 * @brief Seek at a specific position (in AV_TIME_BASE units)
+	 * @note before seek, add offset of start time
+	 * @note after seek, clear buffering of streams
+	 */
+	void seek( uint64_t position );
+
 	size_t getNbStreams() const { return _avFormatContext->nb_streams; }
 	/// Get duration of the program, in seconds
 	size_t getDuration() const { return _avFormatContext->duration; }
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -144,29 +144,13 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 void InputFile::seekAtFrame( const size_t frame )
 {
 	uint64_t position = frame / getFps() * AV_TIME_BASE;
-	seek( position );
+	_formatContext.seek( position );
 }
 
 void InputFile::seekAtTime( const double time )
 {
 	uint64_t position = time * AV_TIME_BASE;
-	seek( position );
-}
-
-void InputFile::seek( uint64_t position )
-{
-	if( (int)_formatContext.getStartTime() != AV_NOPTS_VALUE )
-		position += _formatContext.getStartTime();
-
-	if( av_seek_frame( &_formatContext.getAVFormatContext(), -1, position, AVSEEK_FLAG_BACKWARD ) < 0 )
-	{
-		LOG_ERROR( "Error when seek at " << position << " (in AV_TIME_BASE units) in file" )
-	}
-
-	for( std::vector<InputStream*>::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )
-	{
-		(*it)->clearBuffering();
-	}
+	_formatContext.seek( position );
 }
 
 void InputFile::activateStream( const size_t streamIndex, bool activate )
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -104,13 +104,6 @@ class AvExport InputFile
 	 */
 	double getFps();
 
-	/**
-	 * @brief Seek at a specific position (in AV_TIME_BASE units)
-	 * @note before seek, add offset of start time
-	 * @note after seek, clear buffering of streams
-	 */
-	void seek( uint64_t position );
-
 protected:
 	FormatContext _formatContext;
 	FileProperties _properties;
