[xiph-commits] r3504 - liboggz/trunk/src/tools/oggz-chop
conrad at svn.annodex.net
conrad at svn.annodex.net
Thu Feb 28 23:31:40 PST 2008
Author: conrad
Date: 2008-02-28 23:31:40 -0800 (Thu, 28 Feb 2008)
New Revision: 3504
Added:
liboggz/trunk/src/tools/oggz-chop/timespec.c
liboggz/trunk/src/tools/oggz-chop/timespec.h
Modified:
liboggz/trunk/src/tools/oggz-chop/Makefile.am
liboggz/trunk/src/tools/oggz-chop/cgi.c
Log:
add parsing of NPT and SMPTE timespecs in oggz-chop URL parameters
Modified: liboggz/trunk/src/tools/oggz-chop/Makefile.am
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/Makefile.am 2008-02-29 07:01:50 UTC (rev 3503)
+++ liboggz/trunk/src/tools/oggz-chop/Makefile.am 2008-02-29 07:31:40 UTC (rev 3504)
@@ -20,9 +20,9 @@
TESTS = httpdate_test
-noinst_HEADERS = alloc_snprintf.h cgi.h cmd.h header.h httpdate.h memory.h oggz-chop.h tests.h
+noinst_HEADERS = alloc_snprintf.h cgi.h cmd.h header.h httpdate.h memory.h oggz-chop.h tests.h timespec.h
-oggz_chop_SOURCES = oggz-chop.c ../oggz_tools.c cmd.c cgi.c header.c httpdate.c main.c
+oggz_chop_SOURCES = oggz-chop.c ../oggz_tools.c cmd.c cgi.c header.c httpdate.c main.c timespec.c
oggz_chop_LDADD = $(OGGZ_LIBS)
httpdate_test_SOURCES = httpdate.c httpdate_test.c
Modified: liboggz/trunk/src/tools/oggz-chop/cgi.c
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/cgi.c 2008-02-29 07:01:50 UTC (rev 3503)
+++ liboggz/trunk/src/tools/oggz-chop/cgi.c 2008-02-29 07:31:40 UTC (rev 3504)
@@ -7,15 +7,16 @@
#include "oggz-chop.h"
#include "header.h"
#include "httpdate.h"
+#include "timespec.h"
static void
set_param (OCState * state, char * key, char * val)
{
- if (!strncmp ("s", key, 2)) state->start = atof(val);
- if (!strncmp ("start", key, 6)) state->start = atof(val);
+ if (!strncmp ("s", key, 2)) state->start = parse_timespec (val);
+ if (!strncmp ("start", key, 6)) state->start = parse_timespec (val);
- if (!strncmp ("e", key, 2)) state->end = atof(val);
- if (!strncmp ("end", key, 6)) state->end = atof(val);
+ if (!strncmp ("e", key, 2)) state->end = parse_timespec (val);
+ if (!strncmp ("end", key, 6)) state->end = parse_timespec (val);
}
/**
Added: liboggz/trunk/src/tools/oggz-chop/timespec.c
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/timespec.c (rev 0)
+++ liboggz/trunk/src/tools/oggz-chop/timespec.c 2008-02-29 07:31:40 UTC (rev 3504)
@@ -0,0 +1,160 @@
+/*
+ Copyright (C) 2008 Annodex Association
+
+ Based on anx_time.c from libannodex, Copyright (C) 2003 Commonwealth
+ Scientific and Industrial Research Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+static double
+parse_npt (const char *str)
+{
+ int h=0,m=0, n;
+ float s;
+ double result;
+
+ n = sscanf (str, "%d:%d:%f", &h, &m, &s);
+ if (n == 3) {
+ goto done;
+ }
+
+ n = sscanf (str, "%d:%f", &m, &s);
+ if (n == 2) {
+ h = 0;
+ goto done;
+ }
+
+ n = sscanf (str, "%f", &s);
+ if (n == 1) {
+ h = 0; m = 0;
+ goto sec_only;
+ }
+
+ return -1.0;
+
+ done:
+
+ /* check valid time specs */
+ if (h < 0) return -1;
+ if (m > 59 || m < 0) return -1;
+ if (s >= 60.0 || s < 0) return -1;
+
+ sec_only:
+
+ result = ((h * 3600.0) + (m * 60.0) + s);
+
+ return result;
+}
+
+/* parse_smpte: parse a smpte-string */
+static double
+parse_smpte(const char *str, double framerate)
+{
+ int h = 0, m = 0, s = 0, n;
+ float frames;
+ double result;
+
+ n = sscanf (str, "%d:%d:%d:%f", &h, &m, &s, &frames);
+ if (n == 4) {
+ goto done;
+ }
+
+ n = sscanf (str, "%d:%d:%f", &m, &s, &frames);
+ if (n == 3) {
+ h = 0;
+ goto done;
+ }
+
+ return -1.0;
+
+ done:
+
+ /* check valid time specs */
+ if (h < 0) return -1;
+ if (m > 59 || m < 0) return -1;
+ if (s > 59 || s < 0) return -1;
+ if (frames > (float)ceil(framerate) || frames < 0) return -1;
+
+ result = ((h * 3600.0) + (m * 60.0) + s) + (frames/framerate);
+
+ return result;
+}
+
+double
+parse_timespec (const char * str)
+{
+ char timespec[16];
+
+ if (str == NULL) return -1.0;
+
+ if (sscanf (str, "npt:%16s", timespec) == 1) {
+ return parse_npt (timespec);
+ }
+
+ if (sscanf (str, "smpte-24:%16s", timespec) == 1) {
+ return parse_smpte (timespec, 24.0);
+ }
+
+ if (sscanf (str, "smpte-24-drop:%16s", timespec) == 1) {
+ return parse_smpte (timespec, 23.976);
+ }
+
+ if (sscanf (str, "smpte-25:%16s", timespec) == 1) {
+ return parse_smpte (timespec, 25.0);
+ }
+
+ if (sscanf (str, "smpte-30:%16s", timespec) == 1) {
+ return parse_smpte (timespec, 30.0);
+ }
+
+ if (sscanf (str, "smpte-30-drop:%16s", timespec) == 1) {
+ return parse_smpte (timespec, 29.97);
+ }
+
+ if (sscanf (str, "smpte-50:%16s", timespec) == 1) {
+ return parse_smpte (timespec, 50.0);
+ }
+
+ if (sscanf (str, "smpte-60:%16s", timespec) == 1) {
+ return parse_smpte (timespec, 60);
+ }
+
+ if (sscanf (str, "smpte-60-drop:%16s", timespec) == 1) {
+ return parse_smpte (timespec, 59.94);
+ }
+
+ return parse_npt(str);
+}
Added: liboggz/trunk/src/tools/oggz-chop/timespec.h
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/timespec.h (rev 0)
+++ liboggz/trunk/src/tools/oggz-chop/timespec.h 2008-02-29 07:31:40 UTC (rev 3504)
@@ -0,0 +1,6 @@
+#ifndef __TIMESPEC_H__
+#define __TIMESPEC_H__
+
+double parse_timespec (const char * str);
+
+#endif /* __TIMESPEC_H__ */
More information about the commits
mailing list