Mercurial > libavformat.hg

changeset 6268:68c7733519ca libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aviobuf: Do short seeks forward by reading and skipping data instead of a proper seek This improves performance on e.g. seekable http.
author mstorsjo
date Sat, 17 Jul 2010 05:26:30 +0000
parents e3af32f5ee3e
children b5afd13d8352
files aviobuf.c
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/aviobuf.c	Sat Jul 17 05:08:01 2010 +0000
+++ b/aviobuf.c	Sat Jul 17 05:26:30 2010 +0000
@@ -28,6 +28,13 @@
 
 #define IO_BUFFER_SIZE 32768
 
+/**
+ * Do seeks within this distance ahead of the current buffer by skipping
+ * data instead of calling the protocol seek function, for seekable
+ * protocols.
+ */
+#define SHORT_SEEK_THRESHOLD 4096
+
 static void fill_buffer(ByteIOContext *s);
 #if LIBAVFORMAT_VERSION_MAJOR >= 53
 static int url_resetbuf(ByteIOContext *s, int flags);
@@ -153,7 +160,9 @@
         offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) {
         /* can do the seek inside the buffer */
         s->buf_ptr = s->buffer + offset1;
-    } else if(s->is_streamed && !s->write_flag && offset1 >= 0 &&
+    } else if ((s->is_streamed ||
+               offset1 <= s->buf_end + SHORT_SEEK_THRESHOLD - s->buffer) &&
+               !s->write_flag && offset1 >= 0 &&
               (whence != SEEK_END || force)) {
         while(s->pos < offset && !s->eof_reached)
             fill_buffer(s);