Changeset 5e2537971a6e4870333667628e014cfe2e7381e8

Timestamp:

11/09/06 21:17:17 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1163103437 +0000

git-parent:

[ea64177035896669780fc00f4edee086ab0094fa]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1163103437 +0000

Message:

Handle seeking with best effort in dump filter
instead of aborting

Files:

• modules/access_filter/dump.c (modified) (6 diffs)

modules/access_filter/dump.c

@@ -76 +76 @@
-    FILE *stream;
-    int64_t tmp_max;
+    int64_t dumpsize;
-};
-
@@ -146 +147 @@
-    FILE *stream = p_sys->stream;
-
-
+
+
-        return;
+
+    size_t needed = access->info.i_pos - p_sys->dumpsize;
+    if (len < needed)
+        return; /* gap between data and dump offset (seek too far ahead?) */
+
+    buffer += len - needed;
+    len = needed;
+
+    if (len == 0)
+        return; /* no useful data */
-
-    if ((p_sys->tmp_max != -1) && (access->info.i_pos > p_sys->tmp_max))
@@ -155 +167 @@
-    }
-
+    assert (len > 0);
-    if (fwrite (buffer, len, 1, stream) != 1)
-    {
@@ -161 +174 @@
-    }
-
+    p_sys->dumpsize += len;
-    return;
-
@@ -178 +192 @@
-
-    Dump (access, buffer, len);
-    //Trigger (access);
-
-    return len;
@@ -222 +235 @@
-
-    if (p_sys->stream != NULL)
-
-
-
-
-
+
-
-    src->info.i_update = access->info.i_update;