#define VERBOSE(x) (global.verbose>=x)
struct {
- int framerate;
+ float framerate;
int max_image_width;
int max_image_height;
int force_width;
char *filename;
} image[MAX_INPUT_FILES];
-TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
+TAG *MovieStart(SWF * swf, float framerate, int dx, int dy)
{
TAG *t;
RGBA rgb;
memset(swf, 0x00, sizeof(SWF));
swf->fileVersion = 5;
- swf->frameRate = (25600 / framerate);
+ swf->frameRate = (int)(256.0 * framerate);
swf->movieSize.xmax = dx * 20;
swf->movieSize.ymax = dy * 20;
if(b!=0 && b!=2 && b!=3 && b!=6) {
fprintf(stderr, "Image mode %d not supported!\n", b);
+ if(b == 4) {
+ fprintf(stderr, "(This is a grayscale image with alpha channel-\n");
+ fprintf(stderr, " try converting it into an RGB image with alpha channel)\n");
+ }
exit(1);
}
if(a!=8 && (b==2 || b==6)) {
}
if(header.mode==6)
applyfilter4(mode, src, old, dest, header.width);
- else
+ else if(header.mode==2)
applyfilter3(mode, src, old, dest, header.width);
}
swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
}
free(data2);
- }
- else if(header.mode == 0 || header.mode == 3) {
+ } else if(header.mode == 0 || header.mode == 3) {
RGBA*rgba;
int swf_width = BYTES_PER_SCANLINE(header.width);
U8*data2 = malloc(swf_width*header.height);
switch (arg[0]) {
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");
+ "Error: You must specify a valid framerate between 1/256 and 255.\n");
exit(1);
}
res = 1;
struct options_t options[] =
{
+{"h", "help"},
{"o", "output"},
{"r", "rate"},
{"v", "verbose"},
{"X", "width"},
{"Y", "height"},
{"V", "version"},
+{0,0}
};
int args_callback_longoption(char *name, char *val)
void args_callback_usage(char *name)
{
printf("Usage: %s [-options [value]] imagefiles[.png] [...]\n", name);
- printf("-r framerate (rate) Set movie framerate (100/sec)\n");
+ printf("-r framerate (rate) Set movie framerate (frames per second)\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");
memset(&global, 0x00, sizeof(global));
- global.framerate = 100;
+ global.framerate = 1.0;
global.verbose = 1;
processargs(argc, argv);