Merge branch 'release/v0.5.7' into develop

Clement Champetier · Clement Champetier · commit d1f0baabdb8c · 2015-07-28T17:30:16.000+02:00
diff --git a/app/pyThumbnail/pythumbnail.py b/app/pyThumbnail/pythumbnail.py
@@ -64,9 +64,9 @@
 
 # seek in file
 if args.frame:
-    inputFile.seekAtFrame(args.frame)
+    inputFile.seekAtFrame(args.frame, av.AVSEEK_FLAG_BACKWARD)
 elif args.time:
-    inputFile.seekAtTime(args.time)
+    inputFile.seekAtTime(args.time, av.AVSEEK_FLAG_BACKWARD)
 
 # create output file (need to set format profile of encoding to force output format to mjpeg)
 formatProfile = av.ProfileMap()
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -13,6 +13,7 @@
 %include "AvTranscoder/swig/avMediaType.i"
 %include "AvTranscoder/swig/avRational.i"
 %include "AvTranscoder/swig/avLogLevel.i"
+%include "AvTranscoder/swig/avSeek.i"
 %include "AvTranscoder/swig/avOperator.i"
 
 %{
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -83,16 +83,16 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 	return true;
 }
 
-void InputFile::seekAtFrame( const size_t frame )
+void InputFile::seekAtFrame( const size_t frame, const int flag )
 {
 	uint64_t position = frame / getFps() * AV_TIME_BASE;
-	_formatContext.seek( position, AVSEEK_FLAG_ANY );
+	_formatContext.seek( position, flag );
 }
 
-void InputFile::seekAtTime( const double time )
+void InputFile::seekAtTime( const double time, const int flag )
 {
 	uint64_t position = time * AV_TIME_BASE;
-	_formatContext.seek( position, AVSEEK_FLAG_ANY );
+	_formatContext.seek( position, flag );
 }
 
 void InputFile::activateStream( const size_t streamIndex, bool activate )
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -50,10 +50,11 @@ class AvExport InputFile
 	/**
 	 * @brief Seek at a specific frame / time (in seconds)
 	 * @note Seek in file by using the default stream (according to ffmpeg)
+	 * @param flag: ffmpeg seek flag (by default seek to any frame, even non-keyframes)
 	 * @warning If the seek is done to a non key-frame, the decoding will start from the next key-frame
 	 **/
-	void seekAtFrame( const size_t frame );
-	void seekAtTime( const double time );
+	void seekAtFrame( const size_t frame, const int flag = AVSEEK_FLAG_ANY );
+	void seekAtTime( const double time, const int flag = AVSEEK_FLAG_ANY );
 
 	/** 
 	 * @brief Activate the indicated stream
diff --git a/src/AvTranscoder/swig/avSeek.i b/src/AvTranscoder/swig/avSeek.i
@@ -0,0 +1,4 @@
+#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
+#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
+#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
+#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number

Original file line number	Diff line number	Diff line change
`@@ -83,16 +83,16 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )`
`83`	`83`	`return true;`
`84`	`84`	`}`
`85`	`85`
`86`		`-void InputFile::seekAtFrame( const size_t frame )`
	`86`	`+void InputFile::seekAtFrame( const size_t frame, const int flag )`
`87`	`87`	`{`
`88`	`88`	`uint64_t position = frame / getFps() * AV_TIME_BASE;`
`89`		`- _formatContext.seek( position, AVSEEK_FLAG_ANY );`
	`89`	`+ _formatContext.seek( position, flag );`
`90`	`90`	`}`
`91`	`91`
`92`		`-void InputFile::seekAtTime( const double time )`
	`92`	`+void InputFile::seekAtTime( const double time, const int flag )`
`93`	`93`	`{`
`94`	`94`	`uint64_t position = time * AV_TIME_BASE;`
`95`		`- _formatContext.seek( position, AVSEEK_FLAG_ANY );`
	`95`	`+ _formatContext.seek( position, flag );`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`void InputFile::activateStream( const size_t streamIndex, bool activate )`