Commit 40c9a68d authored by conrad's avatar conrad
Browse files

oggz-chop: add -k,--no-skeleton commandline option to disable generation

of skeleton headers and to not copy input skeleton headers to the output.
Updates oggz-chop man page and --help output accordingly.


git-svn-id: http://svn.annodex.net/liboggz/trunk@3620 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent 009d15ca
...@@ -77,6 +77,8 @@ manpage.1: manpage.sgml ...@@ -77,6 +77,8 @@ manpage.1: manpage.sgml
<arg choice="opt">--end <parameter>end_time</parameter></arg> <arg choice="opt">--end <parameter>end_time</parameter></arg>
</group> </group>
<group><arg choice="opt">-k</arg><arg choice="opt">--no-skeleton</arg></group>
<arg choice="plain">filename</arg> <arg choice="plain">filename</arg>
</cmdsynopsis> </cmdsynopsis>
...@@ -108,6 +110,10 @@ manpage.1: manpage.sgml ...@@ -108,6 +110,10 @@ manpage.1: manpage.sgml
data page included in the output. It does however ensure to set the data page included in the output. It does however ensure to set the
end of stream flag on the last page of each logical bitstream. end of stream flag on the last page of each logical bitstream.
</para> </para>
<para>
Skeleton handling: By default, the output will contain a Skeleton track
specifying the start of the chop as presentation time.
</para>
</refsect1> </refsect1>
<refsect1> <refsect1>
...@@ -138,6 +144,12 @@ manpage.1: manpage.sgml ...@@ -138,6 +144,12 @@ manpage.1: manpage.sgml
<listitem><para>Specify the end time of the chopped section to output. <listitem><para>Specify the end time of the chopped section to output.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>-k , --no-skeleton</term>
<listitem><para>Do NOT include a Skeleton bitstream in the output.
</para></listitem>
</varlistentry>
</variablelist> </variablelist>
<title>Miscellaneous options</title> <title>Miscellaneous options</title>
......
...@@ -140,6 +140,7 @@ cgi_main (OCState * state) ...@@ -140,6 +140,7 @@ cgi_main (OCState * state)
memset (state, 0, sizeof(*state)); memset (state, 0, sizeof(*state));
state->infilename = path_translated; state->infilename = path_translated;
state->end = -1.0; state->end = -1.0;
state->do_skeleton = 1;
/*photo_init (&params->in, path_translated);*/ /*photo_init (&params->in, path_translated);*/
......
...@@ -23,6 +23,7 @@ usage (char * progname) ...@@ -23,6 +23,7 @@ usage (char * progname)
printf (" Specify start time\n"); printf (" Specify start time\n");
printf (" -e end_time, --end end_time\n"); printf (" -e end_time, --end end_time\n");
printf (" Specify end time\n"); printf (" Specify end time\n");
printf (" -k , --no-skeleton Do NOT include a Skeleton bitstream in the output");
printf ("\nMiscellaneous options\n"); printf ("\nMiscellaneous options\n");
printf (" -h, --help Display this help and exit\n"); printf (" -h, --help Display this help and exit\n");
printf (" -v, --version Output version information and exit\n"); printf (" -v, --version Output version information and exit\n");
...@@ -46,15 +47,17 @@ cmd_main (OCState * state, int argc, char * argv[]) ...@@ -46,15 +47,17 @@ cmd_main (OCState * state, int argc, char * argv[])
memset (state, 0, sizeof(*state)); memset (state, 0, sizeof(*state));
state->end = -1.0; state->end = -1.0;
state->do_skeleton = 1;
while (1) { while (1) {
char * optstring = "s:e:o:hv"; char * optstring = "s:e:o:khv";
#ifdef HAVE_GETOPT_LONG #ifdef HAVE_GETOPT_LONG
static struct option long_options[] = { static struct option long_options[] = {
{"start", required_argument, 0, 's'}, {"start", required_argument, 0, 's'},
{"end", required_argument, 0, 'e'}, {"end", required_argument, 0, 'e'},
{"output", required_argument, 0, 'o'}, {"output", required_argument, 0, 'o'},
{"no-skeleton", no_argument, 0, 'k'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'v'}, {"version", no_argument, 0, 'v'},
{0,0,0,0} {0,0,0,0}
...@@ -77,6 +80,9 @@ cmd_main (OCState * state, int argc, char * argv[]) ...@@ -77,6 +80,9 @@ cmd_main (OCState * state, int argc, char * argv[])
case 'e': /* end */ case 'e': /* end */
state->end = parse_timespec (optarg); state->end = parse_timespec (optarg);
break; break;
case 'k': /* no-skeleton */
state->do_skeleton = 0;
break;
case 'h': /* help */ case 'h': /* help */
show_help = 1; show_help = 1;
break; break;
......
...@@ -722,7 +722,6 @@ chop (OCState * state) ...@@ -722,7 +722,6 @@ chop (OCState * state)
{ {
OGGZ * oggz; OGGZ * oggz;
state->do_skeleton = 1;
state_init (state); state_init (state);
if (strcmp (state->infilename, "-") == 0) { if (strcmp (state->infilename, "-") == 0) {
......
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