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

diff --git a/src/jpeg2swf.c b/src/jpeg2swf.c
index aa01fbc..098308d 100644
--- a/src/jpeg2swf.c
+++ b/src/jpeg2swf.c
@@ -42,6 +42,7 @@ struct {
     int verbose;
     char *outfile;
     int mx;
+    int version;
 } global;
 
 typedef struct _image {
@@ -61,7 +62,7 @@ TAG *MovieStart(SWF * swf, float framerate, int dx, int dy)
 
     memset(swf, 0x00, sizeof(SWF));
 
-    swf->fileVersion = 4;
+    swf->fileVersion = global.version;
     swf->frameRate = (int)(256.0 * framerate);
     swf->movieSize.xmax = dx * 20;
     swf->movieSize.ymax = dy * 20;
@@ -92,8 +93,14 @@ int MovieFinish(SWF * swf, TAG * t, char *sname)
 	    sname = "output.swf";
 	handle = open(sname, O_BINARY | O_RDWR | O_CREAT | O_TRUNC, 0666);
     }
-    if (swf_WriteSWF(handle, swf)<0) 
-	    fprintf(stderr, "Unable to write output file: %s\n", sname);
+    if(global.version >= 6) {
+	if (swf_WriteSWC(handle, swf)<0) 
+		fprintf(stderr, "Unable to write output file: %s\n", sname);
+    } else {
+	if (swf_WriteSWF(handle, swf)<0) 
+		fprintf(stderr, "Unable to write output file: %s\n", sname);
+    }
+
     if (handle != so)
 	close(handle);
 
@@ -204,7 +211,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int quality,
 	t = swf_InsertTag(t, ST_VIDEOFRAME);
 	swf_SetU16(t, 0xf00d);
 	quant = 1+(30-(30*quality)/100);
-	if(!(frame&127)) {
+	if(!(frame%20)) {
 	    swf_SetVideoStreamIFrame(t, &stream, pic2, quant);
 	} else {
 	    swf_SetVideoStreamPFrame(t, &stream, pic2, quant);
@@ -247,8 +254,10 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int quality,
 	swf_ShapeSetLine(t, s, 0, -r.ymax);
 	swf_ShapeSetEnd(t);
 
-	t = swf_InsertTag(t, ST_REMOVEOBJECT2);
-	swf_SetU16(t, 1);		// depth
+        if(frame) {
+	    t = swf_InsertTag(t, ST_REMOVEOBJECT2);
+	    swf_SetU16(t, 1);		// depth
+        }
 
 	t = swf_InsertTag(t, ST_PLACEOBJECT2);
 	swf_GetMatrix(NULL, &m);
@@ -368,6 +377,11 @@ int args_callback_option(char *arg, char *val)
 
 	case 'm':
 	    global.mx = 1;
+	    global.version = 6;
+	    return 0;
+
+	case 'z':
+	    global.version = 6;
 	    return 0;
 
 	case 'Y':
@@ -399,6 +413,7 @@ static struct options_t options[] = {
 {"m", "mx"},
 {"q", "quality"},
 {"r", "rate"},
+{"z", "zlib"},
 {"X", "width"},
 {"Y", "height"},
 {"v", "verbose"},
@@ -441,6 +456,7 @@ void args_callback_usage(char *name)
     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("-z , --zlib <zlib>             Enable Flash 6 (MX) Zlib Compression\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");
@@ -459,6 +475,7 @@ int main(int argc, char **argv)
     global.quality = 60;
     global.framerate = 1.0;
     global.verbose = 1;
+    global.version = 4;
 
     processargs(argc, argv);