Merge pull request #168 from cchampet/dev_cleanSeek

valnoel · valnoel · commit 5be6776e454c · 2015-04-23T15:32:20.000+02:00
Clean seek
diff --git a/app/pyThumbnail/pythumbnail.py b/app/pyThumbnail/pythumbnail.py
@@ -12,7 +12,7 @@
 parser.add_argument('inputFileName', help='It could be any media file with at least one video stream (video, image...). Support file without extension.')
 # options
 parser.add_argument("-o", "--outputFile", dest="outputFileName", default="thumbnail.jpg", help="Set the output filename (thumbnail.jpg by default). Must be with jpg extension!")
-parser.add_argument("-t", "--time", dest="time", type=int, default=0, help="Set time (in seconds) of where to seek in the video stream to generate the thumbnail (0 by default).")
+parser.add_argument("-t", "--time", dest="time", type=float, default=0, help="Set time (in seconds) of where to seek in the video stream to generate the thumbnail (0 by default).")
 parser.add_argument("-f", "--frame", dest="frame", type=int, default=0, help="Set time (in frames) of where to seek in the video stream to generate the thumbnail (0 by default). Warning: priority to frame if user indicates both frame and time!")
 parser.add_argument("-w", "--width", dest="width", type=int, default=0, help="Override the width of the thumbnail (same as input by default).")
 parser.add_argument("-he", "--height", dest="height", type=int, default=0, help="Override the height of the thumbnail (same as input by default).")
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -133,12 +133,12 @@ AVStream& FormatContext::addAVStream( const AVCodec& avCodec )
 	return *stream;
 }
 
-void FormatContext::seek( uint64_t position )
+void FormatContext::seek( uint64_t position, const int flag )
 {
 	if( (int)getStartTime() != AV_NOPTS_VALUE )
 		position += getStartTime();
 
-	if( av_seek_frame( _avFormatContext, -1, position, AVSEEK_FLAG_BACKWARD ) < 0 )
+	if( av_seek_frame( _avFormatContext, -1, position, flag ) < 0 )
 	{
 		LOG_ERROR( "Error when seek at " << position << " (in AV_TIME_BASE units) in file" )
 	}
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -62,11 +62,12 @@ class AvExport FormatContext
 	AVStream& addAVStream( const AVCodec& avCodec );
 
 	/**
-	 * @brief Seek at a specific position (in AV_TIME_BASE units)
+	 * @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
-	 * @note after seek, clear buffering of streams
 	 */
-	void seek( uint64_t position );
+	void seek( uint64_t position, const int flag );
 
 	size_t getNbStreams() const { return _avFormatContext->nb_streams; }
 	/// Get duration of the program, in seconds
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -86,13 +86,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;
-	_formatContext.seek( position );
+	_formatContext.seek( position, AVSEEK_FLAG_BACKWARD );
 }
 
 void InputFile::seekAtTime( const double time )
 {
 	uint64_t position = time * AV_TIME_BASE;
-	_formatContext.seek( position );
+	_formatContext.seek( position, AVSEEK_FLAG_BACKWARD );
 }
 
 void InputFile::activateStream( const size_t streamIndex, bool activate )
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -31,7 +31,7 @@ void FileProperties::extractStreamProperties( IProgress& progress, const EAnalys
 
 	// if the analysis level wiil decode some streams parts, seek at the beginning
 	if( level > eAnalyseLevelHeader )
-		const_cast<FormatContext*>( _formatContext )->seek( 0 );
+		const_cast<FormatContext*>( _formatContext )->seek( 0, AVSEEK_FLAG_BACKWARD );
 
 	for( size_t streamIndex = 0; streamIndex < _formatContext->getNbStreams(); ++streamIndex )
 	{
@@ -88,7 +88,7 @@ void FileProperties::extractStreamProperties( IProgress& progress, const EAnalys
 
 	// if the analysis level has decoded some streams parts, return at the beginning
 	if( level > eAnalyseLevelHeader )
-		const_cast<FormatContext*>( _formatContext )->seek( 0 );
+		const_cast<FormatContext*>( _formatContext )->seek( 0, AVSEEK_FLAG_BACKWARD );
 }
 
 std::string FileProperties::getFilename() const

Original file line number	Diff line number	Diff line change
`@@ -133,12 +133,12 @@ AVStream& FormatContext::addAVStream( const AVCodec& avCodec )`
`133`	`133`	`return *stream;`
`134`	`134`	`}`
`135`	`135`
`136`		`-void FormatContext::seek( uint64_t position )`
	`136`	`+void FormatContext::seek( uint64_t position, const int flag )`
`137`	`137`	`{`
`138`	`138`	`if( (int)getStartTime() != AV_NOPTS_VALUE )`
`139`	`139`	`position += getStartTime();`
`140`	`140`
`141`		`- if( av_seek_frame( _avFormatContext, -1, position, AVSEEK_FLAG_BACKWARD ) < 0 )`
	`141`	`+ if( av_seek_frame( _avFormatContext, -1, position, flag ) < 0 )`
`142`	`142`	`{`
`143`	`143`	`LOG_ERROR( "Error when seek at " << position << " (in AV_TIME_BASE units) in file" )`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,13 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )`
`86`	`86`	`void InputFile::seekAtFrame( const size_t frame )`
`87`	`87`	`{`
`88`	`88`	`uint64_t position = frame / getFps() * AV_TIME_BASE;`
`89`		`- _formatContext.seek( position );`
	`89`	`+ _formatContext.seek( position, AVSEEK_FLAG_BACKWARD );`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`void InputFile::seekAtTime( const double time )`
`93`	`93`	`{`
`94`	`94`	`uint64_t position = time * AV_TIME_BASE;`
`95`		`- _formatContext.seek( position );`
	`95`	`+ _formatContext.seek( position, AVSEEK_FLAG_BACKWARD );`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`void InputFile::activateStream( const size_t streamIndex, bool activate )`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ void FileProperties::extractStreamProperties( IProgress& progress, const EAnalys`
`31`	`31`
`32`	`32`	`// if the analysis level wiil decode some streams parts, seek at the beginning`
`33`	`33`	`if( level > eAnalyseLevelHeader )`
`34`		`- const_cast<FormatContext*>( _formatContext )->seek( 0 );`
	`34`	`+ const_cast<FormatContext*>( _formatContext )->seek( 0, AVSEEK_FLAG_BACKWARD );`
`35`	`35`
`36`	`36`	`for( size_t streamIndex = 0; streamIndex < _formatContext->getNbStreams(); ++streamIndex )`
`37`	`37`	`{`
`@@ -88,7 +88,7 @@ void FileProperties::extractStreamProperties( IProgress& progress, const EAnalys`
`88`	`88`
`89`	`89`	`// if the analysis level has decoded some streams parts, return at the beginning`
`90`	`90`	`if( level > eAnalyseLevelHeader )`
`91`		`- const_cast<FormatContext*>( _formatContext )->seek( 0 );`
	`91`	`+ const_cast<FormatContext*>( _formatContext )->seek( 0, AVSEEK_FLAG_BACKWARD );`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`std::string FileProperties::getFilename() const`