October 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main Makefile,1.79,1.80
by Atmosfear 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv4928 Modified Files: Makefile Log Message: Add uninstall target, patch by Clemens Wächter <clemenswaechter(a)yahoo.com> Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- Makefile 20 Oct 2001 18:49:08 -0000 1.79 +++ Makefile 22 Oct 2001 22:46:38 -0000 1.80 @@ -136,6 +136,13 @@ -install -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP) endif +uninstall: + rm -f $(BINDIR)/$(PRG) + rm -f $(BINDIR)/gmplayer + rm -f $(prefix)/man/man1/mplayer.1 + rm -f $(BINDIR)/$(PRG_FIBMAP) + @echo "Uninstall completed" + clean: rm -f *.o *~ $(OBJS)

1 0

CVS: main xacodec.c,1.7,1.8 xacodec.h,1.1,1.2 dec_video.c,1.51,1.52
by Arpi of Ize 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv4867 Modified Files: xacodec.c xacodec.h dec_video.c Log Message: 3ivx YV12 direct rendering (one lss memcpy) Index: xacodec.c =================================================================== RCS file: /cvsroot/mplayer/main/xacodec.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xacodec.c 22 Oct 2001 21:31:42 -0000 1.7 +++ xacodec.c 22 Oct 2001 22:45:06 -0000 1.8 @@ -60,6 +60,7 @@ unsigned int (*dec_func)(unsigned char *image, unsigned char *delta, unsigned int dsize, XA_DEC_INFO *dec_info); void *close_func[XA_CLOSE_FUNCS]; + xacodec_image_t image; } xacodec_driver_t; xacodec_driver_t *xacodec_driver = NULL; @@ -303,16 +304,23 @@ xacodec_driver->decinfo->extra = codec_hdr.extra; // vidinfo->our_out_buffer = malloc(codec_hdr.y * codec_hdr.x * ((codec_hdr.depth+7)/8)); - vidinfo->our_out_buffer = malloc(codec_hdr.y * codec_hdr.x * codec_hdr.depth); +// vidinfo->our_out_buffer = malloc(codec_hdr.y * codec_hdr.x * codec_hdr.depth); + xacodec_driver->image.out_fmt=out_format; + xacodec_driver->image.bpp=codec_hdr.depth; + xacodec_driver->image.width=codec_hdr.x; + xacodec_driver->image.height=codec_hdr.y; + xacodec_driver->image.mem=malloc(codec_hdr.y * codec_hdr.x * ((codec_hdr.depth+7)/8)); // printf("out_buf size: %d\n", codec_hdr.y * codec_hdr.x * codec_hdr.depth); +#if 0 if (vidinfo->our_out_buffer == NULL) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "cannot allocate memory for output: %s", strerror(errno)); return(0); } +#endif mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "extra: %08x - %dx%d %dbit\n", codec_hdr.extra, codec_hdr.x, codec_hdr.y, codec_hdr.depth); @@ -330,23 +338,23 @@ // unsigned int (*dec_func)(unsigned char *image, unsigned char *delta, // unsigned int dsize, XA_DEC_INFO *dec_info); -int xacodec_decode_frame(uint8_t *frame, int frame_size, - uint8_t *dest, int skip_flag) +xacodec_image_t* xacodec_decode_frame(uint8_t *frame, int frame_size, int skip_flag) { unsigned int ret; int i; - + if (skip_flag > 0) printf("frame will be dropped..\n"); xacodec_driver->decinfo->skip_flag = skip_flag; - printf("frame: %08x (size: %d) - dest: %08x\n", frame, frame_size, dest); +// printf("frame: %08x (size: %d) - dest: %08x\n", frame, frame_size, dest); - ret = xacodec_driver->dec_func(dest, frame, frame_size, xacodec_driver->decinfo); + ret = xacodec_driver->dec_func((uint8_t*)&xacodec_driver->image, frame, frame_size, xacodec_driver->decinfo); - printf("ret: %lu : ", ret); +// printf("ret: %lu : ", ret); +#if 0 for (i = 0; i < 10; i++) { if (frame[i] != dest[i]) @@ -354,11 +362,12 @@ else printf("%d: [%02x] ", frame[i]); } +#endif if (ret == ACT_DLT_NORM) { printf("norm\n"); - return(TRUE); + return &xacodec_driver->image; } /* @@ -374,35 +383,35 @@ if (ret & ACT_DLT_NOP) { printf("nop\n"); - return(FALSE); /* dst = 0 */ + return NULL; /* dst = 0 */ } if (ret & ACT_DLT_DROP) /* by skip frames and errors */ { printf("drop\n"); - return(FALSE); + return NULL; } if (ret & ACT_DLT_BAD) { printf("bad\n"); - return(FALSE); + return NULL; } if (ret & ACT_DLT_BODY) { printf("body\n"); - return(TRUE); + return NULL; } if (ret & ACT_DLT_XOR) { printf("xor\n"); - return(TRUE); + return &xacodec_driver->image; } - return(FALSE); + return NULL; } int xacodec_exit() @@ -433,7 +442,7 @@ unsigned long XA_Time_Read() { - return(GetRelativeTime()); + return GetTimer(); //(GetRelativeTime()); } void XA_dummy() @@ -707,21 +716,46 @@ return((void *)color_func); } -void XA_YUV221111_To_CLR8(image,imagex,imagey,i_x,i_y,yuv,yuv_tabs,map_flag,map,chdr) -xaUBYTE *image; xaULONG imagex,imagey,i_x,i_y; +void XA_YUV221111_To_CLR8(image_p,imagex,imagey,i_x,i_y,yuv,yuv_tabs,map_flag,map,chdr) +xaUBYTE *image_p; xaULONG imagex,imagey,i_x,i_y; YUVBufs *yuv; YUVTabs *yuv_tabs; xaULONG map_flag,*map; XA_CHDR *chdr; { - printf("XA_YUV221111_To_CLR8(%p %dx%d %d;%d %p %p %d %p %p)\n", - image,imagex,imagey,i_x,i_y,yuv,yuv_tabs,map_flag,map,chdr); + xacodec_image_t *image=(xacodec_image_t*)image_p; + +#if 0 + printf("XA_YUV221111_To_CLR8(%p %dx%d %d;%d [%dx%d] %p %p %d %p %p)\n", + image,imagex,imagey,i_x,i_y, image->width,image->height, + yuv,yuv_tabs,map_flag,map,chdr); printf("YUV: %p %p %p %X (%X) %Xx%X %Xx%X\n", yuv->Ybuf,yuv->Ubuf,yuv->Vbuf,yuv->the_buf,yuv->the_buf_size, yuv->y_w,yuv->y_h,yuv->uv_w,yuv->uv_h); +#endif - memcpy(image,yuv->Ybuf,imagex*imagey); - memcpy(image+imagex*imagey,yuv->Vbuf,imagex*imagey/4); - memcpy(image+imagex*imagey*5/4,yuv->Ubuf,imagex*imagey/4); +if(imagex==image->width && imagey==image->height){ +// printf("Direct render!!!\n"); + image->planes[0]=yuv->Ybuf; + if(image->out_fmt==IMGFMT_YV12){ + image->planes[1]=yuv->Ubuf; + image->planes[2]=yuv->Vbuf; + } else { + image->planes[1]=yuv->Vbuf; + image->planes[2]=yuv->Ubuf; + } + image->stride[0]=imagex; // yuv->y_w + image->stride[1]=image->stride[2]=imagex/2; // yuv->uv_w +} else { + int y; + printf("partial YV12 not implemented!!!!!!\n"); +// image->planes[0]=image->mem; +// image->planes[1]=image->planes[0]+image->width*image->height; +// image->planes[2]=image->planes[1]+image->width*image->height/4; +} + +// memcpy(image,yuv->Ybuf,imagex*imagey); +// memcpy(image+imagex*imagey,yuv->Vbuf,imagex*imagey/4); +// memcpy(image+imagex*imagey*5/4,yuv->Ubuf,imagex*imagey/4); /* unsigned char *Ybuf; Index: xacodec.h =================================================================== RCS file: /cvsroot/mplayer/main/xacodec.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xacodec.h 22 Oct 2001 16:54:13 -0000 1.1 +++ xacodec.h 22 Oct 2001 22:45:06 -0000 1.2 @@ -101,3 +101,14 @@ unsigned int imagec; unsigned int imaged; } XA_ANIM_HDR; + +// Added by A'rpi +typedef struct { + unsigned int out_fmt; + int bpp; + int width,height; + unsigned char* planes[3]; + int stride[3]; + unsigned char *mem; +} xacodec_image_t; + Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/dec_video.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- dec_video.c 22 Oct 2001 19:03:32 -0000 1.51 +++ dec_video.c 22 Oct 2001 22:45:06 -0000 1.52 @@ -1,4 +1,6 @@ +#define USE_XANIM + #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -451,8 +453,12 @@ switch(sh_video->codec->driver){ #ifdef USE_XANIM case VFM_XANIM: { - int ret=xacodec_decode_frame(start,in_size,sh_video->our_out_buffer,drop_frame?1:0); - if(ret) blit_frame=3; + xacodec_image_t* image=xacodec_decode_frame(start,in_size,drop_frame?1:0); + if(image){ + blit_frame=2; + planes=image->planes; + stride=image->stride; + } break; } #endif

1 0

CVS: main xacodec.c,1.6,1.7
by Arpi of Ize 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv23998 Modified Files: xacodec.c Log Message: hmm. 3ivx works Index: xacodec.c =================================================================== RCS file: /cvsroot/mplayer/main/xacodec.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xacodec.c 22 Oct 2001 21:03:25 -0000 1.6 +++ xacodec.c 22 Oct 2001 21:31:42 -0000 1.7 @@ -270,8 +270,10 @@ case IMGFMT_BGR32: codec_hdr.depth = 32; break; + case IMGFMT_IYUV: case IMGFMT_I420: - codec_hdr.depth = 32; + case IMGFMT_YV12: + codec_hdr.depth = 12; break; default: mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: not supported image format (%s)\n", @@ -705,11 +707,39 @@ return((void *)color_func); } +void XA_YUV221111_To_CLR8(image,imagex,imagey,i_x,i_y,yuv,yuv_tabs,map_flag,map,chdr) +xaUBYTE *image; xaULONG imagex,imagey,i_x,i_y; +YUVBufs *yuv; YUVTabs *yuv_tabs; +xaULONG map_flag,*map; XA_CHDR *chdr; +{ + printf("XA_YUV221111_To_CLR8(%p %dx%d %d;%d %p %p %d %p %p)\n", + image,imagex,imagey,i_x,i_y,yuv,yuv_tabs,map_flag,map,chdr); + + printf("YUV: %p %p %p %X (%X) %Xx%X %Xx%X\n", + yuv->Ybuf,yuv->Ubuf,yuv->Vbuf,yuv->the_buf,yuv->the_buf_size, + yuv->y_w,yuv->y_h,yuv->uv_w,yuv->uv_h); + + memcpy(image,yuv->Ybuf,imagex*imagey); + memcpy(image+imagex*imagey,yuv->Vbuf,imagex*imagey/4); + memcpy(image+imagex*imagey*5/4,yuv->Ubuf,imagex*imagey/4); + +/* + unsigned char *Ybuf; + unsigned char *Ubuf; + unsigned char *Vbuf; + unsigned char *the_buf; + unsigned int the_buf_size; + unsigned short y_w, y_h; + unsigned short uv_w, uv_h; +*/ + +} + /* YUV 22 11 11 routines */ void *XA_YUV221111_Func(unsigned int image_type) { XA_Print("XA_YUV221111_Func('image_type: %d')", image_type); - return((void *)XA_dummy); + return((void *)XA_YUV221111_To_CLR8); } YUVBufs jpg_YUVBufs;

1 0

CVS: main xacodec.c,1.5,1.6
by Alex Beregszaszi 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv17496 Modified Files: xacodec.c Log Message: merge Index: xacodec.c =================================================================== RCS file: /cvsroot/mplayer/main/xacodec.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xacodec.c 22 Oct 2001 20:48:39 -0000 1.5 +++ xacodec.c 22 Oct 2001 21:03:25 -0000 1.6 @@ -13,7 +13,7 @@ #include <errno.h> /* strerror, errno */ #include "config.h" -#define XACODEC_PATH "/usr/lib/xanim" +#define XACODEC_PATH "/usr/lib/xanim/mods" #include "mp_msg.h" #include "bswap.h" @@ -23,8 +23,6 @@ #include "codec-cfg.h" #include "stheader.h" -//#include "loader/DirectShow/default.h" - #include "libvo/img_format.h" #include "xacodec.h" @@ -39,7 +37,6 @@ #define xaFALSE 0 #define xaTRUE 1 - #ifndef RTLD_NOW #define RLTD_NOW 2 #endif @@ -52,6 +49,9 @@ extern int verbose; +#define XA_CLOSE_FUNCS 5 +int xa_close_func = 0; + typedef struct xacodec_driver { XA_DEC_INFO *decinfo; @@ -59,12 +59,11 @@ long (*iq_func)(XA_CODEC_HDR *codec_hdr); unsigned int (*dec_func)(unsigned char *image, unsigned char *delta, unsigned int dsize, XA_DEC_INFO *dec_info); - void (*close_func)(); + void *close_func[XA_CLOSE_FUNCS]; } xacodec_driver_t; xacodec_driver_t *xacodec_driver = NULL; - /* Needed by XAnim DLLs */ int XA_Print(char *fmt, ...) { @@ -77,11 +76,23 @@ va_end(vallist); } +/* 0 is no debug (needed by 3ivX) */ +long xa_debug = 2; + int TheEnd1(char *err_mess) { XA_Print("error: %s - exiting\n", err_mess); xacodec_exit(); } + +int XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)()) +{ + XA_Print("XA_Add_Func_To_Free_Chain('anim_hdr: %08x', 'function: %08x')", + anim_hdr, function); + xacodec_driver->close_func[xa_close_func] = function; + if (xa_close_func+1 < XA_CLOSE_FUNCS) + xa_close_func++; +} /* end of crap */ /* load, init and query */ @@ -145,28 +156,26 @@ return(0); } - if (verbose > 2) - printf("dump: funcs: 0x%08x (num %d)\n", mod_hdr->funcs, mod_hdr->num_funcs); + mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "dump: funcs: 0x%08x (num %d)\n", mod_hdr->funcs, mod_hdr->num_funcs); for (i = 0; i < mod_hdr->num_funcs; i++) { - if (verbose > 2) - printf("dump(%d): %d %d [iq:0x%08x d:0x%08x]\n", i, + mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "dump(%d): %d %d [iq:0x%08x d:0x%08x]\n", i, func[i].what, func[i].id, func[i].iq_func, func[i].dec_func); if (func[i].what & XAVID_AVI_QUERY) { - printf("0x%08x: avi init/query func (id: %d)\n", + mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "0x%08x: avi init/query func (id: %d)\n", func[i].iq_func, func[i].id); codec_driver->iq_func = func[i].iq_func; } if (func[i].what & XAVID_QT_QUERY) { - printf("0x%08x: qt init/query func (id: %d)\n", + mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "0x%08x: qt init/query func (id: %d)\n", func[i].iq_func, func[i].id); codec_driver->iq_func = func[i].iq_func; } if (func[i].what & XAVID_DEC_FUNC) { - printf("0x%08x: decoder func (init/query: 0x%08x) (id: %d)\n", + mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "0x%08x: decoder func (init/query: 0x%08x) (id: %d)\n", func[i].dec_func, func[i].iq_func, func[i].id); codec_driver->dec_func = func[i].dec_func; } @@ -183,15 +192,15 @@ { case CODEC_SUPPORTED: codec_driver->dec_func = codec_hdr->decoder; - printf("Codec is supported: found decoder for %s at 0x%08x\n", + mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Codec is supported: found decoder for %s at 0x%08x\n", codec_hdr->description, codec_hdr->decoder); return(1); case CODEC_UNSUPPORTED: - printf("Codec is unsupported\n"); + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "Codec is unsupported by driver\n"); return(0); case CODEC_UNKNOWN: default: - printf("Codec is unknown\n"); + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "Codec is unknown by driver\n"); return(0); } } @@ -202,6 +211,7 @@ { char dll[1024]; XA_CODEC_HDR codec_hdr; + int i; xacodec_driver = realloc(xacodec_driver, sizeof(struct xacodec_driver)); if (xacodec_driver == NULL) @@ -209,7 +219,9 @@ xacodec_driver->iq_func = NULL; xacodec_driver->dec_func = NULL; - xacodec_driver->close_func = NULL; + + for (i=0; i < XA_CLOSE_FUNCS; i++) + xacodec_driver->close_func[i] = NULL; snprintf(dll, 1024, "%s/%s", xacodec_def_path, vidinfo->codec->dll); if (xacodec_init(dll, xacodec_driver) == 0) @@ -258,12 +270,15 @@ case IMGFMT_BGR32: codec_hdr.depth = 32; break; + case IMGFMT_I420: + codec_hdr.depth = 32; + break; default: - printf("xacodec: not supported image format (%s)\n", + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: not supported image format (%s)\n", vo_format_name(out_format)); return(0); } - mp_msg(MSGT_DECVIDEO,MSGL_INFO, "xacodec: querying for %dx%d %dbit [fourcc: %4x] (%s)...\n", + mp_msg(MSGT_DECVIDEO, MSGL_INFO, "xacodec: querying for %dx%d %dbit [fourcc: %4x] (%s)...\n", codec_hdr.x, codec_hdr.y, codec_hdr.depth, codec_hdr.compression, codec_hdr.description); @@ -292,12 +307,12 @@ if (vidinfo->our_out_buffer == NULL) { - mp_msg(MSGT_DECVIDEO,MSGL_ERR, "cannot allocate memory for output: %s", + mp_msg(MSGT_DECVIDEO, MSGL_ERR, "cannot allocate memory for output: %s", strerror(errno)); return(0); } - printf("extra: %08x - %dx%d %dbit\n", codec_hdr.extra, + mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "extra: %08x - %dx%d %dbit\n", codec_hdr.extra, codec_hdr.x, codec_hdr.y, codec_hdr.depth); return(1); } @@ -390,8 +405,17 @@ int xacodec_exit() { - if (xacodec_driver->close_func) - xacodec_driver->close_func(); + int i; + void (*close_func)(); + + for (i=0; i < XA_CLOSE_FUNCS; i++) + if (xacodec_driver->close_func[i]) + { + close_func = xacodec_driver->close_func[i]; + close_func(); + } +// if (xacodec_driver->close_func) +// xacodec_driver->close_func(); dlclose(xacodec_driver->file_handler); if (xacodec_driver->decinfo != NULL) free(xacodec_driver->decinfo); @@ -404,6 +428,17 @@ /* *** XANIM SHIT *** */ /* like loader/win32.c - mini XANIM library */ + +unsigned long XA_Time_Read() +{ + return(GetRelativeTime()); +} + +void XA_dummy() +{ + XA_Print("dummy() called"); +} + typedef struct { unsigned char r0, g0, b0; @@ -476,9 +511,6 @@ } -void dummy(){ - XA_Print("dummy() called"); -} void *YUV2x2_Blk_Func(unsigned int image_type, int blks, unsigned int dith_flag) { @@ -568,12 +600,6 @@ return (void*)XA_YUV_2x2_clr; } -int XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)()) -{ - XA_Print("XA_Add_Func_To_Free_Chain('anim_hdr: %08x', 'function: %08x')", - anim_hdr, function); - xacodec_driver->close_func = function; -} int XA_Gen_YUV_Tabs(XA_ANIM_HDR *anim_hdr) { @@ -655,11 +681,6 @@ return((void *)color_func); } -unsigned long XA_Time_Read() -{ - return(GetRelativeTime()); -} - /* YUV 41 11 11 routines */ void XA_YUV411111_To_RGB(unsigned char *image, unsigned int imagex, unsigned int imagey, unsigned int i_x, unsigned int i_y, YUVBufs *yuv_bufs, YUVTabs *yuv_tabs, @@ -684,6 +705,12 @@ return((void *)color_func); } +/* YUV 22 11 11 routines */ +void *XA_YUV221111_Func(unsigned int image_type) +{ + XA_Print("XA_YUV221111_Func('image_type: %d')", image_type); + return((void *)XA_dummy); +} YUVBufs jpg_YUVBufs; YUVTabs def_yuv_tabs;

1 0

CVS: main xacodec.c,1.4,1.5
by Arpi of Ize 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv15365 Modified Files: xacodec.c Log Message: cvid works but buggy Index: xacodec.c =================================================================== RCS file: /cvsroot/mplayer/main/xacodec.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xacodec.c 22 Oct 2001 18:52:10 -0000 1.4 +++ xacodec.c 22 Oct 2001 20:48:39 -0000 1.5 @@ -28,6 +28,18 @@ #include "libvo/img_format.h" #include "xacodec.h" +typedef char xaBYTE; +typedef short xaSHORT; +typedef int xaLONG; + +typedef unsigned char xaUBYTE; +typedef unsigned short xaUSHORT; +typedef unsigned int xaULONG; + +#define xaFALSE 0 +#define xaTRUE 1 + + #ifndef RTLD_NOW #define RLTD_NOW 2 #endif @@ -427,33 +439,53 @@ unsigned int imagex, XA_2x2_Color *cmap2x2) { unsigned int row_inc = imagex - 3; - unsigned char *ip = (unsigned char *)(image + y * imagex + x); + unsigned char *ip = (unsigned char *)(image + 4*(y * imagex + x)); - XA_Print("XA_2x2_OUT_1BLK_clr8('image: %08x', 'x: %d', 'y: %d', 'imagex: %d', 'cmap2x2: %08x')", - image, x, y, imagex, cmap2x2); - ip_OUT_2x2_1BLK(ip, unsigned char, cmap2x2, row_inc); +// XA_Print("XA_2x2_OUT_1BLK_clr8('image: %08x', 'x: %d', 'y: %d', 'imagex: %d', 'cmap2x2: %08x')", +// image, x, y, imagex, cmap2x2); + //ip_OUT_2x2_1BLK(ip, unsigned char, cmap2x2, row_inc); + + // simplified yv12->rgb32bpp converter (Y only) + ip[0]=ip[1]=ip[2]=cmap2x2->clr0_0; + ip[4]=ip[5]=ip[6]=cmap2x2->clr1_0; + ip+=4*imagex; + ip[0]=ip[1]=ip[2]=cmap2x2->clr2_0; + ip[4]=ip[5]=ip[6]=cmap2x2->clr3_0; + } void XA_2x2_OUT_4BLKS_clr8(unsigned char *image, unsigned int x, unsigned int y, unsigned int imagex, XA_2x2_Color *cm0, XA_2x2_Color *cm1, XA_2x2_Color *cm2, XA_2x2_Color *cm3) { +/* unsigned int row_inc = imagex - 3; unsigned char *ip = (unsigned char *)(image + y * imagex + x); - XA_Print("XA_2x2_OUT_1BLK_clr8('image: %08x', 'x: %d', 'y: %d', 'imagex: %d', 'cm0: %08x', 'cm1: %08x', 'cm2: %08x', 'cm3: %08x')", + XA_Print("XA_2x2_OUT_4BLKS_clr8('image: %08x', 'x: %d', 'y: %d', 'imagex: %d', 'cm0: %08x', 'cm1: %08x', 'cm2: %08x', 'cm3: %08x')", image, x, y, imagex, cm0, cm1, cm2, cm3); ip_OUT_2x2_2BLKS(ip, unsigned char, cm0, cm1, row_inc); ip += row_inc; ip_OUT_2x2_2BLKS(ip, unsigned char, cm2, cm3, row_inc); +*/ + +XA_2x2_OUT_1BLK_clr8(image,x,y,imagex,cm0); +XA_2x2_OUT_1BLK_clr8(image,x+2,y,imagex,cm1); +XA_2x2_OUT_1BLK_clr8(image,x,y+2,imagex,cm2); +XA_2x2_OUT_1BLK_clr8(image,x+2,y+2,imagex,cm3); + +} + +void dummy(){ + XA_Print("dummy() called"); } void *YUV2x2_Blk_Func(unsigned int image_type, int blks, unsigned int dith_flag) { void (*color_func)(); - XA_Print("YUV2x2_Blk_Func('image_type: %d', 'blks: %d', 'dith_flag: %d')", - image_type, blks, dith_flag); +// XA_Print("YUV2x2_Blk_Func('image_type: %d', 'blks: %d', 'dith_flag: %d')", +// image_type, blks, dith_flag); if (blks == 1) { @@ -464,7 +496,7 @@ break; } } - else /* blks == 4 */ + else if(blks == 4) { switch(image_type) { @@ -473,21 +505,67 @@ break; } } + else printf("Ajajj!\n"); - XA_Print("YUV2x2_Blk_Func -> %08x", color_func); +// XA_Print("YUV2x2_Blk_Func -> %08x", color_func); return((void *)color_func); } -void dummy(){ - XA_Print("dummy() called"); + +/***************************************************************************** + * Take Four Y's and UV and put them into a 2x2 Color structure. + * Convert to display clr. + ******************/ + +void XA_YUV_2x2_clr(cmap2x2,Y0,Y1,Y2,Y3,U,V,map_flag,map,chdr) +XA_2x2_Color *cmap2x2; +xaULONG Y0,Y1,Y2,Y3,U,V; +xaULONG map_flag,*map; +XA_CHDR *chdr; +{ xaLONG cr,cg,cb; xaULONG r,g,b; + +// printf("XA_YUV_2x2_clr(%p [%d,%d,%d,%d][%d][%d] %d %p %p)\n", +// cmap2x2,Y0,Y1,Y2,Y3,U,V,map_flag,map,chdr); + + cmap2x2->clr0_0=Y0; + cmap2x2->clr1_0=Y1; + cmap2x2->clr2_0=Y2; + cmap2x2->clr3_0=Y3; + cmap2x2->clr0_1=U; + cmap2x2->clr0_2=V; + +// cmap2x2->clr0_0 = 0x1111; +// cmap2x2->clr1_0 = 0x3535; +// cmap2x2->clr2_0 = 0x7272; +// cmap2x2->clr3_0 = 0xbfbf; + +/* + xaUBYTE *rl = xa_byte_limit; + + cr = YUV2_VR_tab[V]; + cb = YUV2_UB_tab[U]; + cg = YUV2_UG_tab[U] + YUV2_VG_tab[V]; + + YUV_TO_RGB(Y0,cr,cg,cb,rl,r,g,b); + cmap2x2->clr0_0 = XA_RGB24_To_CLR32(r,g,b,map_flag,map,chdr); + YUV_TO_RGB(Y1,cr,cg,cb,rl,r,g,b); + cmap2x2->clr1_0 = XA_RGB24_To_CLR32(r,g,b,map_flag,map,chdr); + YUV_TO_RGB(Y2,cr,cg,cb,rl,r,g,b); + cmap2x2->clr2_0 = XA_RGB24_To_CLR32(r,g,b,map_flag,map,chdr); + YUV_TO_RGB(Y3,cr,cg,cb,rl,r,g,b); + cmap2x2->clr3_0 = XA_RGB24_To_CLR32(r,g,b,map_flag,map,chdr); +*/ } + + void *YUV2x2_Map_Func(unsigned int image_type, unsigned int dith_type) { - XA_Print("YUV2x2_Map_Func('image_type: %d', 'dith_type: %d')", - image_type, dith_type); - return (void*)dummy; +// XA_Print("YUV2x2_Map_Func('image_type: %d', 'dith_type: %d')", +// image_type, dith_type); + if(image_type!=0)printf("izeeeeee!\n"); + return (void*)XA_YUV_2x2_clr; } int XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)()) @@ -509,6 +587,7 @@ void JPG_Setup_Samp_Limit_Table(XA_ANIM_HDR *anim_hdr) { XA_Print("JPG_Setup_Samp_Limit_Table('anim_hdr: %08x')", anim_hdr); +// xa_byte_limit = jpg_samp_limit + (MAXJSAMPLE + 1); } void JPG_Alloc_MCU_Bufs(XA_ANIM_HDR *anim_hdr, unsigned int width,

1 0

CVS: main cfgparser.c,1.27,1.28
by Szabolcs Berecz 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv10887 Modified Files: cfgparser.c Log Message: fix error reporting bug Index: cfgparser.c =================================================================== RCS file: /cvsroot/mplayer/main/cfgparser.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- cfgparser.c 1 Oct 2001 15:58:17 -0000 1.27 +++ cfgparser.c 22 Oct 2001 20:22:25 -0000 1.28 @@ -73,7 +73,8 @@ break; } if (i == nr_options) { - printf("invalid option:\n"); + if (parser_mode == CONFIG_FILE) + printf("invalid option:\n"); ret = ERR_NOT_AN_OPTION; goto out; }

1 0

CVS: main codec-cfg.h,1.19,1.20 codec-cfg.c,1.41,1.42
by Arpi of Ize 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv25767 Modified Files: codec-cfg.h codec-cfg.c Log Message: xanim added Index: codec-cfg.h =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- codec-cfg.h 20 Oct 2001 18:49:08 -0000 1.19 +++ codec-cfg.h 22 Oct 2001 19:04:09 -0000 1.20 @@ -39,6 +39,7 @@ #define VFM_DIVX4 7 #define VFM_RAW 8 #define VFM_RLE 9 +#define VFM_XANIM 10 #ifndef GUID_TYPE #define GUID_TYPE Index: codec-cfg.c =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- codec-cfg.c 2 Oct 2001 22:37:28 -0000 1.41 +++ codec-cfg.c 22 Oct 2001 19:04:09 -0000 1.42 @@ -222,6 +222,7 @@ "divx4", "raw", "rle", + "xanim", NULL }; char **drv=audioflag?audiodrv:videodrv;

1 0

CVS: main dec_video.c,1.50,1.51
by Arpi of Ize 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv25685 Modified Files: dec_video.c Log Message: #define USE_XANIM to enable xanim stuff Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/dec_video.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- dec_video.c 21 Oct 2001 16:32:26 -0000 1.50 +++ dec_video.c 22 Oct 2001 19:03:32 -0000 1.51 @@ -65,6 +65,10 @@ #include <decore.h> #endif +#ifdef USE_XANIM +#include "xacodec.h" +#endif + void AVI_Decode_RLE8(char *image,char *delta,int tdsize, unsigned int *map,int imagex,int imagey,unsigned char x11_bytes_pixel); @@ -226,6 +230,13 @@ sh_video->our_out_buffer=NULL; switch(sh_video->codec->driver){ +#ifdef USE_XANIM + case VFM_XANIM: { + int ret=xacodec_init_video(sh_video,out_fmt); + if(!ret) return 0; + break; + } +#endif #ifdef USE_WIN32DLL case VFM_VFW: { if(!init_vfw_video_codec(sh_video,0)) { @@ -438,6 +449,13 @@ //-------------------- Decode a frame: ----------------------- switch(sh_video->codec->driver){ +#ifdef USE_XANIM + case VFM_XANIM: { + int ret=xacodec_decode_frame(start,in_size,sh_video->our_out_buffer,drop_frame?1:0); + if(ret) blit_frame=3; + break; + } +#endif case VFM_ODIVX: { // OpenDivX DEC_FRAME dec_frame;

1 0

CVS: main xacodec.c,1.3,1.4
by Arpi of Ize 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv23060 Modified Files: xacodec.c Log Message: fixing... Index: xacodec.c =================================================================== RCS file: /cvsroot/mplayer/main/xacodec.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xacodec.c 22 Oct 2001 17:49:17 -0000 1.3 +++ xacodec.c 22 Oct 2001 18:52:10 -0000 1.4 @@ -61,7 +61,7 @@ va_start(vallist, fmt); vsnprintf(buf, 1024, fmt, vallist); - mp_msg(MSGT_DECVIDEO, MSGL_HINT, "[xacodec] %s", buf); + mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "[xacodec] %s\n", buf); va_end(vallist); } @@ -273,9 +273,10 @@ xacodec_driver->decinfo->special = 0; xacodec_driver->decinfo->extra = codec_hdr.extra; +// vidinfo->our_out_buffer = malloc(codec_hdr.y * codec_hdr.x * ((codec_hdr.depth+7)/8)); vidinfo->our_out_buffer = malloc(codec_hdr.y * codec_hdr.x * codec_hdr.depth); - printf("out_buf size: %d\n", codec_hdr.y * codec_hdr.x * codec_hdr.depth); +// printf("out_buf size: %d\n", codec_hdr.y * codec_hdr.x * codec_hdr.depth); if (vidinfo->our_out_buffer == NULL) { @@ -478,10 +479,15 @@ return((void *)color_func); } +void dummy(){ + XA_Print("dummy() called"); +} + void *YUV2x2_Map_Func(unsigned int image_type, unsigned int dith_type) { XA_Print("YUV2x2_Map_Func('image_type: %d', 'dith_type: %d')", image_type, dith_type); + return (void*)dummy; } int XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)())

1 0

CVS: main xacodec.c,1.2,1.3
by Arpi of Ize 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv12230 Modified Files: xacodec.c Log Message: mplayerization Index: xacodec.c =================================================================== RCS file: /cvsroot/mplayer/main/xacodec.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xacodec.c 22 Oct 2001 17:07:40 -0000 1.2 +++ xacodec.c 22 Oct 2001 17:49:17 -0000 1.3 @@ -6,21 +6,25 @@ */ #include <stdio.h> +#include <stdlib.h> + #include <dlfcn.h> /* dlsym, dlopen, dlclose */ #include <stdarg.h> /* va_alist, va_start, va_end */ #include <errno.h> /* strerror, errno */ +#include "config.h" +#define XACODEC_PATH "/usr/lib/xanim" + #include "mp_msg.h" -#include "aclib/byteswap.h" +#include "bswap.h" #include "stream.h" #include "demuxer.h" #include "codec-cfg.h" -#include "wine/avifmt.h" -#include "wine/vfw.h" -#include "wine/mmreg.h" #include "stheader.h" -#include "loader/DirectShow/default.h" + +//#include "loader/DirectShow/default.h" + #include "libvo/img_format.h" #include "xacodec.h" @@ -247,7 +251,7 @@ vo_format_name(out_format)); return(0); } - odprintf(LOG_INFO, "xacodec: querying for %dx%d %dbit [fourcc: %4x] (%s)...\n", + mp_msg(MSGT_DECVIDEO,MSGL_INFO, "xacodec: querying for %dx%d %dbit [fourcc: %4x] (%s)...\n", codec_hdr.x, codec_hdr.y, codec_hdr.depth, codec_hdr.compression, codec_hdr.description); @@ -275,7 +279,7 @@ if (vidinfo->our_out_buffer == NULL) { - odprintf(LOG_ERROR, "cannot allocate memory for output: %s", + mp_msg(MSGT_DECVIDEO,MSGL_ERR, "cannot allocate memory for output: %s", strerror(errno)); return(0); }

1 0