int verbose;
char *outfile;
int mx;
+ int next_id;
+ char *asset_name;
int version;
+ int fit_to_movie;
+ float scale;
} global;
+static int custom_move=0;
+static int move_x=0;
+static int move_y=0;
+static int clip_x1=0,clip_y1=0,clip_x2=0,clip_y2=0;
+static int custom_clip = 0;
+
typedef struct _image {
char *filename;
int quality;
swf->fileVersion = global.version;
swf->frameRate = (int)(256.0 * framerate);
- swf->movieSize.xmax = dx * 20;
- swf->movieSize.ymax = dy * 20;
+
+ if(custom_clip) {
+ swf->movieSize.xmin = clip_x1 * 20;
+ swf->movieSize.ymin = clip_y1 * 20;
+ swf->movieSize.xmax = clip_x2 * 20;
+ swf->movieSize.ymax = clip_y2 * 20;
+ } else {
+ swf->movieSize.xmin = 0;
+ swf->movieSize.ymin = 0;
+ swf->movieSize.xmax = swf->movieSize.xmin + dx * 20;
+ swf->movieSize.ymax = swf->movieSize.ymin + dy * 20;
+ }
t = swf->firstTag = swf_InsertTag(NULL, ST_SETBACKGROUNDCOLOR);
t = swf_InsertTag(t, ST_DEFINEVIDEOSTREAM);
swf_SetU16(t, 0xf00d);
swf_SetVideoStreamDefine(t, &stream, 65535, dx, dy);
+ } else if (global.asset_name) {
+ t = swf_InsertTag(t, ST_DEFINESPRITE);
+ swf_SetU16(t, 1);
+ swf_SetU16(t, global.next_id++);
}
return t;
int MovieFinish(SWF * swf, TAG * t, char *sname)
{
int handle, so = fileno(stdout);
+
+ if (global.asset_name) {
+ SWFPLACEOBJECT obj;
+
+ t = swf_InsertTag(t, ST_END);
+ t = swf_InsertTag(t, ST_EXPORTASSETS);
+ swf_SetU16(t, 1);
+ swf_SetU16(t, 1);
+ swf_SetString(t, global.asset_name);
+
+ t = swf_InsertTag(t, ST_PLACEOBJECT2);
+ swf_GetPlaceObject(0, &obj);
+ obj.depth = 1;
+ obj.id = 1;
+ swf_SetPlaceObject(t, &obj);
+
+ t = swf_InsertTag(t, ST_SHOWFRAME);
+ }
+
t = swf_InsertTag(t, ST_END);
if ((!isatty(so)) && (!sname))
sname = "output.swf";
handle = open(sname, O_BINARY | O_RDWR | O_CREAT | O_TRUNC, 0666);
}
- 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<0 && sname) {
+ perror(sname);
}
+ if (swf_WriteSWF(handle, swf)<0)
+ fprintf(stderr, "Unable to write output file: %s\n", sname);
if (handle != so)
close(handle);
int frame = 0;
TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int quality,
- int id, int width, int height)
+ int width, int height)
{
SHAPE *s;
SRECT r;
MATRIX m;
int fs;
-
+ int movie_width = swf->movieSize.xmax - swf->movieSize.xmin;
+ int movie_height = swf->movieSize.ymax - swf->movieSize.ymin;
if(global.mx) {
int sizex, sizey;
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);
t = swf_InsertTag(t, ST_SHOWFRAME);
} else {
t = swf_InsertTag(t, ST_DEFINEBITSJPEG2);
- swf_SetU16(t, id); // id
+ swf_SetU16(t, global.next_id); // id
swf_SetJPEGBits(t,sname,quality);
t = swf_InsertTag(t, ST_DEFINESHAPE);
swf_ShapeNew(&s);
swf_GetMatrix(NULL, &m);
- m.sx = 20 * 0x10000;
- m.sy = 20 * 0x10000;
- fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 0);
- swf_SetU16(t, id + 1); // id
- r.xmin = r.ymin = 0;
- r.xmax = width * 20;
- r.ymax = height * 20;
+ if (global.fit_to_movie) {
+ m.sx = 0x10000 * movie_width / width;
+ m.sy = 0x10000 * movie_height / height;
+ width = movie_width / 20;
+ height = movie_height / 20;
+ } else {
+ m.sx = 20 * 0x10000;
+ m.sy = 20 * 0x10000;
+ }
+ m.tx = 0;
+ m.ty = 0;
+ fs = swf_ShapeAddBitmapFillStyle(s, &m, global.next_id, 1);
+ global.next_id++;
+ swf_SetU16(t, global.next_id); // id
+ r.xmin = 0;
+ r.ymin = 0;
+ r.xmax = r.xmin + width * 20;
+ r.ymax = r.ymin + height * 20;
swf_SetRect(t, &r);
swf_SetShapeHeader(t, s);
- swf_ShapeSetAll(t, s, 0, 0, 0, fs, 0);
- swf_ShapeSetLine(t, s, r.xmax, 0);
- swf_ShapeSetLine(t, s, 0, r.ymax);
- swf_ShapeSetLine(t, s, -r.xmax, 0);
- swf_ShapeSetLine(t, s, 0, -r.ymax);
+ swf_ShapeSetAll(t, s, r.xmin, r.ymin, 0, fs, 0);
+ swf_ShapeSetLine(t, s, r.xmax - r.xmin, 0);
+ swf_ShapeSetLine(t, s, 0, r.ymax - r.ymin);
+ swf_ShapeSetLine(t, s, -r.xmax + r.xmin, 0);
+ swf_ShapeSetLine(t, s, 0, -r.ymax + r.ymin);
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);
- m.tx = (swf->movieSize.xmax - (int) width * 20) / 2;
- m.ty = (swf->movieSize.ymax - (int) height * 20) / 2;
- swf_ObjectPlace(t, id + 1, 1, &m, NULL, NULL);
+ m.sx = (int)(0x10000 * global.scale);
+ m.sy = (int)(0x10000 * global.scale);
+ if(custom_move) {
+ m.tx = move_x*20;
+ m.ty = move_y*20;
+ } else {
+ m.tx = (movie_width - (width * global.scale * 20)) / 2;
+ m.ty = (movie_height - (height * global.scale * 20)) / 2;
+ }
+ swf_ObjectPlace(t, global.next_id, 1, &m, NULL, NULL);
+ global.next_id++;
t = swf_InsertTag(t, ST_SHOWFRAME);
}
frame++;
break;
case 'v':
- if (val)
- global.verbose = atoi(val);
- res = 1;
+ global.verbose++;
+ res = 0;
break;
+/* case 'q':
+ global.verbose--;
+ if(global.verbose<0)
+ global.verbose = 0;
+ res = 0;
+ break;*/
+
case 'X':
if (val)
global.force_width = atoi(val);
res = 1;
break;
- case 'm':
- global.mx = 1;
+ case 'z':
global.version = 6;
return 0;
printf("jpeg2swf - part of %s %s\n", PACKAGE, VERSION);
exit(0);
+ case 'e':
+ if (val)
+ global.asset_name = val;
+ res = 1;
+ break;
+
+ case 'T':
+ global.version = atoi(val);
+ res = 1;
+ break;
+
+ case 'f':
+ global.fit_to_movie = 1;
+ res = 0;
+ break;
+
+ case 'c': {
+ char*s = strdup(val);
+ char*x1 = strtok(s, ":");
+ char*y1 = strtok(0, ":");
+ char*x2 = strtok(0, ":");
+ char*y2 = strtok(0, ":");
+ if(!(x1 && y1 && x2 && y2)) {
+ fprintf(stderr, "-m option requires four arguments, <x1>:<y1>:<x2>:<y2>\n");
+ exit(1);
+ }
+ custom_clip = 1;
+ clip_x1 = atoi(x1);
+ clip_y1 = atoi(y1);
+ clip_x2 = atoi(x2);
+ clip_y2 = atoi(y2);
+ free(s);
+
+ res = 1;
+ break;
+ }
+
+ case 'M': {
+ global.mx = 1;
+ res = 1;
+ break;
+ }
+
+ case 'm': {
+ char*s = strdup(val);
+ char*c = strchr(s, ':');
+ if(!c) {
+ fprintf(stderr, "-m option requires two arguments, <x>:<y>\n");
+ exit(1);
+ }
+ *c = 0;
+ custom_move = 1;
+ move_x = atoi(val);
+ move_y = atoi(c+1);
+ free(s);
+
+ res = 1;
+ break;
+ }
+
+ case 's': {
+ global.scale = atof(val)/100;
+ res = 1;
+ break;
+ }
+
default:
res = -1;
break;
static struct options_t options[] = {
{"o", "output"},
-{"m", "mx"},
{"q", "quality"},
{"r", "rate"},
+{"z", "zlib"},
+{"M", "mx"},
+{"x", "xoffset"},
+{"y", "yoffset"},
{"X", "width"},
{"Y", "height"},
+{"T", "flashversion"},
{"v", "verbose"},
{"V", "version"},
+{"f", "fit-to-movie"},
+{"e", "export"},
{0,0}
};
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("-r , --rate <framerate> Set movie framerate (frames per second)\n");
+ printf("-z , --zlib <zlib> Enable Flash 6 (MX) Zlib Compression\n");
+ printf("-M , --mx Use Flash MX H.263 compression (use for correlated images)\n");
+ printf("-x , --xoffset <offset> horizontally offset images by <offset>\n");
+ printf("-y , --yoffset <offset> vertically offset images by <offset>\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("-T , --flashversion <version> Set flash file version to <version>\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("-f , --fit-to-movie Fit images to movie size\n");
+ printf("-e , --export <assetname> Make importable as asset with <assetname>\n");
printf("\n");
}
global.framerate = 1.0;
global.verbose = 1;
global.version = 4;
-
+ global.asset_name = NULL;
+ global.next_id = 1;
+ global.fit_to_movie = 0;
+ global.scale = 1.0;
+
processargs(argc, argv);
if (VERBOSE(2))
fprintf(stderr, "Processing %i file(s)...\n", global.nfiles);
t = MovieStart(&swf, global.framerate,
- global.force_width ? global.force_width : global.
- max_image_width,
- global.force_height ? global.force_height : global.
- max_image_height);
+ global.force_width ? global.force_width : (int)(global.max_image_width*global.scale),
+ global.force_height ? global.force_height : (int)(global.max_image_height*global.scale));
{
int i;
for (i = 0; i < global.nfiles; i++) {
if (VERBOSE(3))
- fprintf(stderr, "[%03i] %s (%i%%, 1/%i)\n", i,
+ fprintf(stderr, "[%03i] %s (%i%%)\n", i,
image[i].filename, image[i].quality);
t = MovieAddFrame(&swf, t, image[i].filename, image[i].quality,
- (i * 2) + 1,
image[i].width, image[i].height);
free(image[i].filename);
}
git.asbjorn.biz / swftools.git / blobdiff