X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=avi2swf%2Fv2swf.c;h=c974bfbacdb286e546c9c46f56aedd872641201b;hp=e6fdb2f495879d8ed468bd3fe5c6dbea9b640b24;hb=f29d8006b1d8253c50808d6eb4941bdeb808c601;hpb=2cfb71602733241db4b17cb6ed59ce4884e7d94a

diff --git a/avi2swf/v2swf.c b/avi2swf/v2swf.c
index e6fdb2f..c974bfb 100644
--- a/avi2swf/v2swf.c
+++ b/avi2swf/v2swf.c
@@ -34,15 +34,19 @@ typedef struct _v2swf_internal_t
     
     int myframes;
 
-    struct writer_t out;
-    struct writer_t out2;
+    writer_t out;
+    writer_t out2;
 
     ringbuffer_t r;
     videoreader_t* video;
+    double video_fps;
 
     int width;
     int height;
 
+    int video_eof;
+    int audio_eof;
+
     unsigned char* vrbuffer;
     unsigned char* buffer;
     unsigned char* lastbitmap;
@@ -66,6 +70,8 @@ typedef struct _v2swf_internal_t
     int keyframe;
     int showframe;
 
+    int skipframes;
+
     float samplepos;
     float framesamplepos;
     int samplewritepos;
@@ -73,11 +79,15 @@ typedef struct _v2swf_internal_t
     int soundstreamhead;
     int seek;
 
+    int numframes;
+
     double audio_fix;
     int fixheader;
     int prescale;
 
     int scale;
+
+    int add_cut;
     
     int domotion;
 
@@ -100,7 +110,7 @@ static void msg(char*format, ...)
     if(!verbose)
 	return;
     va_start(arglist, format);
-    vsprintf(buf, format, arglist);
+    vsnprintf(buf, sizeof(buf)-1, format, arglist);
     va_end(arglist);
     l = strlen(buf);
     while(l && buf[l-1]=='\n') {
@@ -165,18 +175,25 @@ static void writeShape(v2swf_internal_t*i, int id, int gfxid, int width, int hei
     swf_ShapeFree(shape);
 }
 
+/* returns 0 on partial read */
 static int getSamples(videoreader_t*video, S16*data, int len, double speedup)
 {
     double pos = 0;
-    double ratio = (double) video->rate * speedup / swf_mp3_in_samplerate;
+    double ratio = (double) video->samplerate * speedup / swf_mp3_in_samplerate;
     int rlen = (int)(len * ratio);
     int t;
     S16 tmp[576*32];
     int r = /*resampled len */ rlen * 
 	          /* s16_le */ 2 * 
 		               video->channels;
-    if(videoreader_getsamples(video, tmp, r) < r)
+    int l = 0;
+    memset(tmp, 0, sizeof(tmp));
+    if(r>0)
+	l = videoreader_getsamples(video, tmp, r);
+    if(l <= 0) {
 	return 0;
+    }
+    msg("%d samples read", l);
 
     /* convert to 1 channel */
     for(t=0;t<rlen;t++) {
@@ -192,7 +209,7 @@ static int getSamples(videoreader_t*video, S16*data, int len, double speedup)
 	data[t] = tmp[(int)pos];
 	pos+=ratio;
     }
-    return 1;
+    return l == r;
 }
 
 static void writeAudioForOneFrame(v2swf_internal_t* i)
@@ -209,8 +226,10 @@ static void writeAudioForOneFrame(v2swf_internal_t* i)
 
     msg("writeAudioForOneFrame()");
 
-    if(i->video->channels<=0 || i->video->rate<=0)
+    if(i->audio_eof || i->video->channels<=0 || i->video->samplerate<=0) {
+	i->audio_eof = 1;
 	return; /* no sound in video */
+    }
 
     blocksize = (i->samplerate > 22050) ? 1152 : 576;
     blockspersecond = ((double)i->samplerate)/blocksize;
@@ -229,7 +248,7 @@ static void writeAudioForOneFrame(v2swf_internal_t* i)
 	/* The pre-processing of sound samples in getSamples(..) above
 	   re-samples the sound to swf_mp3_in_samplerate. It is best to
 	   simply make it the original samplerate:  */
-	swf_mp3_in_samplerate = i->video->rate;
+	swf_mp3_in_samplerate = i->video->samplerate;
 
 	/* first run - initialize */
 	swf_mp3_channels = 1;//i->video->channels;
@@ -268,8 +287,9 @@ static void writeAudioForOneFrame(v2swf_internal_t* i)
     /* write num frames, max 1 block */
     for(pos=0;pos<num;pos++) {
         if(!getSamples(i->video, block1, blocksize * (double)swf_mp3_in_samplerate/swf_mp3_out_samplerate, speedup)) {
-	    i->video->rate = i->video->channels = 0; //end of soundtrack
-	    return;
+	    i->audio_eof = 1; i->video->samplerate = i->video->channels = 0; //end of soundtrack
+	    /* fall through, this probably was a partial read. (We did, after all,
+	       come to this point, so i->audio_eof must have been false so far) */
 	}
 	if(!pos) {
 	    swf_ResetTag(i->tag, ST_SOUNDSTREAMBLOCK);
@@ -317,14 +337,14 @@ static void writeShowTags(v2swf_internal_t* i, int shapeid, int bmid, int width,
     i->showframe = 1;
 }
 
-static int wwrite(struct writer_t*w, void*data, int len)
+static int wwrite(writer_t*w, void*data, int len)
 {
     v2swf_internal_t* i = (v2swf_internal_t*)w->internal;
     ringbuffer_put(&i->r, data, len);
     return len;
 }
 
-static void wfinish(struct writer_t*w)
+static void wfinish(writer_t*w)
 {
     v2swf_internal_t* i = (v2swf_internal_t*)w->internal;
 }
@@ -401,8 +421,22 @@ static void finish(v2swf_internal_t*i)
     if(!i->finished) {
 	msg("write endtag\n", i->finished);
 
+	if(i->add_cut) {
+	    swf_ResetTag(i->tag, ST_SHOWFRAME);
+	    i->filesize += swf_WriteTag2(&i->out, i->tag);
+
+	    swf_ResetTag(i->tag, ST_REMOVEOBJECT2);
+	    swf_SetU16(i->tag, 1); //depth
+	    i->filesize += swf_WriteTag2(&i->out, i->tag);
+
+	    swf_ResetTag(i->tag, ST_DOACTION);
+	    swf_SetU16(i->tag, 0x0007);
+	    i->filesize += swf_WriteTag2(&i->out, i->tag);
+	}
+
 	swf_ResetTag(i->tag, ST_END);
 	i->filesize += swf_WriteTag2(&i->out, i->tag);
+
 	i->out.finish(&i->out);
 
 	if(i->version>=6) {
@@ -559,6 +593,11 @@ static void scaleimage(v2swf_internal_t*i)
     int xv,yv;
     int xm = (i->video->width*65536)/i->width;
     int ym = (i->video->height*65536)/i->height;
+    msg("scaling from %dx%d to %dx%d\n", 
+	    i->video->width, i->video->height,
+	    i->width, i->height
+	    );
+
     memset(i->buffer, 255, i->width*i->height*4);
     for(y=0,yv=0;y<i->height;y++,yv+=ym) {
 	int*src = &((int*)i->vrbuffer)[(yv>>16)*i->video->width];
@@ -570,6 +609,35 @@ static void scaleimage(v2swf_internal_t*i)
     //memcpy(i->buffer, i->vrbuffer, i->width*i->height*4);
 }
 
+static int writeAudioOnly(v2swf_internal_t*i)
+{
+    if(i->showframe) {
+	i->fpspos += i->fpsratio;
+	/* skip frames */
+	if(i->fpspos<1.0) {
+	    return 0;
+	}
+	writeShowFrame(i);
+    }
+    i->showframe = 1;
+    return 1;
+}
+
+static int getframe(v2swf_internal_t*i)
+{
+    if(!i->skipframes)
+        return videoreader_getimage(i->video, i->vrbuffer);
+    else {
+        int t;
+        for(t=0;t<i->skipframes;t++) {
+            int ret = videoreader_getimage(i->video, i->vrbuffer);
+            if(!ret)
+                return 0;
+        }
+        return 1;
+    }
+}
+
 static int encodeoneframe(v2swf_internal_t*i)
 {
     videoreader_t*video = i->video;
@@ -577,27 +645,38 @@ static int encodeoneframe(v2swf_internal_t*i)
 
     checkInit(i);
 
-    if(videoreader_eof(i->video) || !videoreader_getimage(i->video, i->vrbuffer)) 
-    {
-	msg("videoreader returned eof\n");
-	finish(i);
+    if(i->video_eof && i->audio_eof) {
+	if(!i->finished)
+	    finish(i);
 	return 0;
     }
 
-    i->fpspos += i->fpsratio;
+    if(!i->audio_eof && i->video_eof) {
+	return writeAudioOnly(i);
+    }
 
-    /* skip frames */
-    if(i->fpspos<1.0) {
-	return 0;
+    if(!getframe(i) || (i->numframes && i->frames==i->numframes)) 
+    {
+	i->video_eof = 1;
+	msg("videoreader returned eof\n");
+	if(i->audio_eof || (i->numframes && i->frames==i->numframes)) {
+	    finish(i);
+	    return 0;
+	} else {
+	    return writeAudioOnly(i);
+	}
     }
-    
-    msg("encoding image for frame %d\n", i->frames);
 
-    if(i->showframe)
+    msg("encoding image for frame %d\n", i->frames);
+    if(i->showframe) {
+	i->fpspos += i->fpsratio;
+	/* skip frames */
+	if(i->fpspos<1.0) {
+	    return 0;
+	}
 	writeShowFrame(i);
-
-    msg("scaling\n");
-
+    }
+    
     scaleimage(i);
 
     msg("version is %d\n", i->version);
@@ -771,6 +850,15 @@ static int encodeoneframe(v2swf_internal_t*i)
     return 1;
 }
 
+static void init_fps(v2swf_internal_t*i)
+{
+    int oldframerate = i->framerate;
+    i->framerate = i->video->fps / i->skipframes;
+    i->video_fps = ((int)(i->framerate*256))/256.0;
+    if(oldframerate)
+        msg("setting new framerate to %f\n", i->framerate);
+}
+
 int v2swf_init(v2swf_t*v2swf, videoreader_t * video)
 {
     int ret = 0;
@@ -784,21 +872,27 @@ int v2swf_init(v2swf_t*v2swf, videoreader_t * video)
 
     ringbuffer_init(&i->r);
 
+    i->skipframes = 1;
+    i->framerate = 0;
+    i->video = video;
+    init_fps(i);
+
     msg("video: %dx%d, fps %f\n", video->width, video->height, video->fps);
 
-    i->video = video;
     i->blockdiff = 64;
     i->keyframe_interval = 8;
     i->quality = 20;
     i->scale = 65536;
+    i->add_cut = 1;
     i->samplerate = 11025;
     i->prescale = 0;
+    i->numframes= 0;
+    i->skipframes = 0;
     i->head_done = 0;
     i->diffmode = DIFFMODE_QMEAN;
     i->audio_fix = 1.0;
     i->fixheader = 0;
-    i->framerate = video->fps;
-    i->fpsratio = 1.00000000;
+    i->fpsratio = 1.00000000000;
     i->fpspos = 0.0;
     i->bitrate = 32;
     i->version = 6;
@@ -811,8 +905,8 @@ int v2swf_init(v2swf_t*v2swf, videoreader_t * video)
     i->keyframe = 1;
     i->showframe = 0;
 
-    memset(&i->out, 0, sizeof(struct writer_t));
-    memset(&i->out2, 0, sizeof(struct writer_t));
+    memset(&i->out, 0, sizeof(writer_t));
+    memset(&i->out2, 0, sizeof(writer_t));
 
     return 0;
 }
@@ -872,12 +966,19 @@ void v2swf_setparameter(v2swf_t*v2swf, char*name, char*value)
 	i->version = atoi(value);
     } else if(!strcmp(name, "audiosync")) {
 	i->audio_fix = (int)(atof(value));
+    } else if(!strcmp(name, "addcut")) {
+	i->add_cut = atoi(value);
     } else if(!strcmp(name, "scale")) {
 	i->scale = (int)(atof(value)*65536);
     } else if(!strcmp(name, "scale65536")) {
 	i->scale = atoi(value);
     } else if(!strcmp(name, "quality")) {
 	i->quality = atoi(value);
+    } else if(!strcmp(name, "skipframes")) {
+	i->skipframes = atoi(value);
+        init_fps(i);
+    } else if(!strcmp(name, "numframes")) {
+	i->numframes = atoi(value);
     } else if(!strcmp(name, "motioncompensation")) {
 	i->domotion = atoi(value);
     } else if(!strcmp(name, "prescale")) {
@@ -890,7 +991,7 @@ void v2swf_setparameter(v2swf_t*v2swf, char*name, char*value)
 	i->samplerate = atoi(value);
     } else if(!strcmp(name, "framerate")) {
 	i->framerate = atof(value);
-	i->fpsratio = i->framerate / i->video->fps;
+	i->fpsratio = i->framerate / i->video_fps;
     }
     else if(!strcmp(name, "mp3_bitrate")) {
 	int t=0,o;
@@ -963,7 +1064,7 @@ void v2swf_backpatch(v2swf_t*v2swf, char*filename)
 		close(fi);
 		fi = open(filename, O_WRONLY|O_BINARY|O_TRUNC|O_CREAT, 0666);
 		if(fi>=0) {
-		    swf_WriteSWC(fi, &tmp);
+		    swf_WriteSWF(fi, &tmp);
 		    close(fi);
 		    msg("v2swf_backpatch %s - fix header: success\n", filename);
 		}