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

diff --git a/avi2swf/videoreader_vfw.cc b/avi2swf/videoreader_vfw.cc
index 2e0c787..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;
 
@@ -53,16 +56,11 @@ typedef struct _videoreader_vfw_internal {
 } videoreader_vfw_internal_t;
 
 static int avifile_initialized = 0;
+static int verbose;
 
-#define _TRACE_ {printf("%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);
-}
+#define _TRACE_ {printf("vfw: %s: %d (%s)\n",__FILE__,__LINE__,__func__);fflush(stdout);}
 
-static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width, const int dest_height)
+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
 
@@ -75,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);
@@ -89,14 +87,18 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
     int linex = ((bytesperpixel/8)+3)&~3;
     memset(dest, 255, dest_width*dest_height*4);//pre-fill alpha channel
 
-    int starty = i->flip? 0 : dest_height-1;
-    int endy   = i->flip? dest_height-1 : 0;
-    int yinc   = i->flip? 1 : -1;
+    const int starty = flip? 0 : dest_height-1;
+    const int endy   = flip? dest_height : -1;
+    const int yinc   = flip? 1 : -1;
+
+    if(verbose) {
+	printf("vfw: Convering scanlines %d to %d from bpp %d, %d stepping, flip=%d\n", starty, endy, bi->biBitCount, yinc, flip);
+    }
 
     if(bi->biBitCount==1) {
 	UCHAR*img = data;
 	int y;
-	for(y=starty;y<=endy;y+=yinc) {
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width;x++) {
@@ -107,7 +109,7 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
 	UCHAR*img = &data[bi->biClrUsed*4];
 	UCHAR*pal = data;
 	int y;
-	for(y=starty;y<=endy;y+=yinc) {
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width/2;x++) {
@@ -120,7 +122,7 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
 	UCHAR*img = &data[bi->biClrUsed*4];
 	UCHAR*pal = data;
 	int y;
-	for(y=starty;y<=endy;y+=yinc) {
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width;x++) {
@@ -128,10 +130,22 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
 		line++;
 	    }
 	}
+    } else if(bi->biBitCount==16) {
+	UCHAR*img = data;
+	int y;
+	for(y=starty;y!=endy;y+=yinc) {
+	    UCHAR*line = &img[linex*y];
+	    int x;
+	    for(x=0;x<dest_width;x++) {
+		USHORT c = line[0]|line[1]<<8;
+		*dest++ = 255|(c&0x1f)<<(24+3)|(c>>5&0x1f)<<(16+3)|(c>>10&0x1f)<<(8+3);
+		line+=2;
+	    }
+	}
     } else if(bi->biBitCount==24) {
 	UCHAR*img = data;
 	int y;
-	for(y=starty;y<=endy;y+=yinc) {
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width;x++) {
@@ -142,7 +156,7 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
     } else if(bi->biBitCount==32) {
 	UCHAR*img = data;
 	int y;
-	for(y=starty;y<=endy;y+=yinc) {
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width;x++) {
@@ -161,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;
@@ -175,7 +192,7 @@ static int videoreader_vfw_getimage(videoreader_t* vr, void*buffer)
 	return 0;
     }
     
-    if(!bitmap_to_rgba(bi, buffer, i->width, i->height)) {
+    if(!bitmap_to_rgba(bi, buffer, i->width, i->height, i->flip)) {
 	fprintf(stderr, "couldn't convert bitmap to RGBA.\n");
 	return 0;
     }
@@ -194,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: {
@@ -202,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: {
@@ -210,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;
@@ -244,6 +268,8 @@ static void videoreader_vfw_setparameter(videoreader_t*vr, char*name, char*value
     videoreader_vfw_internal_t* i = (videoreader_vfw_internal_t*)vr->internal;
     if(!strcmp(name, "flip")) {
 	i->flip = atoi(value);
+    } else if(!strcmp(name, "verbose")) {
+	verbose = atoi(value);
     }
 }
 
@@ -259,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;
@@ -278,6 +303,10 @@ int videoreader_vfw_open(videoreader_t* vr, char* filename)
     /* calculate framerate */
     i->fps = (double)info.dwRate/(double)info.dwScale;
 
+    if(verbose) {
+	printf("vfw: file %s has %f fps, and %d streams\n", i->fps, info.dwStreams);
+    }
+
     unsigned int t=0;
     while(t<info.dwStreams) {
 	PAVISTREAM stream;
@@ -297,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);
 	    }
         }
@@ -328,6 +357,9 @@ int videoreader_vfw_open(videoreader_t* vr, char* filename)
     }
 
     if(i->vs) {
+	if(verbose) {
+	    printf("vfw: video stream: %dx%d, %.2f\n", i->width, i->height, i->fps);
+	}
 	vr->width = i->width;
 	vr->height = i->height;
 	vr->fps = i->fps;
@@ -335,6 +367,9 @@ int videoreader_vfw_open(videoreader_t* vr, char* filename)
 	fprintf(stderr, "AVIReader: Warning: No video stream\n");
     }
     if(i->as) {
+	if(verbose) {
+	    printf("vfw: audio stream: %d channels, %d samples/sec", i->channels, i->samplerate);
+	}
 	vr->channels = i->channels;
 	vr->samplerate = i->samplerate;
     } else {