[Cvs-annodex] commit (annodex): liboggz/trunk/src/tools/oggz_tools.c

[conrad]

Update of /var/local/lib/svn/annodex (new revision 2556)

Modified files:
   liboggz/trunk/src/tools/oggz_tools.c

Log Message:
add FLAC samplerate, channels reporting to oggzinfo


Modified: liboggz/trunk/src/tools/oggz_tools.c
===================================================================
--- liboggz/trunk/src/tools/oggz_tools.c	2006-12-04 02:34:54 UTC (rev 2555)
+++ liboggz/trunk/src/tools/oggz_tools.c	2006-12-04 10:39:50 UTC (rev 2556)
@@ -170,6 +170,28 @@
 }
 
 static char *
+ot_flac_info (unsigned char * data, long len)
+{
+  char * buf;
+  int samplerate;
+  int channels;
+
+  if (len < 30) return NULL;
+
+  buf = malloc (60);
+
+  samplerate = (ogg_int64_t) (data[27] << 12) | (data[28] << 4) | 
+               ((data[29] >> 4)&0xf);
+  channels = 1 + (data[29] >> 1)&0x7;
+
+  snprintf (buf, 60,
+	    "\tAudio-Samplerate: %d Hz\n\tAudio-Channels: %d\n",
+            samplerate, channels);
+
+  return buf;
+}
+
+static char *
 ot_oggpcm2_info (unsigned char * data, long len)
 {
   char * buf;
@@ -211,7 +233,7 @@
   NULL,             /* ANNODEX */
   ot_skeleton_info,
   NULL,             /* FLAC0 */
-  NULL,             /* FLAC */
+  ot_flac_info,     /* FLAC */
   NULL,             /* ANXDATA */
   NULL              /* UNKOWN */
 };


-- 
conrad