Changeset 3278

Timestamp:

2007-11-25 19:55:29 (1 year ago)

Author:

shans

Message:

Some minor adjustments to work around Yet More problems with ogg
granulepos values.

Files:

• liboggz/trunk/src/liboggz/oggz_auto.c (modified) (1 diff)
• liboggz/trunk/src/liboggz/oggz_read.c (modified) (1 diff)

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -688 +688 @@
-  info = (auto_calc_vorbis_info_t *)stream->calculate_data;
-
+  return -1;
+
-  { 
-    /*

liboggz/trunk/src/liboggz/oggz_read.c

@@ -420 +420 @@
-            reader->current_granulepos = 
-              oggz_auto_calculate_granulepos (content, granulepos, stream, op); 
+            /* make sure that we accept any "real" gaps in the granulepos
+             */
+            if (granulepos != -1 && reader->current_granulepos < granulepos) {
+              reader->current_granulepos = granulepos;
+            }
-          } else {
-            reader->current_granulepos = granulepos;