X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=avi2swf%2Fvideoreader_vfw.cc;h=a5d2483322ebb7f6d140746ac46157986a086cf4;hb=f6a3cc71c731c0144b1e137d1bdbe24afdc1c755;hp=3a3cfa614c0e4c0a462cedc860e29646e588d349;hpb=fd8e6974794cf6223d2f8f6978d1b6bcde1942fb;p=swftools.git

diff --git a/avi2swf/videoreader_vfw.cc b/avi2swf/videoreader_vfw.cc
index 3a3cfa6..a5d2483 100644
--- a/avi2swf/videoreader_vfw.cc
+++ b/avi2swf/videoreader_vfw.cc
@@ -19,12 +19,12 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "videoreader.h"
 #ifdef WIN32
 #include <windows.h>
 #include <vfw.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "videoreader.h"
 
 typedef struct _videoreader_vfw_internal { 
     //video:
@@ -49,19 +49,21 @@ typedef struct _videoreader_vfw_internal {
     int samplerate;
     int channels;
 
+    int flip;
 } videoreader_vfw_internal_t;
 
 static int avifile_initialized = 0;
+static int verbose;
 
-#define _TRACE_ {printf("%s: %d (%s)\n",__FILE__,__LINE__,__func__);fflush(stdout);}
+#define _TRACE_ {printf("vfw: %s: %d (%s)\n",__FILE__,__LINE__,__func__);fflush(stdout);}
 
-bool videoreader_vfw_eof(videoreader_t* vr)
+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)
+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
 
@@ -87,10 +89,19 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
     int bytesperpixel = ((bi->biWidth*bi->biBitCount)+7)&~7;
     int linex = ((bytesperpixel/8)+3)&~3;
     memset(dest, 255, dest_width*dest_height*4);//pre-fill alpha channel
+
+    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) {
-	int y;
 	UCHAR*img = data;
-	for(y=0;y<dest_height;y++) {
+	int y;
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width;x++) {
@@ -98,10 +109,10 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
 	    }
 	}
     } else if(bi->biBitCount==4) {
-	int y;
 	UCHAR*img = &data[bi->biClrUsed*4];
 	UCHAR*pal = data;
-	for(y=0;y<dest_height;y++) {
+	int y;
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width/2;x++) {
@@ -111,10 +122,10 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
 	    }
 	}
     } else if(bi->biBitCount==8) {
-	int y;
 	UCHAR*img = &data[bi->biClrUsed*4];
 	UCHAR*pal = data;
-	for(y=0;y<dest_height;y++) {
+	int y;
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width;x++) {
@@ -125,7 +136,7 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
     } else if(bi->biBitCount==24) {
 	UCHAR*img = data;
 	int y;
-	for(y=0;y<dest_height;y++) {
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width;x++) {
@@ -136,7 +147,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=0;y<dest_height;y++) {
+	for(y=starty;y!=endy;y+=yinc) {
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width;x++) {
@@ -151,7 +162,7 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
     return 1;
 }
 
-int videoreader_vfw_getimage(videoreader_t* vr, void*buffer)
+static int videoreader_vfw_getimage(videoreader_t* vr, void*buffer)
 {
     videoreader_vfw_internal_t* i = (videoreader_vfw_internal_t*)vr->internal;
 
@@ -169,7 +180,7 @@ 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;
     }
@@ -185,7 +196,7 @@ static int readAudioBlock(videoreader_vfw_internal_t* i, void*buf, int len)
     return bytes;
 }
 
-int videoreader_vfw_getsamples(videoreader_t* vr, void*buf, int num)
+static int videoreader_vfw_getsamples(videoreader_t* vr, void*buf, int num)
 {
     videoreader_vfw_internal_t* i = (videoreader_vfw_internal_t*)vr->internal;
    
@@ -215,7 +226,7 @@ int videoreader_vfw_getsamples(videoreader_t* vr, void*buf, int num)
     }
 }
 
-void videoreader_vfw_close(videoreader_t* vr)
+static void videoreader_vfw_close(videoreader_t* vr)
 {
     videoreader_vfw_internal_t* i = (videoreader_vfw_internal_t*)vr->internal;
 
@@ -233,7 +244,15 @@ void videoreader_vfw_close(videoreader_t* vr)
     free(vr->internal); vr->internal = 0;
 }
 
-void videoreader_vfw_setparameter(videoreader_t* vr, char*name, char*value) {}
+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);
+    }
+}
 
 int videoreader_vfw_open(videoreader_t* vr, char* filename)
 {
@@ -266,6 +285,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;
@@ -316,6 +339,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;
@@ -323,6 +349,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 {