subtract (0.5,0.5) from the texture position to get rid of the

[swftools.git] / src / jpeg2swf.c

diff --git a/src/jpeg2swf.c b/src/jpeg2swf.c
index f20b53f..7c23147 100644 (file)
--- a/src/jpeg2swf.c
+++ b/src/jpeg2swf.c
@@ -211,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);
@@ -240,6 +240,8 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int quality,
        swf_GetMatrix(NULL, &m);
        m.sx = 20 * 0x10000;
        m.sy = 20 * 0x10000;
+       m.tx = -10;
+       m.ty = -10;
        fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 0);
        swf_SetU16(t, id + 1);  // id
        r.xmin = r.ymin = 0;
@@ -254,8 +256,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);
@@ -378,6 +382,10 @@ int args_callback_option(char *arg, char *val)
            global.version = 6;
            return 0;
 
+       case 'z':
+           global.version = 6;
+           return 0;
+
        case 'Y':
            if (val)
                global.force_height = atoi(val);
@@ -407,6 +415,7 @@ static struct options_t options[] = {
 {"m", "mx"},
 {"q", "quality"},
 {"r", "rate"},
+{"z", "zlib"},
 {"X", "width"},
 {"Y", "height"},
 {"v", "verbose"},
@@ -449,6 +458,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");