X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=avi2swf%2Fvideoreader_vfw.cc;h=f9558b983a8f3ab367ceb0ecde6bbdb87d3d69f5;hp=b809eb0e2d68f334ccf0ee0b502bc633153446fe;hb=bb669965012032ebb8225f6a2c013093af5baf53;hpb=f8e8408f984b72dd90467f9c46ede4767139b189 diff --git a/avi2swf/videoreader_vfw.cc b/avi2swf/videoreader_vfw.cc index b809eb0..f9558b9 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 #include #include #include -#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;ybiBitCount==4) { - int y; UCHAR*img = &data[bi->biClrUsed*4]; UCHAR*pal = data; - for(y=0;ybiBitCount==8) { - int y; UCHAR*img = &data[bi->biClrUsed*4]; UCHAR*pal = data; - for(y=0;ybiBitCount==16) { + UCHAR*img = data; + int y; + for(y=starty;y!=endy;y+=yinc) { + UCHAR*line = &img[linex*y]; + int x; + for(x=0;x>5&0x1f)<<(16+3)|(c>>10&0x1f)<<(24+3); + line+=2; + } + } } else if(bi->biBitCount==24) { UCHAR*img = data; int y; - for(y=0;ybiBitCount==32) { UCHAR*img = data; int y; - for(y=0;yinternal; @@ -162,13 +185,14 @@ int videoreader_vfw_getimage(videoreader_t* vr, void*buffer) bi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(i->getframe, i->video_pos); i->video_pos++; + vr->frame++; if(!bi) { fprintf(stderr, "AVIStreamGetFrame failed\n"); 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; } @@ -184,7 +208,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; @@ -214,7 +238,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; @@ -232,7 +256,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) { @@ -265,6 +297,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(tvs) { + 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; @@ -322,6 +361,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 { @@ -330,6 +372,7 @@ int videoreader_vfw_open(videoreader_t* vr, char* filename) i->getframe = AVIStreamGetFrameOpen(i->vs, 0); if(!i->getframe) { + fprintf(stderr, "Couldn't initialize AVIStream for %s- codec missing?\n", filename); return -1; }