Changeset 3512 for liboggz/trunk/src/liboggz/oggz_auto.c

Timestamp:

2008-03-20 03:30:14 (9 months ago)

Author:

conrad

Message:

add Kate support to liboggz and oggzinfo, oggzdump, oggzrip etc.
See http://wiki.xiph.org/index.php/OggKate. Patch from ogg.k.ogg.k

Files:

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

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -141 +141 @@
-  int keyframe_shift;
-
+  /* TODO: this should check against 42 for the relevant version numbers */
-  if (op->bytes < 41) return 0;
-
@@ -158 +159 @@
-#else
-  keyframe_granule_shift = (char) ((header[40] & 0x03) << 3);
-
+ /* see TODO above */
-  keyframe_shift = keyframe_granule_shift;
-#endif
@@ -322 +323 @@
-
-  oggz_stream_set_numheaders (oggz, serialno, 3);
+
+  return 1;
+}
+
+static int
+auto_kate (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
+{
+  unsigned char * header = op->packet;
+  ogg_int32_t gps_numerator, gps_denominator;
+  unsigned char granule_shift = 0;
+  int numheaders;
+
+  if (op->bytes < 64) return 0;
+
+  gps_numerator = INT32_LE_AT(&header[24]);
+  gps_denominator = INT32_LE_AT(&header[28]);
+
+  granule_shift = (header[15]);
+  numheaders = (header[11]);
+
+#ifdef DEBUG
+  printf ("Got kate gps %d/%d, granule shift %d\n",
+          gps_numerator, gps_denominator, granule_shift);
+#endif
+
+  oggz_set_granulerate (oggz, serialno, gps_numerator,
+                        OGGZ_AUTO_MULT * gps_denominator);
+  oggz_set_granuleshift (oggz, serialno, granule_shift);
+ 
+  oggz_stream_set_numheaders (oggz, serialno, numheaders);
-
-  return 1;
@@ -1012 +1043 @@
-  {"AnxData", 7, "AnxData", auto_anxdata, NULL, NULL},
-  {"CELT    ", 8, "CELT", auto_celt, auto_calc_celt, NULL},
+  {"\200kate\0\0\0\0", 9, "Kate", auto_kate, NULL, NULL},
-  {"", 0, "Unknown", NULL, NULL, NULL}
-}; 
@@ -1106 +1138 @@
-        offset = 7;
-      break;
+    case OGGZ_CONTENT_KATE:
+      if (op->bytes > 9 && memcmp (op->packet, "\201kate\0\0\0\0", 9) == 0) {
+        offset = 9;
+      }
+      break;
-    case OGGZ_CONTENT_FLAC:
-      if (op->bytes > 4 && (op->packet[0] & 0x7) == 4) {
@@ -1111 +1148 @@
-        offset = 4;
-      }
+      break;
-    default:
-      break;