Changeset 689

Timestamp:

2005-01-20 20:27:28 (4 years ago)

Author:

conrad

Message:

add support for basegranule, preroll, granuleshift throughout

Files:

• libannodex/trunk/include/annodex/anx_import.h (modified) (1 diff)
• libannodex/trunk/include/annodex/anx_track.h (modified) (1 diff)
• libannodex/trunk/include/annodex/anx_types.h (modified) (1 diff)
• libannodex/trunk/src/importers/anx_import_anx.c (modified) (5 diffs)
• libannodex/trunk/src/importers/anx_import_ogg.c (modified) (5 diffs)
• libannodex/trunk/src/importers/anx_import_sndfile.c (modified) (1 diff)
• libannodex/trunk/src/libannodex/anx_import.c (modified) (2 diffs)
• libannodex/trunk/src/libannodex/anx_import_private.h (modified) (1 diff)
• libannodex/trunk/src/libannodex/anx_read.c (modified) (1 diff)
• libannodex/trunk/src/libannodex/anx_track.c (modified) (2 diffs)
• libannodex/trunk/src/libannodex/anx_write.c (modified) (10 diffs)
• libannodex/trunk/src/tools/anxinfo.c (modified) (1 diff)

libannodex/trunk/include/annodex/anx_import.h

@@ -155 +155 @@
-  anx_int64_t current_granule;
-  int eos;
+  anx_int64_t basegranule;/*< Base granule */
+  int preroll;            /*< Preroll */
+  int granuleshift;       /*< Granuleshift */
-};
-

libannodex/trunk/include/annodex/anx_track.h

@@ -97 +97 @@
-                                   anx_int64_t granules);
-
+/**
+ * Query the basegranule of a track in an annodex
+ * \param annodex an ANNODEX* handle
+ * \param serialno the serialno of the track to query
+ * \returns the basegranule
+ */
+long anx_track_get_basegranule (ANNODEX * annodex, long serialno);
+
+/**
+ * Query the preroll of a track in an annodex
+ * \param annodex an ANNODEX* handle
+ * \param serialno the serialno of the track to query
+ * \returns the preroll
+ */
+int anx_track_get_preroll (ANNODEX * annodex, long serialno);
+
+/**
+ * Query the granuleshift of a track in an annodex
+ * \param annodex an ANNODEX* handle
+ * \param serialno the serialno of the track to query
+ * \returns the granuleshift
+ */
+int anx_track_get_granuleshift(ANNODEX * annodex, long serialno);
+
-#ifdef __cplusplus
-}

libannodex/trunk/include/annodex/anx_types.h

@@ -69 +69 @@
-  anx_int64_t granule_rate_n;  /*< the granule rate numerator */
-  anx_int64_t granule_rate_d;  /*< the granule rate denominator */
+  anx_int64_t basegranule;     /*< Base granule */
+  int preroll;            /*< Preroll */
+  int granuleshift;       /*< Granuleshift */
-};
-

libannodex/trunk/src/importers/anx_import_anx.c

@@ -157 +157 @@
-static int
-read_track (ANNODEX * anx, long serialno, char * id, char * content_type,
-       
-       
+    
+    
-{
-  AnxAnxData * aad = (AnxAnxData *)user_data;
@@ -194 +194 @@
-  }
-
+  track->basegranule = anx_track_get_basegranule (anx, serialno);
+  track->preroll = anx_track_get_preroll (anx, serialno);
+  track->granuleshift = anx_track_get_granuleshift (anx, serialno);
+
-  if (add_track (aad, serialno, track) == NULL) return -1;
-
@@ -320 +324 @@
-  m->custom_data = aad;
-
+#ifdef DEBUG
+  printf ("anxanx_open: opening %s\n", path);
+#endif
+
-  if ((anxr = anx_open ((char *)path, ANX_READ)) == NULL)
-    return NULL;
@@ -354 +362 @@
-  }
-
+#ifdef DEBUG
+  printf ("anxanx_open: got media %p\n", (void *)m);
+#endif
-
-  return m;
@@ -362 +373 @@
-{
-  AnxAnxData * aad = (AnxAnxData *)media->custom_data;
+
+#ifdef DEBUG
+  printf ("anxanx_read_update: in\n");
+#endif
-
- do_read:

libannodex/trunk/src/importers/anx_import_ogg.c

@@ -171 +171 @@
-      track->granule_rate_d = 1;
-      track->nr_header_packets = 3;
+      track->basegranule = 0;
+      track->preroll = 2;
+      track->granuleshift = 0;
-    } else if (!strncmp ((char *)&op->packet[0], "Speex   ", 8)) {
-      track->content_type = SPEEX_CONTENT_TYPE;
@@ -176 +179 @@
-      track->granule_rate_d = 1;
-      track->nr_header_packets = 2 + (ogg_int64_t) INT32_LE_AT(&header[68]);
+      track->basegranule = 0;
+      track->preroll = 0;
+      track->granuleshift = 0;
-    } else if (!strncmp ((char *)&op->packet[1], "theora", 6)) {
-      char keyframe_granule_shift = 0;
@@ -186 +192 @@
-      keyframe_granule_shift |= (header[41] & 0xe0) /* 11100000 */ >> 5;
-#endif
+
+#if USE_ANNODEX2_GRANULERATE
-      track->granule_rate_n = INT32_BE_AT(&header[22]) *
-        (1 << keyframe_granule_shift) / 1000000;
-      track->granule_rate_d = INT32_BE_AT(&header[26]) / 1000000;
+#else /* anx v3 */
+      track->granule_rate_n = INT32_BE_AT(&header[22]) / 1000000;
+      track->granule_rate_d = INT32_BE_AT(&header[26]) / 1000000;
+#endif
-      track->nr_header_packets = 3;
+      track->basegranule = 0;
+      track->preroll = 0;
+      track->granuleshift = keyframe_granule_shift;
-    } else if (!strncmp ((char *)&op->packet[1], "video", 5) && 
-               !strncmp ((char *)&op->packet[9], "XVID", 4)) {
@@ -196 +211 @@
-      track->granule_rate_d = 1;
-      track->nr_header_packets = 2;
+      track->basegranule = 0;
+      track->preroll = 0;
+      track->granuleshift = 0;
-    } else {
-      anx_free (track);
@@ -309 +327 @@
-  m->current_time = start_time;
-
-
-
+
-
-#ifdef DEBUG

libannodex/trunk/src/importers/anx_import_sndfile.c

@@ -204 +204 @@
-  track->current_granule = 0;
-  track->eos = 0;
+
+  track->basegranule = 0;
+  track->preroll = 0;
+  track->granuleshift = 0;
-
-  if (end_time != -1.0) {

libannodex/trunk/src/libannodex/anx_import.c

@@ -364 +364 @@
-                      long * nr_header_packets,
-                      anx_int64_t * granule_rate_n,
-
+
+
+
-{
-  AnxList * l;
@@ -379 +381 @@
-      *granule_rate_n = track->granule_rate_n;
-      *granule_rate_d = track->granule_rate_d;
+      *basegranule = track->basegranule;
+      *preroll = track->preroll;
+      *granuleshift = track->granuleshift;
-      return 0;
-    }

libannodex/trunk/src/libannodex/anx_import_private.h

@@ -68 +68 @@
-                       long * nr_header_packets,
-                       anx_int64_t * granule_rate_n,
-
+
+
+
-
-int anx_media_current_track (AnxSource * source);

libannodex/trunk/src/libannodex/anx_read.c

@@ -331 +331 @@
-  track->granule_rate_d = _le_64 (*((ogg_int64_t *)&data[28]));
-  track->nr_header_packets = _le_32 (*((ogg_int32_t *)&data[16]));
+  track->basegranule = _le_64 (*((ogg_int64_t *)&data[36]));
+  track->preroll = (int)_le_32 (*((ogg_int32_t *)&data[44]));
+  track->granuleshift = (int)(*((unsigned char *)&data[48]));
-
-  reader->tracks = anx_list_append (reader->tracks, track);
-
-#ifdef DEBUG
-
+l
-          track->serialno,
-          (long)track->granule_rate_n,
-          (long)track->granule_rate_d,
-          track->nr_header_packets, content_type, id);
+  printf ("\tbasegranule %lld\tpreroll %d\tgranuleshift %d\n",
+          track->basegranule, track->preroll, track->granuleshift);
-#endif
-

libannodex/trunk/src/libannodex/anx_track.c

@@ -54 +54 @@
-  s->granule_rate_n = track->granule_rate_n;
-  s->granule_rate_d = track->granule_rate_d;
+  s->basegranule = track->basegranule;
+  s->preroll = track->preroll;
+  s->granuleshift = track->granuleshift;
+
+#ifdef DEBUG
+  printf ("anx_track_clone: basegranule %lld\tpreroll %d\tgranuleshift %d\n",
+          s->basegranule, s->preroll, s->granuleshift);
+#endif
-
-  return s;
@@ -244 +252 @@
-}
-
+long
+anx_track_get_basegranule (ANNODEX * annodex, long serialno)
+{
+  AnxTrack * track;
+  
+  if (annodex == NULL) return -1L;
+  
+  track = anx_get_track (annodex, serialno);
+  
+  if (track == NULL || track->basegranule == -1) {
+    anx_set_error (annodex, ANX_ERR_NOTREADY);
+    return -1L;
+  }
+  
+  return track->basegranule;
+}
+
+int
+anx_track_get_preroll (ANNODEX * annodex, long serialno)
+{
+  AnxTrack * track;
+
+  if (annodex == NULL) return -1;
+
+  track = anx_get_track (annodex, serialno);
+
+  if (track == NULL || track->preroll == -1) {
+    anx_set_error (annodex, ANX_ERR_NOTREADY);
+    return -1;
+  }
+
+  return track->preroll;
+}
+
+int
+anx_track_get_granuleshift(ANNODEX * annodex, long serialno)
+{
+  AnxTrack * track;
+
+  if (annodex == NULL) return -1;
+
+  track = anx_get_track (annodex, serialno);
+
+  if (track == NULL || track->granuleshift == -1) {
+    anx_set_error (annodex, ANX_ERR_NOTREADY);
+    return -1;
+  }
+
+  return track->granuleshift;
+}

libannodex/trunk/src/libannodex/anx_write.c

@@ -145 +145 @@
-anx_writer_add_track (ANNODEX * annodex, AnxSource * media, int media_index,
-                      char * id, char * content_type, long nr_header_packets,
-
+
+
-{
-  AnxWriter * writer = &annodex->x.writer;
@@ -164 +165 @@
-  track->granule_rate_n = granule_rate_n;
-  track->granule_rate_d = granule_rate_d;
+  track->basegranule = basegranule;
+  track->preroll = preroll;
+  track->granuleshift = granuleshift;
-
-  wsub->media = media;
@@ -204 +208 @@
-  long nr_header_packets;
-  anx_int64_t granule_rate, rate_interval;
+  anx_int64_t basegranule;
+  int preroll, granuleshift;
-
-  if (media != NULL) {
@@ -209 +215 @@
-      ret = anx_media_query_track (media, i, &id, &content_type,
-                                   &nr_header_packets,
-
+
+
-
-      if (ret < 0) break;
@@ -217 +224 @@
-#endif
-      anx_writer_add_track (annodex, media, i, id, content_type,
-
+
+
-    }
-
@@ -468 +476 @@
-  if (track == NULL) return -1;
-
+#ifdef DEBUG
+  printf ("anx_init_fisbone_packet: basegranule %lld\tpreroll %d\tgranuleshift %d\n",
+          track->basegranule, track->preroll, track->granuleshift);
+#endif
+
-  params = anx_params_append (params, "Content-Type", track->content_type);
-  params = anx_params_append (params, "ID", track->id);
@@ -501 +514 @@
-  b += 8;
-
-
-
-
-
-
-
+
+
+
+
-  b += 4;
-
-
-
+
-  b += 1;
-
@@ -988 +998 @@
-    if (writer->need_fishead) {
-#ifdef DEBUG
-mapping
+fishead
-#endif
-      anx_init_fishead_packet (annodex);
@@ -1037 +1047 @@
-    } else if (writer->need_fisbone) {
-#ifdef DEBUG
-anxdata
+fisbone
-#endif
-      for (l = writer->tracks; l; l = l->next) {
@@ -1290 +1300 @@
-  writer->anno_track.granule_rate_n = CMML_GRANULE_RATE_N;
-  writer->anno_track.granule_rate_d = CMML_GRANULE_RATE_D;
+  writer->anno_track.basegranule = 0;
+  writer->anno_track.preroll = 0;
+  writer->anno_track.granuleshift = 0;
-
-  writer->eos = 0; /* end of stream */

libannodex/trunk/src/tools/anxinfo.c

@@ -220 +220 @@
-            s->id ? s->id : "-- unidentified --",
-            s->serialno, buf, s->nr_header_packets, s->content_type);
-
+
+
+
+
-  }
-