Changeset 2341

Timestamp:

2006-06-20 23:32:36 (2 years ago)

Author:

shans

Message:

Added oggz_tell_granulepos function to query liboggz for granulepos values.
Added calculation of lost granulepos values for packets that are not on end of
page (theora and speex codecs only at this point).

Files:

• liboggz/trunk/include/oggz/oggz_seek.h (modified) (1 diff)
• liboggz/trunk/src/liboggz/Version_script.in (modified) (1 diff)
• liboggz/trunk/src/liboggz/oggz.c (modified) (3 diffs)
• liboggz/trunk/src/liboggz/oggz_auto.c (modified) (4 diffs)
• liboggz/trunk/src/liboggz/oggz_private.h (modified) (2 diffs)
• liboggz/trunk/src/liboggz/oggz_read.c (modified) (3 diffs)
• liboggz/trunk/src/liboggz/oggz_stream.h (modified) (2 diffs)

liboggz/trunk/include/oggz/oggz_seek.h

@@ -107 +107 @@
-
-/**
+ * Provide the exact stored granulepos (from the page header) if relevant to
+ * the current packet, or a constructed granulepos if the stored granulepos
+ * does not belong to this packet, or -1 if this codec does not have support
+ * for granulepos interpolation
+ * \param oggz An OGGZ handle
+ * \returns the granulepos of the \a current packet (if available)
+ */
+ogg_int64_t
+oggz_tell_granulepos (OGGZ * oggz);
+
+/**
- * Query the file offset in bytes corresponding to the data read.
- * \param oggz An OGGZ handle

liboggz/trunk/src/liboggz/Version_script.in

@@ -40 +40 @@
-
-                oggz_tell;
+                oggz_tell_granulepos;
-                oggz_tell_units;
-                oggz_seek;

liboggz/trunk/src/liboggz/oggz.c

@@ -174 +174 @@
-    oggz_free (stream->metric_user_data);
-
+  if (stream->calculate_data != NULL)
+    oggz_free (stream->calculate_data);
+  
-  oggz_free (stream);
-
@@ -235 +238 @@
-  if (OGGZ_CONFIG_READ) {
-    return reader->current_unit;
+  } else {
+    return OGGZ_ERR_DISABLED;
+  }
+}
+
+ogg_int64_t
+oggz_tell_granulepos (OGGZ * oggz)
+{
+  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;
+  
+  if (oggz->flags & OGGZ_WRITE) {
+    return OGGZ_ERR_INVALID;
+  }
+
+  if (OGGZ_CONFIG_READ) {
+    return oggz->x.reader.current_granulepos;
-  } else {
-    return OGGZ_ERR_DISABLED;
@@ -320 +339 @@
-  stream->read_page_user_data = NULL;
-
+  stream->calculate_data = NULL;
+  
-  oggz_vector_insert_p (oggz->streams, stream);
-

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -43 +43 @@
-#include <string.h>
-
-
-
+
-#include "oggz_byteorder.h"
-#include "oggz_macros.h"
-#include "oggz_stream.h"
-
-/*#define DEBUG*/
@@ -318 +315 @@
-}
-
+static ogg_int64_t 
+auto_calc_speex(ogg_int64_t now, oggz_stream_t *stream, ogg_packet *op) {
+  
+  /*
+   * on the first (b_o_s) packet, set calculate_data to be the number
+   * of speex frames per packet
+   */
+  if (stream->calculate_data == NULL) {
+    stream->calculate_data = malloc(sizeof(int));
+    *(int *)stream->calculate_data = 
+        (*(int *)(op->packet + 64)) * (*(int *)(op->packet + 56));
+  }
+  
+  if (now > -1)
+    return now;
+
+  /*
+   * the first data packet has smaller-than-usual granulepos to account
+   * for the fact that several of the output samples from the beginning
+   * of this packet need to be thrown away.  We calculate the granulepos
+   * by taking the mod of the page's granulepos with respect to the increment
+   * between packets.
+   */
+  if (stream->last_granulepos == 0) {
+    return stream->page_granulepos % *(int *)(stream->calculate_data);
+  }
+  
+  return stream->last_granulepos + *(int *)(stream->calculate_data);
+}
+  
+static ogg_int64_t 
+auto_calc_theora(ogg_int64_t now, oggz_stream_t *stream, ogg_packet *op) {
+
+  long keyframe_no;
+  int keyframe_shift;
+  unsigned char first_byte;
+  
+  if (now > (ogg_int64_t)(-1))
+    return now;
+
+  first_byte = op->packet[0];
+
+  if (first_byte & 0x80)
+  {
+    /* header packet */
+    return (ogg_int64_t)0;
+  }
+  
+  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;
+  }
+
+  keyframe_shift = stream->granuleshift; 
+  /*
+   * retrieve last keyframe number
+   */
+  keyframe_no = (int)(stream->last_granulepos >> keyframe_shift);
+  /*
+   * add frames since last keyframe number
+   */
+  keyframe_no += (stream->last_granulepos & ((1 << keyframe_shift) - 1)) + 1;
+  return ((ogg_int64_t)keyframe_no) << keyframe_shift;
+  
+
+}
+
-const oggz_auto_contenttype_t oggz_auto_codec_ident[] = {
-
-
-
-
-
-
-
-
-
-
-
+, auto_calc_theora
+, NULL
+, auto_calc_speex
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
-}; 
-
@@ -355 +427 @@
-int
-oggz_auto_get_granulerate (OGGZ * oggz, ogg_packet * op, long serialno, 
-
-
+
-  OggzReadPacket read_packet;
-  int content = 0;
@@ -370 +441 @@
-}
-
+ogg_int64_t 
+oggz_auto_calculate_granulepos(int content, ogg_int64_t now, 
+                oggz_stream_t *stream, ogg_packet *op) {
+  if (oggz_auto_codec_ident[content].calculator != NULL) {
+    return oggz_auto_codec_ident[content].calculator(now, stream, op);
+  } else {
+    return now;
+  }
+  
+}
+
-#endif /* OGGZ_CONFIG_READ */

liboggz/trunk/src/liboggz/oggz_private.h

@@ -107 +107 @@
-  OggzReadPage read_page;
-  void * read_page_user_data;
+
+  /* calculated granulepos values, not extracted values */
+  ogg_int64_t last_granulepos;
+  ogg_int64_t page_granulepos;
+  void * calculate_data;
-};
-
@@ -123 +128 @@
-
-  ogg_int64_t current_unit;
+  ogg_int64_t current_granulepos;
-
-#if 0

liboggz/trunk/src/liboggz/oggz_read.c

@@ -291 +291 @@
-
-      if(result > 0){
+        int content;
+        
-        /* got a packet.  process it */
-        granulepos = op->granulepos;
-
-
-
-
-
-
+
+
-        if 
-        (
-
-
-
-
-
+
-          && 
-          (oggz->flags & OGGZ_AUTO)
@@ -313 +308 @@
-        }
-
+        /* attempt to determine granulepos for this packet */
+        if (oggz->flags & OGGZ_AUTO) {
+          reader->current_granulepos = oggz_auto_calculate_granulepos (content, 
+                    granulepos, stream, op); 
+        } else {
+          reader->current_granulepos = granulepos;
+        }
+        stream->last_granulepos = reader->current_granulepos;
+        
-        /* set unit on last packet of page */
-        if ((oggz->metric || stream->metric) && granulepos != -1) {
@@ -366 +370 @@
-
-      granulepos = ogg_page_granulepos (&og);
+      stream->page_granulepos = granulepos;
-
-      if ((oggz->metric || stream->metric) && granulepos != -1) {

liboggz/trunk/src/liboggz/oggz_stream.h

@@ -34 +34 @@
-#define __OGGZ_STREAM_H__
-
+typedef struct _oggz_stream_t oggz_stream_t;
+
-typedef struct {
-  const char      *bos_str;
@@ -39 +41 @@
-  const char      *content_type;
-  OggzReadPacket  reader;
+  ogg_int64_t     (*calculator)(ogg_int64_t now, oggz_stream_t *stream, 
+                  ogg_packet *op);
-} oggz_auto_contenttype_t;
-
-extern const oggz_auto_contenttype_t oggz_auto_codec_ident[];
-
-typedef struct _oggz_stream_t oggz_stream_t;
-
-oggz_stream_t * oggz_get_stream (OGGZ * oggz, long serialno);