X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=avi2swf%2Fv2swf.c;h=a536c088ff29ac54fb272850450664a390ad2acd;hb=6e6c53e5b76e2d8e213cf84bb3acd412767cd1e2;hp=c56ff4b6237219b12badb7b92e35453ff83c68ef;hpb=e5b314a4315a7d7e0b7bda60102c50ad277c2f68;p=swftools.git

diff --git a/avi2swf/v2swf.c b/avi2swf/v2swf.c
index c56ff4b..a536c08 100644
--- a/avi2swf/v2swf.c
+++ b/avi2swf/v2swf.c
@@ -43,6 +43,9 @@ typedef struct _v2swf_internal_t
     int width;
     int height;
 
+    int video_eof;
+    int audio_eof;
+
     unsigned char* vrbuffer;
     unsigned char* buffer;
     unsigned char* lastbitmap;
@@ -60,6 +63,7 @@ typedef struct _v2swf_internal_t
     float fpspos;
 
     int bitrate;
+    int samplerate;
 
     int finished;
     int keyframe;
@@ -118,6 +122,12 @@ static void msg(char*format, ...)
     fflush(stdout);
 }
 
+extern int swf_mp3_in_samplerate;
+extern int swf_mp3_out_samplerate;
+extern int swf_mp3_channels;
+extern int swf_mp3_bitrate;
+
+
 static void writeShape(v2swf_internal_t*i, int id, int gfxid, int width, int height)
 {
     RGBA rgb;
@@ -158,18 +168,24 @@ 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 = video->rate * speedup / 44100.0;
+    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;
+    memset(tmp, 0, sizeof(tmp));
+    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++) {
@@ -180,17 +196,14 @@ static int getSamples(videoreader_t*video, S16*data, int len, double speedup)
 	tmp[t] = a/video->channels;
     }
 
-    /* down/up-sample to 44khz */
+    /* down/up-sample to the desired input samplerate (swf_mp3_in_samplerate) */
     for(t=0;t<len;t++) {
 	data[t] = tmp[(int)pos];
 	pos+=ratio;
     }
-    return 1;
+    return l == r;
 }
 
-extern int swf_mp3_channels;
-extern int swf_mp3_bitrate;
-extern int swf_mp3_samplerate;
 static void writeAudioForOneFrame(v2swf_internal_t* i)
 {
     int blocksize; 
@@ -205,11 +218,13 @@ 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 = 576; /* 11khz samples per mp3 block */
-    blockspersecond = 11025.0/blocksize;
+    blocksize = (i->samplerate > 22050) ? 1152 : 576;
+    blockspersecond = ((double)i->samplerate)/blocksize;
 
     /* notice: for framerates greater than about 35, audio starts getting choppy. */
     framespersecond = i->framerate;
@@ -221,6 +236,12 @@ static void writeAudioForOneFrame(v2swf_internal_t* i)
     msg("samplesperblock: %f", samplesperblock);
 
     if(!i->soundstreamhead) {
+	swf_mp3_out_samplerate = i->samplerate;
+	/* 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->samplerate;
+
 	/* first run - initialize */
 	swf_mp3_channels = 1;//i->video->channels;
 	swf_mp3_bitrate = i->bitrate;
@@ -257,9 +278,10 @@ static void writeAudioForOneFrame(v2swf_internal_t* i)
 
     /* write num frames, max 1 block */
     for(pos=0;pos<num;pos++) {
-	if(!getSamples(i->video, block1, 576*4, speedup)) { /* 4 = 44100/11025 */
-	    i->video->rate = i->video->channels = 0; //end of soundtrack
-	    return;
+        if(!getSamples(i->video, block1, blocksize * (double)swf_mp3_in_samplerate/swf_mp3_out_samplerate, speedup)) {
+	    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);
@@ -560,6 +582,20 @@ 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 encodeoneframe(v2swf_internal_t*i)
 {
     videoreader_t*video = i->video;
@@ -567,25 +603,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(!videoreader_getimage(i->video, i->vrbuffer)) 
+    {
+	i->video_eof = 1;
+	msg("videoreader returned eof\n");
+	if(i->audio_eof) {
+	    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);
@@ -781,13 +830,14 @@ int v2swf_init(v2swf_t*v2swf, videoreader_t * video)
     i->keyframe_interval = 8;
     i->quality = 20;
     i->scale = 65536;
+    i->samplerate = 11025;
     i->prescale = 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;
@@ -875,6 +925,8 @@ void v2swf_setparameter(v2swf_t*v2swf, char*name, char*value)
 	i->blockdiff = atoi(value);
     } else if(!strcmp(name, "fixheader")) {
 	i->fixheader = atoi(value);
+    } else if(!strcmp(name, "samplerate")) {
+	i->samplerate = atoi(value);
     } else if(!strcmp(name, "framerate")) {
 	i->framerate = atof(value);
 	i->fpsratio = i->framerate / i->video->fps;
@@ -959,29 +1011,6 @@ void v2swf_backpatch(v2swf_t*v2swf, char*filename)
     }
 }
 
-float v2swf_getprogress(v2swf_t*v2swf)
-{
-    float* p;
-    v2swf_internal_t* i;
-    msg("v2swf_getprogress()");
-    if(!v2swf || !v2swf->internal) {
-	return 0.0;
-    }
-    i = (v2swf_internal_t*)v2swf->internal;
-
-    p = (float*)videoreader_getinfo(i->video, "position");
-
-    if(p) {
-	return *p;
-    } else {
-	float f = i->frames/1500.0; /*fake*/
-	if(f>1.0)
-	    return 1.0;
-	else
-	    return f;
-    }
-}
-
 void v2swf_setvideoparameter(videoreader_t*v, char*name, char*value)
 {
     msg("v2swf_setvideoparameter()");