X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=avi2swf%2Fvideoreader_vfw.cc;h=ca8a6b72f6af37cae017096f6e6e52a8a9180106;hp=207b0b7b37c8d60d0b28f6d2fa6c4b71d1854ef3;hb=2c719855eac434f01d47ba0717d76de65939d74e;hpb=55976a64f7acb2654712bbe27aa366ee3d053e5a

diff --git a/avi2swf/videoreader_vfw.cc b/avi2swf/videoreader_vfw.cc
index 207b0b7..ca8a6b7 100644
--- a/avi2swf/videoreader_vfw.cc
+++ b/avi2swf/videoreader_vfw.cc
@@ -37,6 +37,9 @@ typedef struct _videoreader_vfw_internal {
     BITMAPINFOHEADER bitmap;
     WAVEFORMATEX waveformat;
 
+    int audio_eof;
+    int video_eof;
+
     int video_pos;
     int video_end;
 
@@ -57,12 +60,6 @@ static int verbose;
 
 #define _TRACE_ {printf("vfw: %s: %d (%s)\n",__FILE__,__LINE__,__func__);fflush(stdout);}
 
-static bool videoreader_vfw_eof(videoreader_t* vr)
-{
-    videoreader_vfw_internal_t* i = (videoreader_vfw_internal_t*)vr->internal;
-    return (i->video_pos >= i->video_end);
-}
-
 static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width, const int dest_height, int flip)
 {
     UCHAR*data = (UCHAR*)(bi+1); // actual bitmap data starts after the header
@@ -76,8 +73,8 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
     
     ULONG*dest = (ULONG*)buffer;
 
-    int width = bi->biWidth;
-    int height = bi->biHeight;
+    int width = abs(bi->biWidth);
+    int height = abs(bi->biHeight);
     if(dest_width != width || dest_height != height) {
 	/* TODO: size conversion */
 	fprintf(stderr, "size mismatch: %dx%d != %dx%d\n", width, height, dest_width, dest_height);
@@ -141,7 +138,7 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
 	    int x;
 	    for(x=0;x<dest_width;x++) {
 		USHORT c = line[0]|line[1]<<8;
-		*dest++ = 255|(c&0x1f)<<(8+3)|(c>>5&0x1f)<<(16+3)|(c>>10&0x1f)<<(24+3);
+		*dest++ = 255|(c&0x1f)<<(24+3)|(c>>5&0x1f)<<(16+3)|(c>>10&0x1f)<<(8+3);
 		line+=2;
 	    }
 	}
@@ -178,7 +175,10 @@ static int videoreader_vfw_getimage(videoreader_t* vr, void*buffer)
 {
     videoreader_vfw_internal_t* i = (videoreader_vfw_internal_t*)vr->internal;
 
-    if(videoreader_vfw_eof(vr))
+    if (i->video_pos >= i->video_end)
+	i->video_eof = 1;
+
+    if(i->video_eof)
 	return 0;
 
     LPBITMAPINFOHEADER bi;
@@ -211,6 +211,9 @@ static int readAudioBlock(videoreader_vfw_internal_t* i, void*buf, int len)
 static int videoreader_vfw_getsamples(videoreader_t* vr, void*buf, int num)
 {
     videoreader_vfw_internal_t* i = (videoreader_vfw_internal_t*)vr->internal;
+
+    if(i->audio_eof)
+	return 0;
    
     switch(i->waveformat.wBitsPerSample) {
 	case 1: {
@@ -219,6 +222,7 @@ static int videoreader_vfw_getsamples(videoreader_t* vr, void*buf, int num)
 	    do {
 		((SHORT*)buf)[t] = ((((BYTE*)buf)[t>>3])>>(t&7))<<15;
 	    } while(--t>=0);
+	    if(!len) i->audio_eof = 1;
 	    return len*8;
 	}
 	case 8: {
@@ -227,10 +231,13 @@ static int videoreader_vfw_getsamples(videoreader_t* vr, void*buf, int num)
 	    do {
 		((SHORT*)buf)[t] = (((BYTE*)buf)[t]<<8)^0x8000;
 	    } while(--t>=0);
+	    if(!len) i->audio_eof = 1;
 	    return len*2;
 	}
 	case 16: {
-	    return readAudioBlock(i, buf, num);
+	    int len = readAudioBlock(i, buf, num);
+	    if(!len) i->audio_eof = 1;
+	    return len;
 	}
 	default: {
 	    return 0;
@@ -278,7 +285,6 @@ int videoreader_vfw_open(videoreader_t* vr, char* filename)
     memset(i, 0, sizeof(videoreader_vfw_internal_t));
 
     vr->internal = i;
-    vr->eof = videoreader_vfw_eof;
     vr->getimage = videoreader_vfw_getimage;
     vr->getsamples = videoreader_vfw_getsamples;
     vr->close = videoreader_vfw_close;
@@ -320,11 +326,11 @@ int videoreader_vfw_open(videoreader_t* vr, char* filename)
 	    if(1) {
 		i->bitmap = bitmap;
 		i->vs = stream;
-		i->width = bitmap.biWidth;
-		i->height = bitmap.biHeight;
+		i->width = abs(bitmap.biWidth);
+		i->height = abs(bitmap.biHeight);
 	    } else {
 		fprintf(stderr, "Ignoring video stream: %dx%d compression=%d planes=%d\n", 
-			bitmap.biWidth, bitmap.biHeight,
+			abs(bitmap.biWidth), abs(bitmap.biHeight),
 			bitmap.biCompression,bitmap.biPlanes);
 	    }
         }