Changeset 690

Timestamp:

2005-01-20 21:42:20 (4 years ago)

Author:

conrad

Message:

add flac header parsing to oggz_auto (patch from Tobias Gehrig)

Files:

• liboggz/trunk/ChangeLog (modified) (1 diff)
• liboggz/trunk/src/liboggz/oggz_auto.c (modified) (2 diffs)

liboggz/trunk/ChangeLog

@@ +1 @@
+Fri Jan 21 17:38:33 EST 2005 Conrad Parker <conrad@annodex.net>
+
+        * added FLAC header parsing from Tobias Gehrig
+
-Fri May 28 11:08:34 EST 2004 Conrad Parker <conrad@annodex.net>
-

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -226 +226 @@
-}
-
+static int
+auto_flac (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
+{
+  unsigned char * header = op->packet;
+  ogg_int64_t granule_rate = 0;
+
+  if (op->bytes < 51) return 0;
+
+  if (header[0] != 0x7f) return 0;
+  if (strncmp ((char *)&header[1], "FLAC", 4)) return 0;
+  if (!op->b_o_s) return 0;
+
+  granule_rate = (ogg_int64_t) (header[27] << 12) | (header[28] << 4) | ((header[29] >> 4)&0xf);
+#ifdef DEBUG
+  printf ("Got flac rate %d\n", (int)granule_rate);
+#endif
+
+  oggz_set_metric_linear (oggz, serialno, granule_rate, OGGZ_AUTO_MULT);
+
+  return 1;
+}
+
-static const OggzReadPacket auto_readers[] = {
-  auto_speex,
@@ -232 +254 @@
-  auto_annodex,
-  auto_anxdata,
+  auto_flac,
-  NULL
-};