Changeset 2815

Timestamp:

2007-05-31 01:49:07 (2 years ago)

Author:

shans

Message:

oggz_tell_granulepos now returns -1 for header packets, and when the gp is
unknowable (i.e. before the first packet with a gp in the stream)

Files:

• liboggz/trunk/src/liboggz/oggz_auto.c (modified) (5 diffs)

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -368 +368 @@
-  int keyframe_shift;
-  unsigned char first_byte;
-  
-  if (now > (ogg_int64_t)(-1))
-    return now;
-
-  first_byte = op->packet[0];
-
+  /* header packet */
-  if (first_byte & 0x80)
-  {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  if (first_byte & 0x40)
-  {
-    /* inter-coded packet */
-    return stream->last_granulepos + 1;
-  }
-
-  /* intra-coded packet */
-  if (stream->last_granulepos == 0)
-  {
-    /* first intra-coded packet */
-    return (ogg_int64_t)0;
-  }
-
@@ -629 +631 @@
-  info = (auto_calc_vorbis_info_t *)stream->calculate_data;
-
+
-  if (now > -1)
-  {
-
-
+
-  }
- 
@@ -649 +651 @@
-    size = info->mode_sizes[mode];
-  
+    info->last_was_long = size;
+
-    /*
-the first packet is always 0
+if we have a working granulepos, we use it.
-     */
-!info->encountered_first_data_packet
+now > -1
-      info->encountered_first_data_packet = 1;
-
-
+
-    }
-
+
+
+
+
+
+
-    /*
-
+
+
-     */
-
-
-
+
+
-    }
-    
-    /*
-     * if it's a short packet, then we can just use nsn_increment
-     *
-    if (size == 0)
-    {
-      return stream->last_granulepos + info->nsn_increment;
-    }
-     * actually, this is not how the decoder behaves.  It always decodes
-     * no further than the middle of the current packet, regardless of the
-     * number of additional samples that could be fully decoded.
-     */
-
-    result = stream->last_granulepos + 
@@ -688 +684 @@
-    return result;
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  
-}
@@ -898 +870 @@
-     * page.
-     */
+    /*
-    if (now != -1LL) {
-      return op->granulepos;
-    }
+    */
-    return r;
-  }