Changeset 60b307b4bc1ec3422daa3f5b75bef3eeaad0a04d

Timestamp:

16/12/05 18:28:36 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1134754116 +0000

git-parent:

[1f61d23a127e0686aa6b2d5e3afdbd11d9ffcbc5]

git-author:

Clément Stenac <zorglub@videolan.org> 1134754116 +0000

Message:

Refill stream when seeking near of end of track.
Needs testing and review

+ allow enabling of debug through #define STREAM_DEBUG

Files:

• src/input/stream.c (modified) (8 diffs)

src/input/stream.c

@@ -28 +28 @@
-#include "input_internal.h"
-
+#undef STREAM_DEBUG
+
-/* TODO:
- *  - tune the 2 methods
@@ -624 +626 @@
-        }
-
- 
+
-        {
-            /* Access has already prebufferred - update stats and exit */
@@ -998 +1000 @@
-    }
-
- 0
+def STREAM_DEBUG
-    msg_Dbg( s, "AStreamReadStream: %d pos="I64Fd" tk=%d start="I64Fd
-             " offset=%d end="I64Fd,
@@ -1053 +1055 @@
-    if( tk->i_start >= tk->i_end ) return 0; /* EOF */
-
- 0
+def STREAM_DEBUG
-    msg_Dbg( s, "AStreamPeekStream: %d pos="I64Fd" tk=%d "
-             "start="I64Fd" offset=%d end="I64Fd,
@@ -1116 +1118 @@
-    int i;
-
- 0
+def STREAM_DEBUG
-    msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd
-             "tk=%d start="I64Fd" offset=%d end="I64Fd,
@@ -1130 +1132 @@
-        i_pos < p_sys->stream.tk[p_sys->stream.i_tk].i_end )
-    {
-
+
+
+
+
-        p_sys->i_pos = i_pos;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return VLC_SUCCESS;
-    }
@@ -1154 +1175 @@
-        if( i_pos >= tk->i_start && i_pos <= tk->i_end )
-        {
- 0
+def STREAM_DEBUG
-            msg_Dbg( s, "AStreamSeekStream: reusing %d start="I64Fd
-                     " end="I64Fd, i, tk->i_start, tk->i_end );
-#endif
+
-            /* Seek at the end of the buffer */
-            if( ASeek( s, tk->i_end ) ) return VLC_EGENERIC;
@@ -1241 +1263 @@
-    if( i_toread <= 0 ) return VLC_EGENERIC; /* EOF */
-
-
+
+
+
+
-
-    i_start = mdate();