X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fjpeg2swf.c;h=aa01fbc69086ecd99f74fac5c42a2cd1d2945a65;hp=7ce2899a1be1231c086335ec613940fced722217;hb=6f3e9add89a0157ef6552bc154475b43b371e615;hpb=4a57b21eacb62c8e674b5aac169706e36968b7bc

diff --git a/src/jpeg2swf.c b/src/jpeg2swf.c
index 7ce2899..aa01fbc 100644
--- a/src/jpeg2swf.c
+++ b/src/jpeg2swf.c
@@ -7,10 +7,20 @@
    Copyright (c) 2001 Rainer Böhme <rfxswf@reflex-studio.de>
    Copyright (c) 2002,2003 Matthias Kramm <kramm@quiss.org>
  
-   This file is distributed under the GPL, see file COPYING for details 
-
-*/
-
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+ 
 #include <stdio.h>
 #include <math.h>
 #include <fcntl.h>
@@ -23,7 +33,7 @@
 
 struct {
     int quality;
-    int framerate;
+    float framerate;
     int max_image_width;
     int max_image_height;
     int force_width;
@@ -44,7 +54,7 @@ image_t image[MAX_INPUT_FILES];
 
 VIDEOSTREAM stream;
 
-TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
+TAG *MovieStart(SWF * swf, float framerate, int dx, int dy)
 {
     TAG *t;
     RGBA rgb;
@@ -52,7 +62,7 @@ TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
     memset(swf, 0x00, sizeof(SWF));
 
     swf->fileVersion = 4;
-    swf->frameRate = (25600 / framerate);
+    swf->frameRate = (int)(256.0 * framerate);
     swf->movieSize.xmax = dx * 20;
     swf->movieSize.ymax = dy * 20;
 
@@ -328,8 +338,8 @@ int args_callback_option(char *arg, char *val)
 
 	case 'r':
 	    if (val)
-		global.framerate = atoi(val);
-	    if ((global.framerate < 1) ||(global.framerate > 5000)) {
+		global.framerate = atof(val);
+	    if ((global.framerate < 1.0/256) || (global.framerate >= 256.0)) {
 		if (VERBOSE(1))
 		    fprintf(stderr,
 			    "Error: You must specify a valid framerate between 1 and 10000.\n");
@@ -384,14 +394,16 @@ int args_callback_option(char *arg, char *val)
     return res;
 }
 
-struct options_t options[] = { {"q", "quality"},
+static struct options_t options[] = {
 {"o", "output"},
 {"m", "mx"},
+{"q", "quality"},
 {"r", "rate"},
-{"v", "verbose"},
 {"X", "width"},
 {"Y", "height"},
+{"v", "verbose"},
 {"V", "version"},
+{0,0}
 };
 
 int args_callback_longoption(char *name, char *val)
@@ -422,29 +434,18 @@ int args_callback_command(char *arg, char *next)	// actually used as filename
 
 void args_callback_usage(char *name)
 {
-    printf
-	("Usage: %s  [-options [value]] imagefiles[.jpg]|[.jpeg] [...]\n",
-	 name);
-    printf
-	("-o outputfile       --output   explicitly specify output file. (otherwise, output.swf will be used)\n");
-    printf
-	("-m                  --mx  	 Use Flash MX H.263 compression (use for correlated images)\n");
-    printf
-	("-q quality          --quality  Set compression quality (1-100, 1=worst, 100=best)\n");
-    printf
-	("-r framerate        --rate     Set movie framerate (100/sec)\n");
-    printf
-	("-o outputfile       --output   Set name for SWF output file\n");
-    printf
-	("-X pixel            --width    Force movie width to pixel (default: autodetect)\n");
-    printf
-	("-Y pixel            --height   Force movie height to pixel (default: autodetect)\n");
-    printf
-	("-v level            --verbose  Set verbose level (0=quiet, 1=default, 2=debug)\n");
-    printf
-	("-V                  --version  Print version information and exit\n");
-    printf
-	("The following options can be set independently for each image: -q -s\n");
+    printf("\n");
+    printf("Usage: %s [-options [value]] imagefiles[.jpg]|[.jpeg] [...]\n", name);
+    printf("\n");
+    printf("-o , --output <outputfile>     Explicitly specify output file. (otherwise, output.swf will be used)\n");
+    printf("-m , --mx                      Use Flash MX H.263 compression (use for correlated images)\n");
+    printf("-q , --quality <quality>       Set compression quality (1-100, 1=worst, 100=best)\n");
+    printf("-r , --rate <framerate>         Set movie framerate (frames per second)\n");
+    printf("-X , --width <width>           Force movie width to <width> (default: autodetect)\n");
+    printf("-Y , --height <height>         Force movie height to <height> (default: autodetect)\n");
+    printf("-v , --verbose <level>         Set verbose level to <level> (0=quiet, 1=default, 2=debug)\n");
+    printf("-V , --version                 Print version information and exit\n");
+    printf("\n");
 }
 
 
@@ -456,7 +457,7 @@ int main(int argc, char **argv)
     memset(&global, 0x00, sizeof(global));
 
     global.quality = 60;
-    global.framerate = 100;
+    global.framerate = 1.0;
     global.verbose = 1;
 
     processargs(argc, argv);