Changeset 851

Timestamp:

2005-02-06 16:43:35 (4 years ago)

Author:

conrad

Message:

add support for cmml granuleshift parsing in oggz_auto

Files:

• liboggz/trunk/src/liboggz/oggz_auto.c (modified) (3 diffs)
• liboggz/trunk/src/liboggz/oggz_auto.h (modified) (1 diff)

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -290 +290 @@
-  unsigned char * header = op->packet;
-  ogg_int64_t granule_rate_numerator = 0, granule_rate_denominator = 0;
+  int granuleshift;
-
-  if (op->bytes < 28) return 0;
@@ -298 +299 @@
-  granule_rate_numerator = INT64_LE_AT(&header[12]);
-  granule_rate_denominator = INT64_LE_AT(&header[20]);
+  if (op->bytes > 28)
+    granuleshift = (int)header[28];
+  else
+    granuleshift = 0;
+
-#ifdef DEBUG
-  printf ("Got CMML rate %lld/%lld\n", granule_rate_numerator,
@@ -306 +312 @@
-                        granule_rate_numerator,
-                        OGGZ_AUTO_MULT * granule_rate_denominator);
+  oggz_set_granuleshift (oggz, serialno, granuleshift);
-
-  return 1;

liboggz/trunk/src/liboggz/oggz_auto.h

@@ -214 +214 @@
-|                                                               | 24-27
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+| Granuleshift  |                                                 28-31
++-+-+-+-+-+-+-+-+
-
-*/