[xiph-commits] r3620 - in liboggz/trunk: doc src/tools/oggz-chop

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-06-29 07:22:40 -0700 (Sun, 29 Jun 2008)
New Revision: 3620

Modified:
   liboggz/trunk/doc/oggz-chop.1.sgml
   liboggz/trunk/src/tools/oggz-chop/cgi.c
   liboggz/trunk/src/tools/oggz-chop/cmd.c
   liboggz/trunk/src/tools/oggz-chop/oggz-chop.c
Log:
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.


Modified: liboggz/trunk/doc/oggz-chop.1.sgml
===================================================================
--- liboggz/trunk/doc/oggz-chop.1.sgml	2008-06-29 14:08:30 UTC (rev 3619)
+++ liboggz/trunk/doc/oggz-chop.1.sgml	2008-06-29 14:22:40 UTC (rev 3620)
@@ -77,6 +77,8 @@
 	<arg choice="opt">--end <parameter>end_time</parameter></arg>
       </group>
 
+      <group><arg choice="opt">-k</arg><arg choice="opt">--no-skeleton</arg></group>
+
       <arg choice="plain">filename</arg>
     </cmdsynopsis>
 
@@ -108,6 +110,10 @@
       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.
     </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>
@@ -138,6 +144,12 @@
 	  <listitem><para>Specify the end time of the chopped section to output.
 	    </para></listitem>
 	</varlistentry>
+
+	<varlistentry>
+	  <term>-k , --no-skeleton</term>
+	  <listitem><para>Do NOT include a Skeleton bitstream in the output.
+	    </para></listitem>
+	</varlistentry>
       </variablelist>
 	
       <title>Miscellaneous options</title>

Modified: liboggz/trunk/src/tools/oggz-chop/cgi.c
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/cgi.c	2008-06-29 14:08:30 UTC (rev 3619)
+++ liboggz/trunk/src/tools/oggz-chop/cgi.c	2008-06-29 14:22:40 UTC (rev 3620)
@@ -140,6 +140,7 @@
   memset (state, 0, sizeof(*state));
   state->infilename = path_translated;
   state->end = -1.0;
+  state->do_skeleton = 1;
 
   /*photo_init (&params->in, path_translated);*/
 

Modified: liboggz/trunk/src/tools/oggz-chop/cmd.c
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/cmd.c	2008-06-29 14:08:30 UTC (rev 3619)
+++ liboggz/trunk/src/tools/oggz-chop/cmd.c	2008-06-29 14:22:40 UTC (rev 3620)
@@ -23,6 +23,7 @@
   printf ("                         Specify start time\n");
   printf ("  -e end_time, --end 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 ("  -h, --help             Display this help and exit\n");
   printf ("  -v, --version          Output version information and exit\n");
@@ -46,15 +47,17 @@
 
   memset (state, 0, sizeof(*state));
   state->end = -1.0;
+  state->do_skeleton = 1;
 
   while (1) {
-    char * optstring = "s:e:o:hv";
+    char * optstring = "s:e:o:khv";
 
 #ifdef HAVE_GETOPT_LONG
     static struct option long_options[] = {
       {"start",   required_argument, 0, 's'},
       {"end",   required_argument, 0, 'e'},
       {"output",   required_argument, 0, 'o'},
+      {"no-skeleton",   no_argument, 0, 'k'},
       {"help",     no_argument, 0, 'h'},
       {"version",  no_argument, 0, 'v'},
       {0,0,0,0}
@@ -77,6 +80,9 @@
     case 'e': /* end */
       state->end = parse_timespec (optarg);
       break;
+    case 'k': /* no-skeleton */
+      state->do_skeleton = 0;
+      break;
     case 'h': /* help */
       show_help = 1;
       break;

Modified: liboggz/trunk/src/tools/oggz-chop/oggz-chop.c
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/oggz-chop.c	2008-06-29 14:08:30 UTC (rev 3619)
+++ liboggz/trunk/src/tools/oggz-chop/oggz-chop.c	2008-06-29 14:22:40 UTC (rev 3620)
@@ -722,7 +722,6 @@
 {
   OGGZ * oggz;
 
-  state->do_skeleton = 1;
   state_init (state);
 
   if (strcmp (state->infilename, "-") == 0) {