Changeset 3216

Timestamp:

2007-09-02 21:57:14 (1 year ago)

Author:

shans

Message:

Code to generate initial granulepos values for packets before the end of the first page.

Files:

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

liboggz/trunk/src/liboggz/oggz.c

@@ -101 +101 @@
-  oggz->order = NULL;
-  oggz->order_user_data = NULL;
+
+  oggz->packet_buffer = oggz_dlist_new ();
-
-  if (OGGZ_CONFIG_WRITE && (oggz->flags & OGGZ_WRITE)) {

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -444 +444 @@
-
-}
+
+auto_rcalc_theora(ogg_int64_t next_packet_gp, oggz_stream_t *stream, 
+                  ogg_packet *this_packet, ogg_packet *next_packet) {
+
+  int keyframe = (int)(next_packet_gp >> stream->granuleshift);
+  int offset = (int)(next_packet_gp - (keyframe << stream->granuleshift));
+
+  /* assume kf is 60 frames ago. NOTE: This is going to cause problems,
+   * but I can't think of what else to do.  The position of the last kf
+   * is fundamentally unknowable.
+   */
+  if (offset == 0) {
+    return ((keyframe - 60L) << stream->granuleshift) + 59;
+  }
+  else {
+    return (((ogg_int64_t)keyframe) << stream->granuleshift) + (offset - 1);
+  }
+
+}
+
-
-/*
@@ -722 +742 @@
-}
-
+ogg_int64_t
+auto_rcalc_vorbis(ogg_int64_t next_packet_gp, oggz_stream_t *stream,
+                  ogg_packet *this_packet, ogg_packet *next_packet) {
+
+  auto_calc_vorbis_info_t *info = 
+                  (auto_calc_vorbis_info_t *)stream->calculate_data;
+
+  int mode = 
+      (this_packet->packet[0] >> 1) & ((1 << info->log2_num_modes) - 1);
+  int this_size = info->mode_sizes[mode] ? info->long_size : info->short_size;
+  int next_size;
+
+  mode = (next_packet->packet[0] >> 1) & ((1 << info->log2_num_modes) - 1);
+  next_size = info->mode_sizes[mode] ? info->long_size : info->short_size;
+
+  return next_packet_gp - ((this_size + next_size) / 4);
+
+}
+
-/**
- * FLAC
@@ -839 +878 @@
-
-const oggz_auto_contenttype_t oggz_auto_codec_ident[] = {
-
-
-
-
-
-
-
-
-
-
-
+, auto_rcalc_theora
+, auto_rcalc_vorbis
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
-}; 
-
@@ -893 +932 @@
-  if (oggz_auto_codec_ident[content].calculator != NULL) {
-    ogg_int64_t r = oggz_auto_codec_ident[content].calculator(now, stream, op);
-    /*
-     * this will cause a hiccough at the end of the first data page if there are
-     * more than one packets on that page.  In the absence of pervasive access
-     * to the packets on a page, though, it might have to do.
-     *
-     * Why a hiccough?  Because there's no granulepos attached to any packets
-     * except for the last on a page.  If the stream doesn't start at gp 0 (a
-     * very common occurrence) then we don't realise until we get to the end of
-     * the page.  By that time we've already junked the first packets on the 
-     * page.
-     */
-    /*
-    if (now != -1LL) {
-      return op->granulepos;
-    }
-    */
-    return r;
-  } 
-
-  return now;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

liboggz/trunk/src/liboggz/oggz_dlist.c

@@ -64 +64 @@
-  dlist->tail = dummy_back;
-
+  return dlist;
+
-}
-
@@ -77 +79 @@
-  free(dlist->tail);
-  free(dlist);
+
+  printf("dlist:DELETE complete\n");
-
-}
@@ -138 +142 @@
-oggz_dlist_deliter(OggzDList *dlist, OggzDListIterFunc func) {
-
-
+, *q
-
-p->next
+q
-    if (func(p->data) == DLIST_ITER_CANCEL) {
-      break;
-    }
-
+    q = p->next;
-    p->prev->next = p->next;
-    p->next->prev = p->prev;
@@ -156 +161 @@
-oggz_dlist_reverse_deliter(OggzDList *dlist, OggzDListIterFunc func) {
-
-
+, *q
-
-p->prev
+q
-    if (func(p->data) == DLIST_ITER_CANCEL) {
-      break;
-    }
-
+    q = p->prev;
-    p->prev->next = p->next;
-    p->next->prev = p->prev;

liboggz/trunk/src/liboggz/oggz_private.h

@@ -43 +43 @@
-#include "oggz_macros.h"
-#include "oggz_vector.h"
-
+
-
-typedef struct _OGGZ OGGZ;
@@ -119 +119 @@
-  ogg_int64_t page_granulepos;
-  void * calculate_data;
+  ogg_packet  * last_packet;
-};
-
@@ -238 +239 @@
-    OggzWriter writer;
-  } x;
+
+  OggzDList * packet_buffer;
-};
-

liboggz/trunk/src/liboggz/oggz_read.c

@@ -237 +237 @@
-
-  return ret;
+}
+
+typedef struct {
+  ogg_packet      packet;
+  ogg_int64_t     calced_granulepos;
+  oggz_stream_t * stream;
+  OggzReader    * reader;
+  OGGZ          * oggz;
+  long            serialno;
+} OggzBufferedPacket;
+
+OggzBufferedPacket *
+oggz_read_new_pbuffer_entry(OGGZ *oggz, ogg_packet *packet, 
+            ogg_int64_t granulepos, long serialno, oggz_stream_t * stream, 
+            OggzReader *reader) {
+
+  OggzBufferedPacket *p = malloc(sizeof(OggzBufferedPacket));
+  memcpy(&(p->packet), packet, sizeof(ogg_packet));
+  p->packet.packet = malloc(packet->bytes);
+  memcpy(p->packet.packet, packet->packet, packet->bytes);
+
+  p->calced_granulepos = granulepos;
+  p->stream = stream;
+  p->serialno = serialno;
+  p->reader = reader;
+  p->oggz = oggz;
+
+  return p;
+}
+
+void
+oggz_read_free_pbuffer_entry(OggzBufferedPacket *p) {
+  
+  free(p->packet.packet);
+  free(p);
+
+}
+
+OggzDListIterResponse
+oggz_read_update_gp(void *elem) {
+
+  OggzBufferedPacket *p = (OggzBufferedPacket *)elem;
+
+  if (p->calced_granulepos == -1 && p->stream->last_granulepos != -1) {
+    int content = oggz_stream_get_content(p->oggz, p->serialno);
+    p->calced_granulepos = 
+      oggz_auto_calculate_gp_backwards(content, p->stream->last_granulepos,
+      p->stream, &(p->packet), p->stream->last_packet);
+      
+    p->stream->last_granulepos = p->calced_granulepos;
+    p->stream->last_packet = &(p->packet);
+  }
+
+  return DLIST_ITER_CONTINUE;
+
+}
+
+OggzDListIterResponse
+oggz_read_deliver_packet(void *elem) {
+
+  OggzBufferedPacket *p = (OggzBufferedPacket *)elem;
+  ogg_int64_t gp_stored;
+  long unit_stored;
+
+  if (p->calced_granulepos == -1) {
+    return DLIST_ITER_CANCEL;
+  }
+
+  gp_stored = p->reader->current_granulepos;
+  unit_stored = p->reader->current_unit;
+
+  p->reader->current_granulepos = p->calced_granulepos;
+
+  p->reader->current_unit =
+    oggz_get_unit (p->oggz, p->serialno, p->calced_granulepos);
+
+  if (p->stream->read_packet) {
+    p->stream->read_packet(p->oggz, &(p->packet), p->serialno, 
+            p->stream->read_user_data);
+  } else if (p->reader->read_packet) {
+    p->reader->read_packet(p->oggz, &(p->packet), p->serialno, 
+            p->reader->read_user_data);
+  }
+
+  p->reader->current_granulepos = gp_stored;
+  p->reader->current_unit = unit_stored;
+
+  oggz_read_free_pbuffer_entry(p);
+
+  return DLIST_ITER_CONTINUE;
-}
-
@@ -349 +439 @@
-          }
-
+          /*
+           * while we are getting invalid granulepos values, store the incoming
+           * packets in a dlist */
+          if (reader->current_granulepos == -1) {
+            OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
+                              oggz, &packet, reader->current_granulepos, 
+                              serialno, stream, reader);
+
+            oggz_dlist_append(oggz->packet_buffer, p);
+            continue;
+          } else if (!oggz_dlist_is_empty(oggz->packet_buffer)) {
+            /*
+             * move backward through the list assigning gp values based upon
+             * the granulepos we just recieved.  Then move forward through
+             * the list delivering any packets at the beginning with valid
+             * gp values
+             */
+            ogg_int64_t gp_stored = stream->last_granulepos;
+            stream->last_packet = &packet;
+            oggz_dlist_reverse_iter(oggz->packet_buffer, oggz_read_update_gp);
+            oggz_dlist_deliter(oggz->packet_buffer, oggz_read_deliver_packet);
+
+            /*
+             * fix up the stream granulepos 
+             */
+            stream->last_granulepos = gp_stored;
+
+            if (!oggz_dlist_is_empty(oggz->packet_buffer)) {
+              OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
+                              oggz, &packet, reader->current_granulepos, 
+                              serialno, stream, reader);
+
+              oggz_dlist_append(oggz->packet_buffer, p);
+              continue;
+            }
+
+          }
+
-          if (stream->read_packet) {
-            cb_ret =

liboggz/trunk/src/liboggz/oggz_stream.h

@@ -43 +43 @@
-  ogg_int64_t     (*calculator)(ogg_int64_t now, oggz_stream_t *stream, 
-                  ogg_packet *op);
+  ogg_int64_t     (*r_calculator)(ogg_int64_t next_packet_gp, 
+                  oggz_stream_t *stream, ogg_packet *this_packet, 
+                  ogg_packet *next_packet);
-} oggz_auto_contenttype_t;
-
@@ -58 +61 @@
-oggz_auto_calculate_granulepos(int content, ogg_int64_t now, 
-                oggz_stream_t *stream, ogg_packet *op);
+
+ogg_int64_t
+oggz_auto_calculate_gp_backwards(int content, ogg_int64_t next_packet_gp,
+      oggz_stream_t *stream, ogg_packet *this_packet, ogg_packet *next_packet);
+
-#endif /* __OGGZ_STREAM_H__ */