Changeset 1191

Timestamp:

2005-03-30 05:04:32 (4 years ago)

Author:

conrad

Message:

add "-c content-type" option to oggzdump; eg:
$ oggzdump -c theora pants.ogg
will just dump the theora stream, and
$ oggzdump -c theora -n pants.ogg
will just dump the theora BOS.
(theora, vorbis, speex, cmml supported, as for oggzrip, via oggz_tools.c)

Files:

• liboggz/trunk/doc/oggzdump.1 (modified) (6 diffs)
• liboggz/trunk/doc/oggzdump.1.sgml (modified) (2 diffs)
• liboggz/trunk/src/tools/oggzdump.c (modified) (12 diffs)

liboggz/trunk/doc/oggzdump.1

@@ -1 @@
-..\" $Header: /var/lib/cvsd/annodex/liboggz/doc/oggzdump.1,v 1.1 2004/01/04 05:28:25 zen
-..
-..
-..
-..
-..
+\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l
+
+
+
+
+
-.de P!
-.fl
@@ -16 +16 @@
-\!!/showpage{}def
-.fl                     \" prolog
-
+\
-\!!psv restore
-.
@@ -59 +59 @@
-.SH "SYNOPSIS" 
-.PP 
-
+c \fBcontent-type\fR  | --content-type \fBcontent-type\fR ]  [-
-.PP 
-\fBoggzdump\fR [-r  | --revert ]  [-o \fBfilename\fR  | --output \fBfilename\fR ] filename  
@@ -76 +76 @@
-Generate a binary dump of each packet 
- 
-am
+ma
-Generate a hexadecimal dump of each packet 
- 
@@ -84 +84 @@
-bitstream found; for correctly formed Ogg files, this dumps 
-only the beginning-of-stream packets. 
+ 
+.IP "-c \fBcontent-type\fR, --content-type \fBcontent-type\fR" 10 
+Dump only the logical bitstreams for a specific 
+\fBcontent-type\fR. The following codec names 
+are currently detected: "theora", "vorbis", "speex", "cmml" 
- 
-.IP "-s \fBserialno\fR, --serialno \fBserialno\fR" 10 
@@ -148 +153 @@
-\fBxxd\fP\fB(1)\fP, 
-\fBhexdump\fP\fB(1)\fP      
-..\" created by instant / docbook-to-man, Wed 19 Nov 2003, 11:4
+\" created by instant / docbook-to-man, Wed 30 Mar 2005, 23:0

liboggz/trunk/doc/oggzdump.1.sgml

@@ -80 +80 @@
-
-      <group>
+        <arg choice="opt">-c <parameter>content-type</parameter></arg>
+        <arg choice="opt">--content-type <parameter>content-type</parameter></arg>
+      </group>
+
+      <group>
-        <arg choice="opt">-s <parameter>serialno</parameter></arg>
-        <arg choice="opt">--serialno <parameter>serialno</parameter></arg>
@@ -161 +166 @@
-              bitstream found; for correctly formed Ogg files, this dumps
-              only the beginning-of-stream packets.
+            </para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>-c <parameter>content-type</parameter>, --content-type <parameter>content-type</parameter></term>
+          <listitem><para>Dump only the logical bitstreams for a specific
+              <parameter>content-type</parameter>. The following codec names
+              are currently detected: "theora", "vorbis", "speex", "cmml"
-            </para></listitem>
-        </varlistentry>

liboggz/trunk/src/tools/oggzdump.c

@@ -55 +55 @@
-#define MIN(a,b) (((a)<(b))?(a):(b))
-
+typedef struct {
+  OggzTable * content_types_table;
+  OggzReadPacket read_packet;
+} ODData;
+
-static char * progname;
-static FILE * outfile = NULL;
-static int dump_bits = 0;
-static int dump_char = 1;
-static int dump_all_serialnos = 1;
-static int truth = 1;
-
@@ -77 +81 @@
-  printf ("\nFiltering options\n");
-  printf ("  -n, --new              Only dump the first packet of each logical bitstream\n");
+  printf ("  -c content-type, --content-type content-type\n");
+  printf ("                         Dump only the logical bitstreams for a specified\n");
+  printf ("                         content-type. The following codecs are currently\n");
+  printf ("                         detected: theora, vorbis, speex, cmml\n");
-  printf ("  -s serialno, --serialno serialno\n");
-  printf ("                         Dump only the logical bitstream with specified serialno\n");
@@ -95 +103 @@
-}
-
+static ODData *
+oddata_new ()
+{
+  ODData * oddata = malloc (sizeof (ODData));
+  memset (oddata, 0, sizeof (ODData));
+
+  oddata->content_types_table = oggz_table_new ();
+
+  return oddata;
+}
+
+static void
+oddata_delete (ODData * oddata)
+{
+  oggz_table_delete (oddata->content_types_table);
+
+  free (oddata);
+}
+
-static void
-dump_char_line (unsigned char * buf, long n)
@@ -239 +266 @@
-
-  fprintf (outfile, "\n");
+
+  return 0;
+}
+
+static int
+filter_page (OGGZ * oggz, const ogg_page * og, long serialno, void * user_data)
+{
+  ODData * oddata = (ODData *) user_data;
+  const char * ident;
+  int i, n;
+
+  if (ogg_page_bos ((ogg_page *)og)) {
+    ident = ot_page_identify (og, NULL);
+    n = oggz_table_size (oddata->content_types_table);
+    for (i = 0; i < n; i++) {
+      char * c = oggz_table_nth (oddata->content_types_table, i, NULL);
+      if (strcasecmp (c, ident) == 0) {
+        oggz_set_read_callback (oggz, serialno, oddata->read_packet, NULL);
+      }
+    }
+  }
-
-  return 0;
@@ -391 +439 @@
-  int show_help = 0;
-
+  ODData * oddata;
-  OGGZ * oggz;
-  char * infilename = NULL, * outfilename = NULL;
@@ -396 +445 @@
-  OggzTable * table = NULL;
-  long serialno;
-  OggzReadPacket my_read_packet = read_packet;
-  int i, size;
-  long n;
+
+  int filter_serialnos = 0;
+  int filter_content_types = 0;
-
-  ot_init ();
@@ -409 +460 @@
-  }
-
+  oddata = oddata_new ();
+
+  oddata->read_packet = read_packet;
+
-  table = oggz_table_new();
-
-  while (1) {
-
+c:
-
-#ifdef HAVE_GETOPT_LONG
@@ -424 +479 @@
-      {"output", required_argument, 0, 'o'},
-      {"serialno", required_argument, 0, 's'},
+      {"content-type", required_argument, 0, 'c'},
-      {"hide-offset", no_argument, 0, 'O'},
-      {"hide-serialno", no_argument, 0, 'S'},
@@ -452 +508 @@
-      break;
-    case 'n': /* new */
-my_
+oddata->
-      break;
-    case 'o': /* output */
@@ -461 +517 @@
-      break;
-    case 's': /* serialno */
-dump_all_serialnos = 0
+filter_serialnos = 1
-      serialno = atol (optarg);
-      oggz_table_insert (table, serialno, &truth);
+      break;
+    case 'c': /* content-type */
+      filter_content_types = 1;
+      n = (long)oggz_table_size (oddata->content_types_table);
+      oggz_table_insert (oddata->content_types_table, (long)n, optarg);
-      break;
-    case 'O': /* hide offset */
@@ -539 +600 @@
-    }
-
-dump_all_serialno
-my_
+!filter_serialnos && !filter_content_type
+oddata->
-    } else {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-      }
-    }
@@ -555 +622 @@
-
- exit_ok:
+  oddata_delete (oddata);
-  oggz_table_delete (table);
-  exit (0);
-
- exit_err:
+  oddata_delete (oddata);
-  oggz_table_delete (table);
-  exit (1);