new parameter addspacechars

[swftools.git] / avi2swf / avi2swf.cc

diff --git a/avi2swf/avi2swf.cc b/avi2swf/avi2swf.cc
index c530cbb..c68fedb 100644 (file)
--- a/avi2swf/avi2swf.cc
+++ b/avi2swf/avi2swf.cc
@@ -26,19 +26,13 @@
 
 #include "../config.h"
 
-#ifdef HAVE_SIGNAL_H
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#include <signal.h>
-#define DO_SIGNALS
-#endif
-#endif
-
-extern "C" {
 #include "../lib/args.h"
-}
 #include "v2swf.h"
+#ifdef WIN32
+#include "videoreader_vfw.hh"
+#else
 #include "videoreader_avifile.hh"
+#endif
 
 static char * filename = 0;
 static char * outputfilename = "output.swf";
@@ -54,6 +48,8 @@ static int skip = 0;
 static float audio_adjust = 0;
 static int mp3_bitrate = 32;
 static int samplerate = 11025;
+static int numframes = 0;
+static char* skipframes = 0;
 
 static struct options_t options[] = {
 {"h", "help"},
@@ -62,9 +58,11 @@ static struct options_t options[] = {
 {"n", "num"},
 {"m", "mp3-bitrate"},
 {"r", "mp3-samplerate"},
-{"d", "scale"},
+{"s", "scale"},
+{"S", "skipframes"},
 {"p", "flip"},
 {"q", "quality"},
+{"k", "keyframe"},
 {"x", "extragood"},
 {"T", "flashversion"},
 {"V", "version"},
@@ -81,6 +79,14 @@ int args_callback_option(char*name,char*val)
        outputfilename = val;
        return 1;
     }
+    else if(!strcmp(name, "n")) {
+       numframes = atoi(val);
+       return 1;
+    }
+    else if(!strcmp(name, "d")) {
+       scale = atof(val);
+       return 1;
+    }
     else if(!strcmp(name, "q")) {
        quality = atoi(val);
        if(quality<0)
@@ -93,6 +99,10 @@ int args_callback_option(char*name,char*val)
        flip = 1;
        return 0;
     }
+    else if(!strcmp(name, "k")) {
+       keyframe_interval = atoi(val);
+       return 1;
+    }
     else if(!strcmp(name, "A")) {
        audio_adjust = atof(val);
        return 1;
@@ -111,7 +121,7 @@ int args_callback_option(char*name,char*val)
     }
     else if(!strcmp(name, "m")) {
        mp3_bitrate = atoi(val);
-       return 0;
+       return 1;
     }
     else if(!strcmp(name, "r")) {
         samplerate = atoi(val);
@@ -132,6 +142,10 @@ int args_callback_option(char*name,char*val)
        skip = atoi(val);
        return 1;
     }
+    else if(!strcmp(name, "C")) {
+       skipframes = strdup(val);
+       return 1;
+    }
     else if(!strcmp(name, "s")) {
        scale = atoi(val)/100.0;
        if(scale>1.0 || scale<=0) {
@@ -156,11 +170,13 @@ void args_callback_usage(char *name)
     printf("-o , --output filename         Specify output filename\n");
     printf("-A , --adjust seconds          Audio adjust: Shift sound -seconds to the future or +seconds into the past.\n");
     printf("-n , --num frames              Number of frames to encode\n");
-    printf("-m , --mp3-bitrate <rate> (kbps)    Set the mp3 bitrate to encode audio with\n");
-    printf("-r , --mp3-samplerate <rate> (Hz)    Set the mp3 samplerate to encode audio with (default: 11025)\n");
-    printf("-d , --scale <val>             Scale down to factor <val>. (in %, e.g. 100 = original size)\n");
+    printf("-m , --mp3-bitrate <kbps>      Set the mp3 bitrate to encode audio with\n");
+    printf("-r , --mp3-samplerate <hz>     Set the mp3 samplerate to encode audio with (default: 11025)\n");
+    printf("-s , --scale <val>             Scale down to factor <val>. (in %, e.g. 100 = original size)\n");
+    printf("-S , --skipframes <num>        Skip <num> frames before starting the conversion.\n");
     printf("-p , --flip                    Turn movie upside down\n");
     printf("-q , --quality <val>           Set the quality to <val>. (0-100, 0=worst, 100=best, default:80)\n");
+    printf("-k , --keyframe                Set the number of intermediate frames between keyframes.\n");
     printf("-x , --extragood               Enable some *very* expensive compression strategies.\n");
     printf("-T , --flashversion <n>        Set output flash version to <n>.\n");
     printf("-V , --version                 Print program version and exit\n");
@@ -188,9 +204,6 @@ static char*itoa(int a)
     return toabuf;
 }
 
-static int shutdown_avi2swf = 0;
-static int frameno = 0;
-
 #ifdef DO_SIGNALS
 pthread_t main_thread;
 static void sigterm(int sig)
@@ -223,11 +236,13 @@ int main (int argc,char ** argv)
 #endif
 
     processargs(argc, argv);
-    if(!filename)
+    if(!filename) {
+       fprintf(stderr, "You must supply a filename");
        exit(0);
+    }
     if(keyframe_interval<0) {
        if(flashversion>=6)
-           keyframe_interval=200;
+           keyframe_interval=20;
        else
            keyframe_interval=5;
     }
@@ -238,24 +253,30 @@ int main (int argc,char ** argv)
        fprintf(stderr, "Couldn't open %s\n", outputfilename);
        exit(1);
     }
-
+    
+#ifdef WIN32
+    ret = videoreader_vfw_open(&video, filename);
+#else
     ret = videoreader_avifile_open(&video, filename);
+#endif
 
-    if(!ret) {
-       printf("Error opening %s\n", filename);
+    if(ret<0) {
+       fprintf(stderr, "Error opening %s\n", filename);
        exit(1);
     }
 
     if(verbose) {
        printf("| video framerate: %f\n", video.fps);
        printf("| video size: %dx%d\n", video.width, video.height);
-       printf("| audio rate: %d\n", video.rate);
+       printf("| audio rate: %d\n", video.samplerate);
        printf("| audio channels: %d\n", video.channels);
     }
 
     ret = v2swf_init(&v2swf, &video);
     if(verbose)
        v2swf_setparameter(&v2swf, "verbose", "1");
+    if(numframes)
+       v2swf_setparameter(&v2swf, "numframes", itoa(numframes));
     v2swf_setparameter(&v2swf, "quality", itoa(quality));
     v2swf_setparameter(&v2swf, "blockdiff", "0");
     v2swf_setparameter(&v2swf, "blockdiff_mode", "exact");
@@ -267,14 +288,20 @@ int main (int argc,char ** argv)
     v2swf_setparameter(&v2swf, "prescale", "1");
     v2swf_setparameter(&v2swf, "flash_version", itoa(flashversion));
     v2swf_setparameter(&v2swf, "keyframe_interval", itoa(keyframe_interval));
+    if(skipframes)
+       v2swf_setparameter(&v2swf, "skipframes", skipframes);
     if(expensive)
        v2swf_setparameter(&v2swf, "motioncompensation", "1");
+    if(flip)
+       video.setparameter(&video, "flip", "1");
+    if(verbose)
+       video.setparameter(&video, "verbose", "1");
 
     if(!verbose)
        printf("\n");
 
     if(audio_adjust>0) {
-       int num = ((int)(audio_adjust*video.rate))*video.channels*2;
+       int num = ((int)(audio_adjust*video.samplerate))*video.channels*2;
        void*buf = malloc(num);
        video.getsamples(&video, buf, num);
        free(buf);
@@ -293,9 +320,9 @@ int main (int argc,char ** argv)
        void*buf = malloc(video.width*video.height*4);
        for(t=0;t<skip;t++) {
            video.getimage(&video, buf);
-           video.getsamples(&video, buf, (int)((video.rate/video.fps)*video.channels*2));
+           video.getsamples(&video, buf, (int)((video.samplerate/video.fps)*video.channels*2));
            if(!verbose) {
-               printf("\rSkipping frame %d", frameno);fflush(stdout);
+               printf("\rSkipping frame %d", video.frame);fflush(stdout);
            }
        }
        free(buf);
@@ -308,7 +335,7 @@ int main (int argc,char ** argv)
        if(!l)
            break;
        if(!verbose) {
-           printf("\rConverting frame %d", frameno);fflush(stdout);
+           printf("\rConverting frame %d", video.frame);fflush(stdout);
        }
     }
     if(!verbose)