X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fwav2swf.c;h=6bc59cd08b227502ceaa6e5d77b071af311542f3;hb=2689b541f1a0f9a767ac8fe55909183d2c9a7347;hp=42844b1756bf5b50cb02106ebb37179391504055;hpb=aee9de2c6eb23628e54b6896f5b441d9b39317c1;p=swftools.git

diff --git a/src/wav2swf.c b/src/wav2swf.c
index 42844b1..6bc59cd 100644
--- a/src/wav2swf.c
+++ b/src/wav2swf.c
@@ -29,6 +29,7 @@
 char * filename = 0;
 char * outputname = "output.swf";
 int verbose = 2;
+int stopframe0 = 0;
 
 #define DEFINESOUND_MP3 1 //define sound uses mp3?- undefine for raw sound.
 
@@ -43,6 +44,7 @@ struct options_t options[] =
  {"b","bitrate"},
  {"C","cgi"},
  {"V","version"},
+ {"S","stop"},
  {0,0}
 };
 
@@ -79,6 +81,10 @@ int args_callback_option(char*name,char*val)
 	verbose ++;
 	return 0;
     }
+    else if(!strcmp(name, "S")) {
+	stopframe0 = 1;
+	return 0;
+    }
     else if(!strcmp(name, "C")) {
 	do_cgi = 1;
 	return 0;
@@ -101,7 +107,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", samplerate);
 	    exit(1);
 	}
 	return 1;
@@ -151,6 +157,8 @@ void args_callback_usage(char*name)
     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-S , --stop\t\t\t Stop the movie at frame 0\n");
+    printf("\t           \t\t\t (For use with flashsound.js)\n");
     printf("\t-V , --version\t\t\t Print program version and exit\n");
 }
 int args_callback_command(char*name,char*val)
@@ -190,7 +198,8 @@ int main (int argc,char ** argv)
 
     processargs(argc, argv);
 
-    blocksize = 576;
+    blocksize = (samplerate > 22050) ? 1152 : 576;
+
     blockspersecond = (float)samplerate/blocksize;
 
     framespersecond = blockspersecond;
@@ -219,6 +228,20 @@ int main (int argc,char ** argv)
     samples = (U16*)wav2.data;
     numsamples = wav2.size/2;
 
+    if(numsamples%blocksize != 0)
+    {
+	// apply padding, so that block is a multiple of blocksize
+	int numblocks = (numsamples+blocksize-1)/blocksize;
+	int numsamples2;
+	U16* samples2;
+	numsamples2 = numblocks * blocksize;
+	samples2 = malloc(sizeof(U16)*numsamples2);
+	memcpy(samples2, samples, numsamples*sizeof(U16));
+	memset(&samples2[numsamples], 0, sizeof(U16)*(numsamples2 - numsamples));
+	numsamples = numsamples2;
+	samples = samples2;
+    }
+
     memset(&swf,0x00,sizeof(SWF));
 
     swf.fileVersion    = 5;
@@ -233,6 +256,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;
@@ -288,7 +322,7 @@ int main (int argc,char ** argv)
 #else
         swf_SetU8(tag,(/*compression*/0<<4)|(/*rate*/3<<2)|(/*size*/1<<1)|/*mono*/0);
         swf_SetU32(tag, numsamples); // 44100 -> 11025
-        swf_SetBlock(tag, wav2.data, numsamples*2);
+        swf_SetBlock(tag, samples, numsamples*2);
 #endif