Changeset 773

Timestamp:

2005-01-29 17:00:34 (4 years ago)

Author:

conrad

Message:

oggz_seek fixes:

• move eof check to happen only when 0 bytes are read (bug #42)
  
• make check for scan less aggressive
  

Files:

• liboggz/trunk/src/liboggz/oggz_read.c (modified) (11 diffs)

liboggz/trunk/src/liboggz/oggz_read.c

@@ -62 +62 @@
-
-/*#define DEBUG*/
- #define DEBUG_VERBOSE 
+#define DEBUG_VERBOSE
-
-#define CHUNKSIZE 65536
@@ -646 +646 @@
-      buffer = ogg_sync_buffer (&reader->ogg_sync, CHUNKSIZE);
-      if ((bytes = (long) oggz_io_read (oggz, buffer, CHUNKSIZE)) == 0) {
-
+
+
+
+
+
+
+
-      }
-      if (bytes == OGGZ_ERR_SYSTEM) {
@@ -658 +664 @@
-#endif
-        return -2;
+#if 0
-      } else if (oggz->file && feof (oggz->file)) {
-#ifdef DEBUG_VERBOSE
@@ -664 +671 @@
-        clearerr (oggz->file);
-        return -2;
+#endif
-      }
-
@@ -973 +981 @@
-    if (oggz_stat_regular (statbuf.st_mode)) {
-      offset_end = statbuf.st_size;
+#ifdef DEBUG
+      printf ("oggz_seek_set: stat size %ld\n", offset_end);
+#endif
-    } else {
-      /*oggz_set_error (oggz, OGGZ_ERR_NOSEEK);*/
@@ -1024 +1035 @@
-
-#ifdef DEBUG
-d: (u%ld - u%
+ld: (u%lld - u%l
-            unit_target, unit_begin, unit_end, offset_begin, offset_end);
-#endif
@@ -1045 +1056 @@
-    }
-
+#ifdef DEBUG
+    printf ("oggz_seek_set: guessed %ld\n", offset_guess);
+#endif
+
-    offset_at = oggz_seek_raw (oggz, offset_guess, SEEK_SET);
-    if (offset_at == -1) {
@@ -1051 +1066 @@
-
-    offset_next = oggz_get_next_start_page (oggz, og);
+
+#ifdef DEBUG
+    printf ("oggz_seek_set: offset_next %ld\n", offset_next);
+#endif
-
-    if (unit_end == -1 && offset_next == -2) { /* reached eof, backtrack */
@@ -1070 +1089 @@
-    }
-
-<
+>
-      offset_next =
-        oggz_scan_for_page (oggz, og, unit_target, offset_begin, offset_end);
@@ -1106 +1125 @@
- found:
-#ifdef DEBUG
-
+oggz_seek_set: 
-#endif
-
@@ -1116 +1135 @@
- notfound:
-#ifdef DEBUG
-
+oggz_seek_set: 
-#endif
-