Commit d68b7d34 authored by conrad's avatar conrad

oggzdiff: make use of 'oggdump -c content-type' option:

	+ hijack DIFFOPTS -c, which is equivalent to -C 3, and used only for
context diffs (unified diffs use -u) ... unfortunate, but diffing particular
logical bitstreams is far more elite than that ever was ;-)


git-svn-id: http://svn.annodex.net/liboggz/trunk@1193 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent e285b708
...\" $Header: /var/lib/cvsd/annodex/liboggz/doc/oggzdiff.1,v 1.1 2004/01/04 05:28:25 zen Exp $ .\" $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 Exp $
...\" .\"
...\" transcript compatibility for postscript use. .\" transcript compatibility for postscript use.
...\" .\"
...\" synopsis: .P! <file.ps> .\" synopsis: .P! <file.ps>
...\" .\"
.de P! .de P!
.fl .fl
\!!1 setgray \!!1 setgray
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
\!!save /psv exch def currentpoint translate 0 0 moveto \!!save /psv exch def currentpoint translate 0 0 moveto
\!!/showpage{}def \!!/showpage{}def
.fl \" prolog .fl \" prolog
.sy sed -e 's/^/!/' \\$1\" bring in postscript file .sy sed \-e 's/^/!/' \\$1\" bring in postscript file
\!!psv restore \!!psv restore
. .
.de pF .de pF
...@@ -61,9 +61,9 @@ oggzdiff \(em Hexdump the packets of two Ogg files and output differences ...@@ -61,9 +61,9 @@ oggzdiff \(em Hexdump the packets of two Ogg files and output differences
.PP .PP
\fB\fBoptions:\fR\fR [--verbose ] [-v | --version ] [-h | --help ] \fB\fBoptions:\fR\fR [--verbose ] [-v | --version ] [-h | --help ]
.PP .PP
\fB\fBOGGZDUMP_OPTIONS:\fR\fR [-b | --binary ] [-x | --hexadecimal ] [-s serialno | --serialno serialno ] [-O | --hide-offset ] [-S | --hide-serialno ] [-G | --hide-granulepos ] [-P | --hide-packetno ] \fB\fBOGGZDUMP_OPTIONS:\fR\fR [-b | --binary ] [-x | --hexadecimal ] [-c content-type | --content-type content-type ] [-s serialno | --serialno serialno ] [-O | --hide-offset ] [-S | --hide-serialno ] [-G | --hide-granulepos ] [-P | --hide-packetno ]
.PP .PP
\fB\fBDIFF_OPTIONS:\fR\fR [-q | --brief ] [-c | -C NUM | --context[=NUM] ] [-u | -U NUM | --unified[=NUM] ] [-e | --ed ] [--normal ] [--rcs ] [-y | --side-by-side ] [-l | --paginate ] \fB\fBDIFF_OPTIONS:\fR\fR [-q | --brief ] [-C NUM | --context[=NUM] ] [-u | -U NUM | --unified[=NUM] ] [-e | --ed ] [--normal ] [--rcs ] [-y | --side-by-side ] [-l | --paginate ]
.SH "Description" .SH "Description"
.PP .PP
\fBoggzdiff\fR is a \fBsh\fR script which \fBoggzdiff\fR is a \fBsh\fR script which
...@@ -87,6 +87,11 @@ Generate a binary dump of each packet ...@@ -87,6 +87,11 @@ Generate a binary dump of each packet
Generate a hexadecimal dump of each packet Generate a hexadecimal dump of each packet
.SS "oggzdump filtering options" .SS "oggzdump filtering options"
.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 .IP "-s \fBserialno\fR, --serialno \fBserialno\fR" 10
Dump only the logical bitstream with specified Dump only the logical bitstream with specified
\fBserialno\fR. \fBserialno\fR.
...@@ -116,8 +121,8 @@ The -w (--ignore-all-space) option to \fBdiff\fR is always implied. ...@@ -116,8 +121,8 @@ The -w (--ignore-all-space) option to \fBdiff\fR is always implied.
.IP "-q, --brief" 10 .IP "-q, --brief" 10
Output only whether files differ. Output only whether files differ.
.IP "-c, -C \fBNUM\fR, --context[=\fBNUM\fR]" 10 .IP "-C \fBNUM\fR, --context[=\fBNUM\fR]" 10
Output NUM (default 3) lines of copied context. Output NUM lines of copied context.
.IP "-u, -U \fBNUM\fR, --unified[=\fBNUM\fR]" 10 .IP "-u, -U \fBNUM\fR, --unified[=\fBNUM\fR]" 10
Output NUM (default 3) lines of unified context. Output NUM (default 3) lines of unified context.
...@@ -157,4 +162,4 @@ Copyright \(co 2003 CSIRO Australia ...@@ -157,4 +162,4 @@ Copyright \(co 2003 CSIRO Australia
\fBoggzdump\fP\fB(1)\fP, \fBoggzdump\fP\fB(1)\fP,
\fBdiff\fP\fB(1)\fP, \fBdiff\fP\fB(1)\fP,
\fBpatch\fP\fB(1)\fP \fBpatch\fP\fB(1)\fP
...\" created by instant / docbook-to-man, Wed 19 Nov 2003, 12:25 .\" created by instant / docbook-to-man, Thu 31 Mar 2005, 00:07
...@@ -90,6 +90,11 @@ manpage.1: manpage.sgml ...@@ -90,6 +90,11 @@ manpage.1: manpage.sgml
<arg choice="opt">-x</arg><arg choice="opt">--hexadecimal</arg> <arg choice="opt">-x</arg><arg choice="opt">--hexadecimal</arg>
</group> </group>
<group>
<arg choice="opt">-c content-type</arg>
<arg choice="opt">--content-type content-type</arg>
</group>
<group> <group>
<arg choice="opt">-s serialno</arg> <arg choice="opt">-s serialno</arg>
<arg choice="opt">--serialno serialno</arg> <arg choice="opt">--serialno serialno</arg>
...@@ -117,7 +122,6 @@ manpage.1: manpage.sgml ...@@ -117,7 +122,6 @@ manpage.1: manpage.sgml
</group> </group>
<group> <group>
<arg choice="opt">-c</arg>
<arg choice="opt">-C NUM</arg> <arg choice="opt">-C NUM</arg>
<arg choice="opt">--context[=NUM]</arg> <arg choice="opt">--context[=NUM]</arg>
</group> </group>
...@@ -191,6 +195,14 @@ manpage.1: manpage.sgml ...@@ -191,6 +195,14 @@ manpage.1: manpage.sgml
<title>oggzdump filtering options</title> <title>oggzdump filtering options</title>
<variablelist> <variablelist>
<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>
<varlistentry> <varlistentry>
<term>-s <parameter>serialno</parameter>, --serialno <parameter>serialno</parameter></term> <term>-s <parameter>serialno</parameter>, --serialno <parameter>serialno</parameter></term>
<listitem><para>Dump only the logical bitstream with specified <listitem><para>Dump only the logical bitstream with specified
...@@ -246,8 +258,8 @@ manpage.1: manpage.sgml ...@@ -246,8 +258,8 @@ manpage.1: manpage.sgml
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>-c, -C <parameter>NUM</parameter>, --context[=<parameter>NUM</parameter>]</term> <term>-C <parameter>NUM</parameter>, --context[=<parameter>NUM</parameter>]</term>
<listitem><para>Output NUM (default 3) lines of copied context. <listitem><para>Output NUM lines of copied context.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
......
...@@ -47,8 +47,9 @@ usage () { ...@@ -47,8 +47,9 @@ usage () {
echo >&2 "OGGZDUMP_OPTIONS: [-b | --binary] [-x | --hexadecimal]" echo >&2 "OGGZDUMP_OPTIONS: [-b | --binary] [-x | --hexadecimal]"
echo >&2 " [-O | --hide-offset] [-S | --hide-serialno] [-G | --hide-granulepos]" echo >&2 " [-O | --hide-offset] [-S | --hide-serialno] [-G | --hide-granulepos]"
echo >&2 " [-P | --hide-packetno] [-s serialno | --serialno serialno]" echo >&2 " [-P | --hide-packetno] [-s serialno | --serialno serialno]"
echo >&2 " [-c content-type | --content-type content-type]"
echo >&2 echo >&2
echo >&2 "DIFF_OPTIONS: [-q | --brief] [-c | -C NUM | --context[=NUM]]" echo >&2 "DIFF_OPTIONS: [-q | --brief] [-C NUM | --context[=NUM]]"
echo >&2 " [-u | -U NUM | --unified[=NUM]] [-e | -ed] [--normal] [--rcs]" echo >&2 " [-u | -U NUM | --unified[=NUM]] [-e | -ed] [--normal] [--rcs]"
echo >&2 " [-y | --side-by-side] [-l | --paginate]" echo >&2 " [-y | --side-by-side] [-l | --paginate]"
echo >&2 echo >&2
...@@ -58,10 +59,10 @@ usage () { ...@@ -58,10 +59,10 @@ usage () {
GETOPTEST=`getopt --version` GETOPTEST=`getopt --version`
case $GETOPTEST in case $GETOPTEST in
getopt*) # GNU getopt getopt*) # GNU getopt
TEMP=`getopt -l verbose -l version -l brief -l context:: -l unified:: -l ed -l normal -l rcs -l side-by-side -l paginate -l binary -l hexadecimal -l serialno: -l hide-offset -l hide-serialno -l hide-granulepos -l hide-packetno -l help -- +qcC:uU:eylbxs:OSGPhv "$@"` TEMP=`getopt -l verbose -l version -l brief -l context:: -l unified:: -l ed -l normal -l rcs -l side-by-side -l paginate -l binary -l hexadecimal -l serialno: -l content-type: -l hide-offset -l hide-serialno -l hide-granulepos -l hide-packetno -l help -- +qC:uU:eylbxs:c:OSGPhv "$@"`
;; ;;
*) # POSIX getopt ? *) # POSIX getopt ?
TEMP=`getopt qcC:uU:eylbxs:OSGPhv "$@"` TEMP=`getopt qC:uU:eylbxs:c:OSGPhv "$@"`
;; ;;
esac esac
...@@ -80,9 +81,6 @@ while test "X$1" != "X--"; do ...@@ -80,9 +81,6 @@ while test "X$1" != "X--"; do
-q|--brief) -q|--brief)
DIFFOPTS=$DIFFOPTS" -q" DIFFOPTS=$DIFFOPTS" -q"
;; ;;
-c)
DIFFOPTS=$DIFFOPTS" -c"
;;
-C) -C)
shift shift
DIFFOPTS=$DIFFOPTS" -C $1" DIFFOPTS=$DIFFOPTS" -C $1"
...@@ -135,6 +133,10 @@ while test "X$1" != "X--"; do ...@@ -135,6 +133,10 @@ while test "X$1" != "X--"; do
shift shift
DUMPOPTS=$DUMPOPTS" -s $1" DUMPOPTS=$DUMPOPTS" -s $1"
;; ;;
-c)
shift
DUMPOPTS=$DUMPOPTS" -c $1"
;;
-O|--hide-offset) -O|--hide-offset)
DUMPOPTS=$DUMPOPTS" -O" DUMPOPTS=$DUMPOPTS" -O"
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment