X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fwav2swf.c;h=72919e5d3e8739ddd2d2e35d2eb09ef90619a3d3;hp=821d1388643b8284ac4b66b8bce538cd28fca144;hb=f29d8006b1d8253c50808d6eb4941bdeb808c601;hpb=5f40b8fb09b53415ebeb382b52793cc46c75988c

diff --git a/src/wav2swf.c b/src/wav2swf.c
index 821d138..72919e5 100644
--- a/src/wav2swf.c
+++ b/src/wav2swf.c
@@ -24,26 +24,30 @@
 #include "../lib/rfxswf.h"
 #include "../lib/log.h"
 #include "../lib/args.h"
-#include "wav.h"
+#include "../lib/wav.h"
 
 char * filename = 0;
 char * outputname = "output.swf";
 int verbose = 2;
+int stopframe0 = 0;
+int stopframe1 = 0;
 
 #define DEFINESOUND_MP3 1 //define sound uses mp3?- undefine for raw sound.
 
-struct options_t options[] =
-{
- {"o","output"},
- {"v","verbose"},
- {"d","definesound"},
- {"l","loop"},
- {"r","framerate"},
- {"s","samplerate"},
- {"b","bitrate"},
- {"C","cgi"},
- {"V","version"},
- {0,0}
+static struct options_t options[] = {
+{"h", "help"},
+{"V", "version"},
+{"o", "output"},
+{"r", "framerate"},
+{"s", "samplerate"},
+{"d", "definesound"},
+{"l", "loop"},
+{"C", "cgi"},
+{"S", "stop"},
+{"E", "end"},
+{"b", "bitrate"},
+{"v", "verbose"},
+{0,0}
 };
 
 static int loop = 0;
@@ -79,6 +83,14 @@ int args_callback_option(char*name,char*val)
 	verbose ++;
 	return 0;
     }
+    else if(!strcmp(name, "S")) {
+	stopframe0 = 1;
+	return 0;
+    }
+    else if(!strcmp(name, "E")) {
+	stopframe1 = 1;
+	return 0;
+    }
     else if(!strcmp(name, "C")) {
 	do_cgi = 1;
 	return 0;
@@ -101,7 +113,7 @@ int args_callback_option(char*name,char*val)
 	    samplerate = 44100;
 	else {
 	    fprintf(stderr, "Invalid samplerate: %d\n", samplerate);
-	    fprintf(stderr, "Allowed values: 11025, 22050\n", samplerate);
+	    fprintf(stderr, "Allowed values: 11025, 22050, 44100\n");
 	    exit(1);
 	}
 	return 1;
@@ -140,18 +152,24 @@ int args_callback_longoption(char*name,char*val)
 {
     return args_long2shortoption(options, name, val);
 }
-void args_callback_usage(char*name)
+void args_callback_usage(char *name)
 {
+    printf("\n");
     printf("Usage: %s [-o filename] file.wav\n", name);
-    printf("\t-v , --verbose\t\t\t Be more verbose\n");
-    printf("\t-d , --definesound\t\t Generate a DefineSound tag instead of streaming sound\n");
-    printf("\t-l , --loop n\t\t\t Loop sound n times (implies -d)\n");
-    printf("\t-r , --framerate fps\t\t Set framerate to fps frames per second\n");
-    printf("\t-s , --samplerate sps\t\t Set samplerate to sps frames per second (default: 11025)\n");
-    printf("\t-b , --bitrate bps\t\t Set mp3 bitrate (default: 32)\n");
-    printf("\t-o , --output filename\t\t set output filename (default: output.swf)\n");
-    printf("\t-C , --cgi\t\t\t For use as CGI- prepend http header, write to stdout\n");
-    printf("\t-V , --version\t\t\t Print program version and exit\n");
+    printf("\n");
+    printf("-h , --help                    Print short help message and exit\n");
+    printf("-V , --version                 Print version info and exit\n");
+    printf("-o , --output <filename>       Explicitly specify output file. (Otherwise, output will go to output.swf)\n");
+    printf("-r , --framerate <fps>         Set file framerate to <fps> frames per second.\n");
+    printf("-s , --samplerate <sps>        Set samplerate to <sps> frames per second (default: 11025).\n");
+    printf("-d , --definesound             Generate a DefineSound tag instead of streaming sound.\n");
+    printf("-l , --loop n                  (Only used with -d)\n");
+    printf("-C , --cgi                     For use as CGI- prepend http header, write to stdout.\n");
+    printf("-S , --stop                    Stop the movie at frame 0\n");
+    printf("-E , --end                     Stop the movie at the end frame\n");
+    printf("-b , --bitrate <bps>           Set mp3 bitrate to <bps> (default: 32)\n");
+    printf("-v , --verbose                 Be more verbose\n");
+    printf("\n");
 }
 int args_callback_command(char*name,char*val)
 {
@@ -209,17 +227,24 @@ int main (int argc,char ** argv)
 	exit(1);
     }
 
-    if(!readWAV(filename, &wav))
+    if(!wav_read(&wav, filename))
     {
 	msg("<fatal> Error reading %s", filename);
 	exit(1);
     }
-    convertWAV2mono(&wav,&wav2, samplerate);
-    //printWAVInfo(&wav);
-    //printWAVInfo(&wav2);
+    wav_convert2mono(&wav,&wav2, samplerate);
+    //wav_print(&wav);
+    //wav_print(&wav2);
     samples = (U16*)wav2.data;
     numsamples = wav2.size/2;
 
+#ifdef WORDS_BIGENDIAN
+    /* swap bytes */
+    for(t=0;t<numsamples;t++) {
+        samples[t] = (samples[t]>>8)&0xff | (samples[t]<<8)&0xff00;
+    }
+#endif
+
     if(numsamples%blocksize != 0)
     {
 	// apply padding, so that block is a multiple of blocksize
@@ -248,6 +273,17 @@ int main (int argc,char ** argv)
     rgb.g = 0xff;
     rgb.b = 0xff;
     swf_SetRGB(tag,&rgb);
+
+    if(stopframe0) {
+	ActionTAG*action = 0;
+	tag = swf_InsertTag(tag, ST_DOACTION);
+	action = action_Stop(action);
+	action = action_End(action);
+	swf_ActionSet(tag, action);
+	swf_ActionFree(action);
+
+	tag = swf_InsertTag(tag, ST_SHOWFRAME);
+    }
 	
     swf_mp3_bitrate = bitrate;
     swf_mp3_out_samplerate = samplerate;
@@ -313,6 +349,15 @@ int main (int argc,char ** argv)
 	info.loops = loop;
 	swf_SetSoundInfo(tag, &info);
 	tag = swf_InsertTag(tag, ST_SHOWFRAME);
+        if(stopframe1) {
+	    ActionTAG*action = 0;
+	    tag = swf_InsertTag(tag, ST_DOACTION);
+	    action = action_Stop(action);
+	    action = action_End(action);
+	    swf_ActionSet(tag, action);
+	    swf_ActionFree(action);
+	    tag = swf_InsertTag(tag, ST_SHOWFRAME);
+        }
 	tag = swf_InsertTag(tag, ST_END);
     }