Changeset 3751

Timestamp:

2008-10-29 04:06:26 (2 months ago)

Author:

conrad

Message:

anx_import_ogg: replace scan/seek algorithm with one-pass accumulation,
like oggz-chop but on a packet basis

Files:

• libannodex/trunk/src/importers/anx_import_ogg.c (modified) (28 diffs)

libannodex/trunk/src/importers/anx_import_ogg.c

@@ -86 +86 @@
-typedef enum {
-  STATE_HEADERS,
+  STATE_GLUE,
+#if 0
-  STATE_GRANULEINFO,
-  STATE_FILTER,
+#endif
-  STATE_DATA
-} state_t;
@@ -112 +115 @@
-struct _AnxOggTrack {
-  AnxSourceTrack source_track;
+  int nr_headers_remaining;
+
+  /* Queue of packets corresponding to the last GOP of the
+   * glue section for this track. */
+  AnxList * glue_packets;
+
-  int need_keygranule;
-  ogg_int64_t keygranule;
-  double keygranule_time;
-  int filter_got_keygranule;
-  int nr_headers_remaining;
-};
-
@@ -137 +145 @@
-  int got_skeleton_eos;
-
-long
-long
+int
+int
-
-  int use_granule_seek;
@@ -147 +155 @@
-
-  /* Maintain a list of AnxOggTracks */
-
-
+
+
+
+
-  AnxList * delivery_queue;
+
-  long current_offset; /* offset into current packet */
-
@@ -288 +299 @@
-  aop->eos = op->e_o_s;
-
+  memcpy (aop->data, op->packet, op->bytes);
+
-  return aop;
-}
@@ -312 +325 @@
-                     void * user_data)
-{
-  unsigned char * header = op->packet;
-  AnxOggData * aod = (AnxOggData *)user_data;
-  AnxOggTrack * aot = NULL;
+  AnxOggPacket * aop = NULL;
-  AnxSource * m = aod->anx_source;
-  AnxSourceTrack * track = NULL;
@@ -321 +334 @@
-  int got_headers = 0;
-
-logical
+track
-  if (aot != NULL) {
-    need_insert = 0;
-  }
-
+  content = oggz_stream_get_content (oggz, serialno);
+
-  if (op->b_o_s) {
-    content = oggz_stream_get_content (oggz, serialno);
-
-    if (content == OGGZ_CONTENT_CMML) {
@@ -398 +412 @@
-
-      if (need_insert) {
-logical
+track
-      }
-
@@ -432 +446 @@
-    }
-
+    if (content != OGGZ_CONTENT_CMML) {
+      aot = (AnxOggTrack *) oggz_table_lookup (aod->tracks, serialno);
+      track = &(aot->source_track);
+    }
+
-    aod->got_non_bos = 1;
-  }
@@ -445 +464 @@
-  }
-  
+  /* Add this packet to the headers_queue */
+  if (track) {
+    aop = anxogg_packet_new (op, track, 0.0);
+    aod->header_queue = anx_list_append (aod->header_queue, aop);
+  }
+
-  if (got_headers) {
+#if 0
-    if (m->start_time != 0.0) {
-      if (oggz_seek_units (oggz, 0, SEEK_CUR) >= 0) {
-        oggz_set_data_start (oggz, oggz_tell (oggz));
-
+
+
-      }
-    } else {
-      aod->state = STATE_DATA;
-    }
+#else
+    aod->state = STATE_GLUE;
+    aod->headers_unread = anx_list_length (aod->header_queue);
+#endif
-    return OGGZ_STOP_OK;
-  }
@@ -460 +491 @@
-}
-
+/*
+ * OggzReadPacket read_packet_glue
+ *
+ * Parse Ogg packets up to the start point.
+ */
+static int
+read_packet_glue (OGGZ * oggz, ogg_packet * op, long serialno,
+                  void * user_data)
+{
+  AnxOggData * aod = (AnxOggData *)user_data;
+  AnxOggTrack * aot = NULL;
+  AnxSourceTrack * track = NULL;
+  AnxOggPacket * aop;
+  int granuleshift, iframe;
+  double start_time, at_time;
+
+  aot = (AnxOggTrack *) oggz_table_lookup (aod->tracks, serialno);
+
+  /* If this track is not in the table, ignore it. */
+  if (aot == NULL) return OGGZ_CONTINUE;
+
+  track = &(aot->source_track);
+
+  /* If we are past the start time, then queue this packet for delivery
+   * and set state to STATE_DATA */
+  start_time = aod->anx_source->start_time;
+  at_time = gp_to_time (aod->oggz, serialno, op->granulepos);
+  if (at_time >= start_time) {
+    aop = anxogg_packet_new (op, track, at_time);
+    aod->delivery_queue = anx_list_append (aod->delivery_queue, aop);
+    aod->state = STATE_DATA;
+    return OGGZ_STOP_OK;
+  }
+
+  granuleshift = oggz_get_granuleshift(oggz, serialno);
+  /* No need to cache packets of tracks without granuleshift */
+  if (granuleshift == 0) return OGGZ_CONTINUE;
+
+  /* If this is a keyframe, clear the glue_packets queue for this track */
+  iframe = op->granulepos >> granuleshift;
+  if (op->granulepos != -1 && (iframe << granuleshift) == op->granulepos) {
+    anx_list_free_with (aot->glue_packets, anxogg_packet_free);
+    aot->glue_packets = NULL;
+  }
+
+  /* Append this packet to this track's list of glue_packets */
+  aop = anxogg_packet_new (op, track, at_time);
+  aot->glue_packets = anx_list_append (aot->glue_packets, aop);
+
+  return OGGZ_CONTINUE;
+}
+
+/*
+ * Create a single list containing all the glue packets from all
+ * tracks, in time order.
+ */
+static AnxList *
+merge_glue (AnxOggData * aod)
+{
+  AnxList * glued = NULL, * candidates = NULL, * c, * min_aot_l, * min_aop_l;
+  AnxOggTrack * aot = NULL, * min_aot;
+  AnxOggPacket * aop = NULL;
+  int i, ntracks, ncandidates=0;
+  long serialno;
+  double at_time, min_time;
+
+  /* Prime candidates */
+  ntracks = oggz_table_size (aod->tracks);
+  for (i=0; i < ntracks; i++) {
+    aot = oggz_table_nth (aod->tracks, i, &serialno);
+    if (aot != NULL && aot->glue_packets != NULL) {
+      candidates = anx_list_append (candidates, aot);
+    }
+  }
+
+  /* Merge candidates */
+  while (candidates != NULL) {
+    /* Find minimum time packet in all glue buffers */
+    min_time = 10e100;
+    min_aot_l = NULL;
+    for (c = candidates; c; c = c->next) {
+      aot = (AnxOggTrack *)c->data;
+      aop = (AnxOggPacket *)aot->glue_packets->data;
+      if (aop->current_time < min_time) {
+        /* This is the min so far ... */
+        min_time = aop->current_time;
+        min_aot_l = c;
+      }
+    }
+
+    /* Got min_aot */
+    min_aot = min_aot_l->data;
+
+    /* Stash the AnxList* containing the minimum glue packet */
+    min_aop_l = min_aot->glue_packets;
+
+    /* Set that track's glue_packets to it's own tail */
+    min_aot->glue_packets = min_aop_l->next;
+    if (min_aot->glue_packets) {
+      /* If packets are remaining, clear the head's prev pointer */
+      min_aot->glue_packets->prev = NULL;
+    } else {
+      /* Otherwise, we can remove this track from future candidates */
+      candidates = anx_list_remove (candidates, min_aot_l);
+      /* Free the min_aot_l container (but not its AnxOggTrack data) */
+      anx_free (min_aot_l);
+    }
+    
+    /* Append the min_aop to the list of glued packets we are building */
+    glued = anx_list_append (glued, min_aop_l->data);
+
+    /* Free the min_aop_l container (but not it's AnxOggPacket data) */
+    anx_free (min_aop_l);
+  }
+
+  return glued;
+}
+
+static int
+init_delivery_queue (AnxOggData * aod, AnxList * glued)
+{
+  AnxList * queue = NULL, * tail;
+
+  queue = aod->header_queue;
+  tail = anx_list_tail (queue);
+
+  /* If there packets glued, join them to the header queue */
+  if (glued != NULL) {
+    tail->next = glued;
+    glued->prev = tail;
+
+    /* Advance tail to the tail of (glued)queue */
+    tail = anx_list_tail (glued);
+  }
+
+  /* If there's any packets already queued for delivery during gluing,
+   * join them too. */
+  if (aod->delivery_queue != NULL) {
+    tail->next = aod->delivery_queue;
+    aod->delivery_queue->prev = tail;
+  }
+
+  /* Now queue points to the original headers++glued++delivery, so
+   * mark that for delivery */
+  aod->delivery_queue = queue;
+
+  /* And clear the header_queue pointer as it is no longer needed */
+  aod->header_queue = NULL;
+
+  return 0;
+}
+
+#if 0
-static int
-granuleinfo_update_state (AnxOggData * aod)
@@ -466 +650 @@
-  int i, n;
-
-#ifdef DEBUG
-  //fprintf (aod->df, "anxogg::granuleinfo_update_state cmml %010ld %s\n",
-        //   aod->cmml_serialno,
-        //   aod->cmml_need_keygranule ? "needs keygranule" : "no keygranule");
-#endif
-
-  if (aod->cmml_serialno != -1 && aod->cmml_need_keygranule) return 0;
-
-logical
-
-
-logical
+track
+
+
+track
-#endif
-
-  for (i = 0; i < n; i++) {
-logical
+track
-    if (aot->need_keygranule) {
-#ifdef DEBUG
@@ -560 +738 @@
-  } else {
-
-logical
+track
-    if (aot == NULL) {
-      /* If this track is not in the table, ignore it. */
@@ -618 +796 @@
-  return OGGZ_STOP_OK;
-}
+#endif
-
-static int
-anxogg_setup (AnxOggData * aod)
-{
+  AnxList * glued;
-  long n;
-  double start_time = 0.0, end_time = -1.0;
@@ -643 +823 @@
-#endif
-
+  /* Slurp glue section */
+  oggz_set_read_callback (aod->oggz, -1, read_packet_glue, aod);
+  while (aod->state == STATE_GLUE &&
+         (n = oggz_read (aod->oggz, 1024)) != 0);
+
+  /* Now merge the glue section, and build the initial delivery queue */
+  glued = merge_glue (aod);
+  init_delivery_queue (aod, glued);
+
+#if 0
-  /* Find bitrate info */
-  start_time = aod->anx_source->start_time;
@@ -724 +914 @@
-  oggz_seek (aod->oggz, 0, SEEK_SET);
-  aod->nr_headers_remaining = aod->headers_unread;
+#endif
-
-  return 0;
@@ -732 +923 @@
- */
-
+#if 0
-static double
-anxogg_seek_update (AnxSource * source)
@@ -785 +977 @@
-  return offset;
-}
+#endif
-
-static long
@@ -791 +984 @@
-  AnxOggData * aod = (AnxOggData *)media->custom_data;
-
-
+//
-
-  while ((aod->delivery_queue == NULL) && (oggz_read (aod->oggz, 1024)) != 0);
-
+#if 0
-  if (aod->need_seek == NEED_SEEK && aod->nr_headers_remaining == 0) {
-    anxogg_seek_update (media);
-    goto do_read;
-  }
+#endif
-
-  return 0;
-}
-
+#if 0
-/***********************************************************
- * A filter predicate, used between the min seek granule
@@ -890 +1086 @@
-#endif
-}
+#endif
-
-/*
@@ -915 +1112 @@
-
-  if (!(aod->cmml_serialno != -1 && serialno == aod->cmml_serialno)) {
-logical
+track
-    if (aot == NULL) {
-#ifdef DEBUG
@@ -991 +1188 @@
-
-#ifdef DEBUG
-
-
-
-
-
-
+
+
+
+
+
+
+
-#ifdef DEBUG
-    fprintf (aod->df, "anxogg::read_packet_data: no, copy out\n");
@@ -1003 +1201 @@
-    aop = anxogg_packet_new (op, track,
-                             ((double)oggz_tell_units(oggz)) / SUBSECONDS);
-    memcpy (aop->data, op->packet, op->bytes);
-    
-    aod->delivery_queue = anx_list_append (aod->delivery_queue, aop);
-    
+#if 0
-    if (aot->nr_headers_remaining > 0) {
-      aod->nr_headers_remaining--;
@@ -1028 +1225 @@
-      }
-    }
+#endif
-  }
-
@@ -1073 +1271 @@
-  /* If that's finished this media packet, advance to the next one */
-  if (aod->current_offset >= aop->length) {
+
-    aod->delivery_queue = anx_list_remove (aod->delivery_queue, head);
-
@@ -1154 +1353 @@
-  aod->need_seek = NEED_SEEK_PENDING;
-  aod->got_end = 0;
-
+
+
+
-
-  aod->delivery_queue = NULL;
@@ -1243 +1444 @@
-  anx_list_free_with (aod->delivery_queue, (AnxFreeFunc)anxogg_packet_free);
-
-logical
+track
-  for (i = 0; i < n; i++) {
-logical
+track
-    if (aot) {
-      track = &(aot->source_track);
@@ -1254 +1455 @@
-  }
-
-logical
+track
-
-#ifdef DEBUG