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

CVS: main/etc codecs.conf,1.65,1.66
by Alex Beregszaszi 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main/etc In directory mplayer:/var/tmp.root/cvs-serv8088 Modified Files: codecs.conf Log Message: 3ivx dshow added, ulaw/vbr mp3/cbr mp3 for MOV files added Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- codecs.conf 11 Oct 2001 14:46:09 -0000 1.65 +++ codecs.conf 22 Oct 2001 17:18:21 -0000 1.66 @@ -148,6 +148,8 @@ info "Motion JPEG" status working fourcc MJPG +; fourcc mjpa ; MOV files +; fourcc mjpb ; MOV files driver vfw dll "mcmjpg32.dll" ; dll "m3jpeg32.dll" @@ -453,6 +455,17 @@ dll "xa_rle8" out BGR32,BGR24,BGR16,BGR15 +videocodec 3ivx + info "3IVX MPEG4 Codec" + status crashing + fourcc 3IV1,3ivx + driver dshow + dll "3ivxdmo.dll" + guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c + out YUY2 + out UYVY + out BGR32,BGR24,BGR16,BGR15 + videocodec null info "NULL codec (no decoding)" status working @@ -464,6 +477,7 @@ out UYVY out BGR32,BGR24,BGR16,BGR15 + ;============================================================================= ; AUDIO CODECS ;============================================================================= @@ -505,6 +519,8 @@ comment "Optimized to MMX/SSE/3Dnow!" format 0x50 format 0x55 + format 0x33706d2e ; ".mp3" VBR MP3 (MOV files) + format 0x4400736d ; "ms\0\x55" CBR MP3 (MOV files) driver mp3lib dll "mp3lib (mpglib)" flags seekable @@ -562,6 +578,7 @@ info "uLaw" status working format 0x7 + format 0x66515c75 ; "ulaw" (MOV files) driver alaw dll "ulaw"

1 0

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

22 Oct '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv6440 Modified Files: cache2.c Log Message: largefileization Index: cache2.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cache2.c 22 Oct 2001 16:09:34 -0000 1.6 +++ cache2.c 22 Oct 2001 17:08:24 -0000 1.7 @@ -31,13 +31,13 @@ int sector_size; // size of a single sector (2048/2324) int back_size; // we should keep back_size amount of old bytes for backward seek int fill_limit; // we should fill buffer only if space>=fill_limit - // reader's pointers: - int read_filepos; // filler's pointers: - int min_filepos; // buffer contain only a part of the file, from min-max pos - int max_filepos; - int offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte) int eof; + off_t min_filepos; // buffer contain only a part of the file, from min-max pos + off_t max_filepos; + off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte) + // reader's pointers: + off_t read_filepos; // commands/locking: // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads. @@ -63,9 +63,7 @@ //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos); - newb=s->max_filepos-s->read_filepos; // new bytes in the buffer - - if(newb<=0 || s->read_filepos<s->min_filepos){ + if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){ // eof? if(s->eof) break; // waiting for buffer fill... @@ -73,6 +71,7 @@ continue; // try again... } + newb=s->max_filepos-s->read_filepos; // new bytes in the buffer if(newb<min_fill) min_fill=newb; // statistics... // printf("*** newb: %d bytes ***\n",newb); @@ -104,9 +103,8 @@ } int cache_fill(cache_vars_t* s){ - int read,back,back2,newb,space,len,pos,endpos; - - read=s->read_filepos; + int back,back2,newb,space,len,pos,endpos; + off_t read=s->read_filepos; if(read<s->min_filepos || read>s->max_filepos){ // seek...

1 0

CVS: main xacodec.c,1.1,1.2
by Alex Beregszaszi 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv6278 Modified Files: xacodec.c Log Message: reworked for mplayer Index: xacodec.c =================================================================== RCS file: /cvsroot/mplayer/main/xacodec.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xacodec.c 22 Oct 2001 16:54:13 -0000 1.1 +++ xacodec.c 22 Oct 2001 17:07:40 -0000 1.2 @@ -10,7 +10,7 @@ #include <stdarg.h> /* va_alist, va_start, va_end */ #include <errno.h> /* strerror, errno */ -#include "odeon.h" +#include "mp_msg.h" #include "aclib/byteswap.h" #include "stream.h" @@ -48,221 +48,6 @@ xacodec_driver_t *xacodec_driver = NULL; -/* *** XANIM SHIT *** */ - -typedef struct -{ - unsigned char r0, g0, b0; - unsigned char r1, g1, b1; - unsigned char r2, g2, b2; - unsigned char r3, g3, b3; - unsigned int clr0_0, clr0_1, clr0_2, clr0_3; - unsigned int clr1_0, clr1_1, clr1_2, clr1_3; - unsigned int clr2_0, clr2_1, clr2_2, clr2_3; - unsigned int clr3_0, clr3_1, clr3_2, clr3_3; -} XA_2x2_Color; - -#define ip_OUT_2x2_1BLK(ip, CAST, cmap2x2, rinc) { register CAST d0, d1; \ - *ip++ = d0 = (CAST)(cmap2x2->clr0_0); *ip++ = d0; \ - *ip++ = d1 = (CAST)(cmap2x2->clr1_0); *ip = d1; \ - ip += rinc; \ - *ip++ = d0; *ip++ = d0; *ip++ = d1; *ip = d1; ip += rinc; \ - *ip++ = d0 = (CAST)(cmap2x2->clr2_0); *ip++ = d0; \ - *ip++ = d1 = (CAST)(cmap2x2->clr3_0); *ip = d1; \ - ip += rinc; *ip++ = d0; *ip++ = d0; *ip++ = d1; *ip++ = d1; } - -#define ip_OUT_2x2_2BLKS(ip, CAST, c2x2map0, c2x2map1, rinc) { \ - *ip++ = (CAST)(c2x2map0->clr0_0); \ - *ip++ = (CAST)(c2x2map0->clr1_0); \ - *ip++ = (CAST)(c2x2map1->clr0_0); \ - *ip = (CAST)(c2x2map1->clr1_0); ip += rinc; \ - *ip++ = (CAST)(c2x2map0->clr2_0); \ - *ip++ = (CAST)(c2x2map0->clr3_0); \ - *ip++ = (CAST)(c2x2map1->clr2_0); \ - *ip = (CAST)(c2x2map1->clr3_0); } - -void XA_2x2_OUT_1BLK_clr8(unsigned char *image, unsigned int x, unsigned int y, - unsigned int imagex, XA_2x2_Color *cmap2x2) -{ - 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', 'cmap2x2: %08x')", - image, x, y, imagex, cmap2x2); - ip_OUT_2x2_1BLK(ip, unsigned char, cmap2x2, row_inc); -} - -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')", - 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); -} - -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); - - if (blks == 1) - { - switch(image_type) - { - default: - color_func = XA_2x2_OUT_1BLK_clr8; - break; - } - } - else /* blks == 4 */ - { - switch(image_type) - { - default: - color_func = XA_2x2_OUT_4BLKS_clr8; - break; - } - } - - XA_Print("YUV2x2_Blk_Func -> %08x", color_func); - - return((void *)color_func); -} - -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); -} - -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) -{ - XA_Print("XA_Gen_YUV_Tabs('anim_hdr: %08x')", anim_hdr); - -// XA_Print("anim type: %d - img[x: %d, y: %d, c: %d, d: %d]", -// anim_hdr->anim_type, anim_hdr->imagex, anim_hdr->imagey, -// anim_hdr->imagec, anim_hdr->imaged); -} - -void JPG_Setup_Samp_Limit_Table(XA_ANIM_HDR *anim_hdr) -{ - XA_Print("JPG_Setup_Samp_Limit_Table('anim_hdr: %08x')", anim_hdr); -} - -void JPG_Alloc_MCU_Bufs(XA_ANIM_HDR *anim_hdr, unsigned int width, - unsigned int height, unsigned int full_flag) -{ - XA_Print("JPG_Alloc_MCU_Bufs('anim_hdr: %08x', 'width: %d', 'height: %d', 'full_flag: %d')", - anim_hdr, width, height, full_flag); -} - -typedef struct -{ - 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; -} YUVBufs; - -typedef struct -{ - unsigned long Uskip_mask; - long *YUV_Y_tab; - long *YUV_UB_tab; - long *YUV_VR_tab; - long *YUV_UG_tab; - long *YUV_VG_tab; -} YUVTabs; - -#define XA_IMTYPE_RGB 0x0001 - -void XA_YUV1611_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, - unsigned int map_flag, unsigned int *map, XA_CHDR *chdr) -{ - XA_Print("XA_YUV1611_To_RGB('image: %08x', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')", - image, imagex, imagey, i_x, i_y, yuv_bufs, yuv_tabs, map_flag, map, chdr); -} - -void XA_YUV1611_To_CLR8(unsigned char *image, unsigned int imagex, unsigned int imagey, - unsigned int i_x, unsigned int i_y, YUVBufs *yuv_bufs, YUVTabs *yuv_tabs, - unsigned int map_flag, unsigned int *map, XA_CHDR *chdr) -{ - XA_Print("XA_YUV1611_To_CLR8('image: %08x', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')", - image, imagex, imagey, i_x, i_y, yuv_bufs, yuv_tabs, map_flag, map, chdr); -} - -void *XA_YUV1611_Func(unsigned int image_type) -{ - void (*color_func)(); - - XA_Print("XA_YUV1611_Func('image_type: %d')", image_type); - - switch(image_type) - { - case XA_IMTYPE_RGB: - color_func = XA_YUV1611_To_RGB; - break; - default: - color_func = XA_YUV1611_To_CLR8; - break; - } - - 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, - unsigned int map_flag, unsigned int *map, XA_CHDR *chdr) -{ - XA_Print("XA_YUV411111_To_RGB('image: %d', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')", - image, imagex, imagey, i_x, i_y, yuv_bufs, yuv_tabs, map_flag, map, chdr); -} - - -void *XA_YUV411111_Func(unsigned int image_type) -{ - void (*color_func)(); - - XA_Print("XA_YUV411111_Func('image_type: %d')", image_type); - - switch(image_type) - { - case XA_IMTYPE_RGB: color_func = XA_YUV411111_To_RGB; break; - } - - return((void *)color_func); -} - - -YUVBufs jpg_YUVBufs; -YUVTabs def_yuv_tabs; - -/* *** EOF XANIM SHIT *** */ /* Needed by XAnim DLLs */ int XA_Print(char *fmt, ...) @@ -272,7 +57,7 @@ va_start(vallist, fmt); vsnprintf(buf, 1024, fmt, vallist); - odprintf(LOG_NORM, "[xacodec] %s", buf); + mp_msg(MSGT_DECVIDEO, MSGL_HINT, "[xacodec] %s", buf); va_end(vallist); } @@ -297,16 +82,16 @@ { error = dlerror(); if (error) - printf("xacodec: fialed to init %s while %s\n", filename, error); + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: failed to init %s while %s\n", filename, error); else - printf("xacodec: failed ot init (dlopen) %s\n", filename); + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: failed ot init (dlopen) %s\n", filename); return(0); } what_the = dlsym(codec_driver->file_handler, "What_The"); if ((error = dlerror()) != NULL) { - printf("xacodec: failed to init %s while %s\n", filename, error); + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: failed to init %s while %s\n", filename, error); dlclose(codec_driver->file_handler); return(0); } @@ -314,24 +99,24 @@ mod_hdr = what_the(); if (!mod_hdr) { - printf("xacodec: 'What_The' function failed in %s\n", filename); + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: 'What_The' function failed in %s\n", filename); dlclose(codec_driver->file_handler); return(0); } - printf("=== XAnim Codec ===\n"); - printf(" Filename: %s (API revision: %x)\n", filename, mod_hdr->api_rev); - printf(" Codec: %s. Rev: %s\n", mod_hdr->desc, mod_hdr->rev); + mp_msg(MSGT_DECVIDEO, MSGL_INFO, "=== XAnim Codec ===\n"); + mp_msg(MSGT_DECVIDEO, MSGL_INFO, " Filename: %s (API revision: %x)\n", filename, mod_hdr->api_rev); + mp_msg(MSGT_DECVIDEO, MSGL_INFO, " Codec: %s. Rev: %s\n", mod_hdr->desc, mod_hdr->rev); if (mod_hdr->copyright) - printf(" %s\n", mod_hdr->copyright); + mp_msg(MSGT_DECVIDEO, MSGL_INFO, " %s\n", mod_hdr->copyright); if (mod_hdr->mod_author) - printf(" Module Author(s): %s\n", mod_hdr->mod_author); + mp_msg(MSGT_DECVIDEO, MSGL_INFO, " Module Author(s): %s\n", mod_hdr->mod_author); if (mod_hdr->authors) - printf(" Codec Author(s): %s\n", mod_hdr->authors); + mp_msg(MSGT_DECVIDEO, MSGL_INFO, " Codec Author(s): %s\n", mod_hdr->authors); if (mod_hdr->api_rev > XAVID_API_REV) { - printf("xacodec: not supported api revision in %s\n", filename); + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: not supported api revision in %s\n", filename); dlclose(codec_driver->file_handler); return(0); } @@ -339,7 +124,7 @@ func = mod_hdr->funcs; if (!func) { - printf("xacodec: function table error in %s\n", filename); + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: function table error in %s\n", filename); dlclose(codec_driver->file_handler); return(0); } @@ -597,3 +382,221 @@ free(xacodec_driver); return(TRUE); } + + +/* *** XANIM SHIT *** */ +/* like loader/win32.c - mini XANIM library */ + +typedef struct +{ + unsigned char r0, g0, b0; + unsigned char r1, g1, b1; + unsigned char r2, g2, b2; + unsigned char r3, g3, b3; + unsigned int clr0_0, clr0_1, clr0_2, clr0_3; + unsigned int clr1_0, clr1_1, clr1_2, clr1_3; + unsigned int clr2_0, clr2_1, clr2_2, clr2_3; + unsigned int clr3_0, clr3_1, clr3_2, clr3_3; +} XA_2x2_Color; + +#define ip_OUT_2x2_1BLK(ip, CAST, cmap2x2, rinc) { register CAST d0, d1; \ + *ip++ = d0 = (CAST)(cmap2x2->clr0_0); *ip++ = d0; \ + *ip++ = d1 = (CAST)(cmap2x2->clr1_0); *ip = d1; \ + ip += rinc; \ + *ip++ = d0; *ip++ = d0; *ip++ = d1; *ip = d1; ip += rinc; \ + *ip++ = d0 = (CAST)(cmap2x2->clr2_0); *ip++ = d0; \ + *ip++ = d1 = (CAST)(cmap2x2->clr3_0); *ip = d1; \ + ip += rinc; *ip++ = d0; *ip++ = d0; *ip++ = d1; *ip++ = d1; } + +#define ip_OUT_2x2_2BLKS(ip, CAST, c2x2map0, c2x2map1, rinc) { \ + *ip++ = (CAST)(c2x2map0->clr0_0); \ + *ip++ = (CAST)(c2x2map0->clr1_0); \ + *ip++ = (CAST)(c2x2map1->clr0_0); \ + *ip = (CAST)(c2x2map1->clr1_0); ip += rinc; \ + *ip++ = (CAST)(c2x2map0->clr2_0); \ + *ip++ = (CAST)(c2x2map0->clr3_0); \ + *ip++ = (CAST)(c2x2map1->clr2_0); \ + *ip = (CAST)(c2x2map1->clr3_0); } + +void XA_2x2_OUT_1BLK_clr8(unsigned char *image, unsigned int x, unsigned int y, + unsigned int imagex, XA_2x2_Color *cmap2x2) +{ + 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', 'cmap2x2: %08x')", + image, x, y, imagex, cmap2x2); + ip_OUT_2x2_1BLK(ip, unsigned char, cmap2x2, row_inc); +} + +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')", + 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); +} + +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); + + if (blks == 1) + { + switch(image_type) + { + default: + color_func = XA_2x2_OUT_1BLK_clr8; + break; + } + } + else /* blks == 4 */ + { + switch(image_type) + { + default: + color_func = XA_2x2_OUT_4BLKS_clr8; + break; + } + } + + XA_Print("YUV2x2_Blk_Func -> %08x", color_func); + + return((void *)color_func); +} + +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); +} + +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) +{ + XA_Print("XA_Gen_YUV_Tabs('anim_hdr: %08x')", anim_hdr); + +// XA_Print("anim type: %d - img[x: %d, y: %d, c: %d, d: %d]", +// anim_hdr->anim_type, anim_hdr->imagex, anim_hdr->imagey, +// anim_hdr->imagec, anim_hdr->imaged); +} + +void JPG_Setup_Samp_Limit_Table(XA_ANIM_HDR *anim_hdr) +{ + XA_Print("JPG_Setup_Samp_Limit_Table('anim_hdr: %08x')", anim_hdr); +} + +void JPG_Alloc_MCU_Bufs(XA_ANIM_HDR *anim_hdr, unsigned int width, + unsigned int height, unsigned int full_flag) +{ + XA_Print("JPG_Alloc_MCU_Bufs('anim_hdr: %08x', 'width: %d', 'height: %d', 'full_flag: %d')", + anim_hdr, width, height, full_flag); +} + +typedef struct +{ + 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; +} YUVBufs; + +typedef struct +{ + unsigned long Uskip_mask; + long *YUV_Y_tab; + long *YUV_UB_tab; + long *YUV_VR_tab; + long *YUV_UG_tab; + long *YUV_VG_tab; +} YUVTabs; + +#define XA_IMTYPE_RGB 0x0001 + +void XA_YUV1611_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, + unsigned int map_flag, unsigned int *map, XA_CHDR *chdr) +{ + XA_Print("XA_YUV1611_To_RGB('image: %08x', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')", + image, imagex, imagey, i_x, i_y, yuv_bufs, yuv_tabs, map_flag, map, chdr); +} + +void XA_YUV1611_To_CLR8(unsigned char *image, unsigned int imagex, unsigned int imagey, + unsigned int i_x, unsigned int i_y, YUVBufs *yuv_bufs, YUVTabs *yuv_tabs, + unsigned int map_flag, unsigned int *map, XA_CHDR *chdr) +{ + XA_Print("XA_YUV1611_To_CLR8('image: %08x', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')", + image, imagex, imagey, i_x, i_y, yuv_bufs, yuv_tabs, map_flag, map, chdr); +} + +void *XA_YUV1611_Func(unsigned int image_type) +{ + void (*color_func)(); + + XA_Print("XA_YUV1611_Func('image_type: %d')", image_type); + + switch(image_type) + { + case XA_IMTYPE_RGB: + color_func = XA_YUV1611_To_RGB; + break; + default: + color_func = XA_YUV1611_To_CLR8; + break; + } + + 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, + unsigned int map_flag, unsigned int *map, XA_CHDR *chdr) +{ + XA_Print("XA_YUV411111_To_RGB('image: %d', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')", + image, imagex, imagey, i_x, i_y, yuv_bufs, yuv_tabs, map_flag, map, chdr); +} + + +void *XA_YUV411111_Func(unsigned int image_type) +{ + void (*color_func)(); + + XA_Print("XA_YUV411111_Func('image_type: %d')", image_type); + + switch(image_type) + { + case XA_IMTYPE_RGB: color_func = XA_YUV411111_To_RGB; break; + } + + return((void *)color_func); +} + + +YUVBufs jpg_YUVBufs; +YUVTabs def_yuv_tabs; + +/* *** EOF XANIM SHIT *** */

1 0

CVS: main xacodec.h,NONE,1.1 xacodec.c,NONE,1.1
by Alex Beregszaszi 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv4441 Added Files: xacodec.h xacodec.c Log Message: needs to be hacked --- NEW FILE --- typedef struct { unsigned int what; unsigned int id; int (*iq_func)(); /* init/query function */ unsigned int (*dec_func)(); /* opt decode function */ } XAVID_FUNC_HDR; #define XAVID_WHAT_NO_MORE 0x0000 #define XAVID_AVI_QUERY 0x0001 #define XAVID_QT_QUERY 0x0002 #define XAVID_DEC_FUNC 0x0100 #define XAVID_API_REV 0x0003 typedef struct { unsigned int api_rev; char *desc; char *rev; char *copyright; char *mod_author; char *authors; unsigned int num_funcs; XAVID_FUNC_HDR *funcs; } XAVID_MOD_HDR; /* XA CODEC .. */ typedef struct { void *anim_hdr; unsigned long compression; unsigned long x, y; unsigned long depth; void *extra; unsigned long xapi_rev; unsigned long (*decoder)(); char *description; unsigned long avi_ctab_flag; unsigned long (*avi_read_ext)(); } XA_CODEC_HDR; #define CODEC_SUPPORTED 1 #define CODEC_UNKNOWN 0 #define CODEC_UNSUPPORTED -1 /* fuckin colormap structures for xanim */ typedef struct { unsigned short red; unsigned short green; unsigned short blue; unsigned short gray; } ColorReg; typedef struct XA_ACTION_STRUCT { int type; int cmap_rev; unsigned char *data; struct XA_ACTION_STRUCT *next; struct XA_CHDR_STRUCT *chdr; ColorReg *h_cmap; unsigned int *map; struct XA_ACTION_STRUCT *next_same_chdr; } XA_ACTION; typedef struct XA_CHDR_STRUCT { unsigned int rev; ColorReg *cmap; unsigned int csize, coff; unsigned int *map; unsigned int msize, moff; struct XA_CHDR_STRUCT *next; XA_ACTION *acts; struct XA_CHDR_STRUCT *new_chdr; } XA_CHDR; typedef struct { unsigned int cmd; unsigned int skip_flag; unsigned int imagex, imagey; /* image buffer size */ unsigned int imaged; /* image depth */ XA_CHDR *chdr; /* color map header */ unsigned int map_flag; unsigned int *map; unsigned int xs, ys; unsigned int xe, ye; unsigned int special; void *extra; } XA_DEC_INFO; typedef struct { unsigned int file_num; unsigned int anim_type; unsigned int imagex; unsigned int imagey; unsigned int imagec; unsigned int imaged; } XA_ANIM_HDR; --- NEW FILE --- /* xacodec.c XAnim Video Codec DLL support (C) 2001 Alex Beregszaszi <alex(a)naxine.org> */ #include <stdio.h> #include <dlfcn.h> /* dlsym, dlopen, dlclose */ #include <stdarg.h> /* va_alist, va_start, va_end */ #include <errno.h> /* strerror, errno */ #include "odeon.h" #include "aclib/byteswap.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 "libvo/img_format.h" #include "xacodec.h" #ifndef RTLD_NOW #define RLTD_NOW 2 #endif #ifndef RTLD_LAZY #define RLTD_LAZY 1 #endif #ifndef RTLD_GLOBAL #define RLTD_GLOBAL 256 #endif extern int verbose; typedef struct xacodec_driver { XA_DEC_INFO *decinfo; void *file_handler; 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)(); } xacodec_driver_t; xacodec_driver_t *xacodec_driver = NULL; /* *** XANIM SHIT *** */ typedef struct { unsigned char r0, g0, b0; unsigned char r1, g1, b1; unsigned char r2, g2, b2; unsigned char r3, g3, b3; unsigned int clr0_0, clr0_1, clr0_2, clr0_3; unsigned int clr1_0, clr1_1, clr1_2, clr1_3; unsigned int clr2_0, clr2_1, clr2_2, clr2_3; unsigned int clr3_0, clr3_1, clr3_2, clr3_3; } XA_2x2_Color; #define ip_OUT_2x2_1BLK(ip, CAST, cmap2x2, rinc) { register CAST d0, d1; \ *ip++ = d0 = (CAST)(cmap2x2->clr0_0); *ip++ = d0; \ *ip++ = d1 = (CAST)(cmap2x2->clr1_0); *ip = d1; \ ip += rinc; \ *ip++ = d0; *ip++ = d0; *ip++ = d1; *ip = d1; ip += rinc; \ *ip++ = d0 = (CAST)(cmap2x2->clr2_0); *ip++ = d0; \ *ip++ = d1 = (CAST)(cmap2x2->clr3_0); *ip = d1; \ ip += rinc; *ip++ = d0; *ip++ = d0; *ip++ = d1; *ip++ = d1; } #define ip_OUT_2x2_2BLKS(ip, CAST, c2x2map0, c2x2map1, rinc) { \ *ip++ = (CAST)(c2x2map0->clr0_0); \ *ip++ = (CAST)(c2x2map0->clr1_0); \ *ip++ = (CAST)(c2x2map1->clr0_0); \ *ip = (CAST)(c2x2map1->clr1_0); ip += rinc; \ *ip++ = (CAST)(c2x2map0->clr2_0); \ *ip++ = (CAST)(c2x2map0->clr3_0); \ *ip++ = (CAST)(c2x2map1->clr2_0); \ *ip = (CAST)(c2x2map1->clr3_0); } void XA_2x2_OUT_1BLK_clr8(unsigned char *image, unsigned int x, unsigned int y, unsigned int imagex, XA_2x2_Color *cmap2x2) { 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', 'cmap2x2: %08x')", image, x, y, imagex, cmap2x2); ip_OUT_2x2_1BLK(ip, unsigned char, cmap2x2, row_inc); } 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')", 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); } 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); if (blks == 1) { switch(image_type) { default: color_func = XA_2x2_OUT_1BLK_clr8; break; } } else /* blks == 4 */ { switch(image_type) { default: color_func = XA_2x2_OUT_4BLKS_clr8; break; } } XA_Print("YUV2x2_Blk_Func -> %08x", color_func); return((void *)color_func); } 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); } 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) { XA_Print("XA_Gen_YUV_Tabs('anim_hdr: %08x')", anim_hdr); // XA_Print("anim type: %d - img[x: %d, y: %d, c: %d, d: %d]", // anim_hdr->anim_type, anim_hdr->imagex, anim_hdr->imagey, // anim_hdr->imagec, anim_hdr->imaged); } void JPG_Setup_Samp_Limit_Table(XA_ANIM_HDR *anim_hdr) { XA_Print("JPG_Setup_Samp_Limit_Table('anim_hdr: %08x')", anim_hdr); } void JPG_Alloc_MCU_Bufs(XA_ANIM_HDR *anim_hdr, unsigned int width, unsigned int height, unsigned int full_flag) { XA_Print("JPG_Alloc_MCU_Bufs('anim_hdr: %08x', 'width: %d', 'height: %d', 'full_flag: %d')", anim_hdr, width, height, full_flag); } typedef struct { 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; } YUVBufs; typedef struct { unsigned long Uskip_mask; long *YUV_Y_tab; long *YUV_UB_tab; long *YUV_VR_tab; long *YUV_UG_tab; long *YUV_VG_tab; } YUVTabs; #define XA_IMTYPE_RGB 0x0001 void XA_YUV1611_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, unsigned int map_flag, unsigned int *map, XA_CHDR *chdr) { XA_Print("XA_YUV1611_To_RGB('image: %08x', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')", image, imagex, imagey, i_x, i_y, yuv_bufs, yuv_tabs, map_flag, map, chdr); } void XA_YUV1611_To_CLR8(unsigned char *image, unsigned int imagex, unsigned int imagey, unsigned int i_x, unsigned int i_y, YUVBufs *yuv_bufs, YUVTabs *yuv_tabs, unsigned int map_flag, unsigned int *map, XA_CHDR *chdr) { XA_Print("XA_YUV1611_To_CLR8('image: %08x', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')", image, imagex, imagey, i_x, i_y, yuv_bufs, yuv_tabs, map_flag, map, chdr); } void *XA_YUV1611_Func(unsigned int image_type) { void (*color_func)(); XA_Print("XA_YUV1611_Func('image_type: %d')", image_type); switch(image_type) { case XA_IMTYPE_RGB: color_func = XA_YUV1611_To_RGB; break; default: color_func = XA_YUV1611_To_CLR8; break; } 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, unsigned int map_flag, unsigned int *map, XA_CHDR *chdr) { XA_Print("XA_YUV411111_To_RGB('image: %d', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')", image, imagex, imagey, i_x, i_y, yuv_bufs, yuv_tabs, map_flag, map, chdr); } void *XA_YUV411111_Func(unsigned int image_type) { void (*color_func)(); XA_Print("XA_YUV411111_Func('image_type: %d')", image_type); switch(image_type) { case XA_IMTYPE_RGB: color_func = XA_YUV411111_To_RGB; break; } return((void *)color_func); } YUVBufs jpg_YUVBufs; YUVTabs def_yuv_tabs; /* *** EOF XANIM SHIT *** */ /* Needed by XAnim DLLs */ int XA_Print(char *fmt, ...) { va_list vallist; char buf[1024]; va_start(vallist, fmt); vsnprintf(buf, 1024, fmt, vallist); odprintf(LOG_NORM, "[xacodec] %s", buf); va_end(vallist); } int TheEnd1(char *err_mess) { XA_Print("error: %s - exiting\n", err_mess); xacodec_exit(); } /* end of crap */ /* load, init and query */ int xacodec_init(char *filename, xacodec_driver_t *codec_driver) { void *(*what_the)(); char *error; XAVID_MOD_HDR *mod_hdr; XAVID_FUNC_HDR *func; int i; codec_driver->file_handler = dlopen(filename, RTLD_NOW|RTLD_GLOBAL); if (!codec_driver->file_handler) { error = dlerror(); if (error) printf("xacodec: fialed to init %s while %s\n", filename, error); else printf("xacodec: failed ot init (dlopen) %s\n", filename); return(0); } what_the = dlsym(codec_driver->file_handler, "What_The"); if ((error = dlerror()) != NULL) { printf("xacodec: failed to init %s while %s\n", filename, error); dlclose(codec_driver->file_handler); return(0); } mod_hdr = what_the(); if (!mod_hdr) { printf("xacodec: 'What_The' function failed in %s\n", filename); dlclose(codec_driver->file_handler); return(0); } printf("=== XAnim Codec ===\n"); printf(" Filename: %s (API revision: %x)\n", filename, mod_hdr->api_rev); printf(" Codec: %s. Rev: %s\n", mod_hdr->desc, mod_hdr->rev); if (mod_hdr->copyright) printf(" %s\n", mod_hdr->copyright); if (mod_hdr->mod_author) printf(" Module Author(s): %s\n", mod_hdr->mod_author); if (mod_hdr->authors) printf(" Codec Author(s): %s\n", mod_hdr->authors); if (mod_hdr->api_rev > XAVID_API_REV) { printf("xacodec: not supported api revision in %s\n", filename); dlclose(codec_driver->file_handler); return(0); } func = mod_hdr->funcs; if (!func) { printf("xacodec: function table error in %s\n", filename); dlclose(codec_driver->file_handler); return(0); } if (verbose > 2) printf("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, 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", 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", 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", func[i].dec_func, func[i].iq_func, func[i].id); codec_driver->dec_func = func[i].dec_func; } } return(1); } int xacodec_query(xacodec_driver_t *codec_driver, XA_CODEC_HDR *codec_hdr) { long codec_ret; codec_ret = codec_driver->iq_func(codec_hdr); switch(codec_ret) { case CODEC_SUPPORTED: codec_driver->dec_func = codec_hdr->decoder; printf("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"); return(0); case CODEC_UNKNOWN: default: printf("Codec is unknown\n"); return(0); } } char *xacodec_def_path = XACODEC_PATH; int xacodec_init_video(sh_video_t *vidinfo, int out_format) { char dll[1024]; XA_CODEC_HDR codec_hdr; xacodec_driver = realloc(xacodec_driver, sizeof(struct xacodec_driver)); if (xacodec_driver == NULL) return(0); xacodec_driver->iq_func = NULL; xacodec_driver->dec_func = NULL; xacodec_driver->close_func = NULL; snprintf(dll, 1024, "%s/%s", xacodec_def_path, vidinfo->codec->dll); if (xacodec_init(dll, xacodec_driver) == 0) return(0); codec_hdr.anim_hdr = malloc(4096); codec_hdr.description = vidinfo->codec->info; codec_hdr.compression = bswap_32(vidinfo->format); codec_hdr.decoder = NULL; codec_hdr.avi_ctab_flag = 0; codec_hdr.avi_read_ext = NULL; codec_hdr.xapi_rev = 0x0001; codec_hdr.extra = NULL; codec_hdr.x = vidinfo->disp_w; codec_hdr.y = vidinfo->disp_h; switch(out_format) { case IMGFMT_RGB8: codec_hdr.depth = 8; break; case IMGFMT_RGB15: codec_hdr.depth = 15; break; case IMGFMT_RGB16: codec_hdr.depth = 16; break; case IMGFMT_RGB24: codec_hdr.depth = 24; break; case IMGFMT_RGB32: codec_hdr.depth = 32; break; case IMGFMT_BGR8: codec_hdr.depth = 8; break; case IMGFMT_BGR15: codec_hdr.depth = 15; break; case IMGFMT_BGR16: codec_hdr.depth = 16; break; case IMGFMT_BGR24: codec_hdr.depth = 24; break; case IMGFMT_BGR32: codec_hdr.depth = 32; break; default: printf("xacodec: not supported image format (%s)\n", vo_format_name(out_format)); return(0); } odprintf(LOG_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); if (xacodec_query(xacodec_driver, &codec_hdr) == 0) return(0); // free(codec_hdr.anim_hdr); xacodec_driver->decinfo = malloc(sizeof(XA_DEC_INFO)); xacodec_driver->decinfo->cmd = 0; xacodec_driver->decinfo->skip_flag = 0; xacodec_driver->decinfo->imagex = xacodec_driver->decinfo->xe = codec_hdr.x; xacodec_driver->decinfo->imagey = xacodec_driver->decinfo->ye = codec_hdr.y; xacodec_driver->decinfo->imaged = codec_hdr.depth; xacodec_driver->decinfo->chdr = NULL; xacodec_driver->decinfo->map_flag = 0; /* xaFALSE */ xacodec_driver->decinfo->map = NULL; xacodec_driver->decinfo->xs = xacodec_driver->decinfo->ys = 0; 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); printf("out_buf size: %d\n", codec_hdr.y * codec_hdr.x * codec_hdr.depth); if (vidinfo->our_out_buffer == NULL) { odprintf(LOG_ERROR, "cannot allocate memory for output: %s", strerror(errno)); return(0); } printf("extra: %08x - %dx%d %dbit\n", codec_hdr.extra, codec_hdr.x, codec_hdr.y, codec_hdr.depth); return(1); } #define ACT_DLT_NORM 0x00000000 #define ACT_DLT_BODY 0x00000001 #define ACT_DLT_XOR 0x00000002 #define ACT_DLT_NOP 0x00000004 #define ACT_DLT_MAPD 0x00000008 #define ACT_DLT_DROP 0x00000010 #define ACT_DLT_BAD 0x80000000 // 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) { 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); ret = xacodec_driver->dec_func(dest, frame, frame_size, xacodec_driver->decinfo); printf("ret: %lu : ", ret); for (i = 0; i < 10; i++) { if (frame[i] != dest[i]) printf("%d: [%02x] != [%02x] ", i, frame[i], dest[i]); else printf("%d: [%02x] ", frame[i]); } if (ret == ACT_DLT_NORM) { printf("norm\n"); return(TRUE); } /* if (!(ret & ACT_DLT_MAPD)) xacodec_driver->decinfo->map_flag = 0; else { xacodec_driver->decinfo->map_flag = 1; xacodec_driver->decinfo->map = ... } */ if (ret & ACT_DLT_NOP) { printf("nop\n"); return(FALSE); /* dst = 0 */ } if (ret & ACT_DLT_DROP) /* by skip frames and errors */ { printf("drop\n"); return(FALSE); } if (ret & ACT_DLT_BAD) { printf("bad\n"); return(FALSE); } if (ret & ACT_DLT_BODY) { printf("body\n"); return(TRUE); } if (ret & ACT_DLT_XOR) { printf("xor\n"); return(TRUE); } return(FALSE); } int xacodec_exit() { if (xacodec_driver->close_func) xacodec_driver->close_func(); dlclose(xacodec_driver->file_handler); if (xacodec_driver->decinfo != NULL) free(xacodec_driver->decinfo); if (xacodec_driver != NULL) free(xacodec_driver); return(TRUE); }

1 0

CVS: main/libmpdemux cache2.c,1.5,1.6
by Arpi of Ize 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv28129 Modified Files: cache2.c Log Message: printf->mp_msg Index: cache2.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cache2.c 21 Oct 2001 22:13:12 -0000 1.5 +++ cache2.c 22 Oct 2001 16:09:34 -0000 1.6 @@ -16,6 +16,8 @@ #include "../linux/shmem.h" +#include "mp_msg.h" + #include "stream.h" int stream_fill_buffer(stream_t *s); @@ -83,7 +85,7 @@ if(newb>size) newb=size; // check: - if(s->read_filepos<s->min_filepos) printf("Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n"); + if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n"); // len=write(mem,newb) //printf("Buffer read: %d bytes\n",newb); @@ -108,12 +110,12 @@ if(read<s->min_filepos || read>s->max_filepos){ // seek... - printf("Out of boundaries... seeking to 0x%X \n",read); + mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read); s->offset= // FIXME!? s->min_filepos=s->max_filepos=read; // drop cache content :( if(s->stream->eof) stream_reset(s->stream); stream_seek(s->stream,read); - printf("Seek done. new pos: 0x%X \n",(int)stream_tell(s->stream)); + mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%X \n",(int)stream_tell(s->stream)); } // calc number of back-bytes: @@ -213,7 +215,7 @@ // cache_stats(s->cache_data); - if(s->pos!=((cache_vars_t*)s->cache_data)->read_filepos) printf("!!! read_filepos differs!!! report this bug...\n"); + if(s->pos!=((cache_vars_t*)s->cache_data)->read_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"!!! read_filepos differs!!! report this bug...\n"); len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size); //printf("cache_stream_fill_buffer->read -> %d\n",len); @@ -235,7 +237,7 @@ s=stream->cache_data; // s->seek_lock=1; - printf("CACHE2_SEEK: 0x%X <= 0x%X (0x%X) <= 0x%X \n",s->min_filepos,(int)pos,s->read_filepos,s->max_filepos); + mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%X <= 0x%X (0x%X) <= 0x%X \n",s->min_filepos,(int)pos,s->read_filepos,s->max_filepos); newpos=pos/s->sector_size; newpos*=s->sector_size; // align stream->pos=s->read_filepos=newpos; @@ -252,7 +254,11 @@ // stream->buf_pos=stream->buf_len=0; // return 1; - printf("cache_stream_seek: WARNING! Can't seek to 0x%X !\n",(int)(pos+newpos)); +#ifdef _LARGEFILE_SOURCE + mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%llX !\n",(long long)(pos+newpos)); +#else + mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%X !\n",(pos+newpos)); +#endif return 0; }

1 0

CVS: main mp_msg.h,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-serv21631 Modified Files: mp_msg.h Log Message: cache2 added Index: mp_msg.h =================================================================== RCS file: /cvsroot/mplayer/main/mp_msg.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mp_msg.h 26 Sep 2001 21:35:14 -0000 1.6 +++ mp_msg.h 22 Oct 2001 15:40:07 -0000 1.7 @@ -47,6 +47,7 @@ #define MSGT_LIRC 19 // lirc_mp.c #define MSGT_STREAM 20 // stream.c +#define MSGT_CACHE 21 // cache2.c #define MSGT_MAX 64

1 0

CVS: main/DOCS mplayer.1,1.101,1.102
by Winner of tha face compo 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv19822/DOCS Modified Files: mplayer.1 Log Message: misinformation corrected Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- mplayer.1 22 Oct 2001 15:20:34 -0000 1.101 +++ mplayer.1 22 Oct 2001 15:34:04 -0000 1.102 @@ -155,7 +155,7 @@ .TP .B \-flip flip image (useful for example for old Indeo codecs). Supported only(?) -by the 'sdl' and 'vesa' outputs. +by the 'sdl' and 'x11' outputs. .TP .B \-x\ x scale image to x width [if driver suppports!]

1 0

CVS: main/DOCS mplayer.1,1.100,1.101
by Winner of tha face compo 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv18407/DOCS Modified Files: mplayer.1 Log Message: changed functionality means changed definition. Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- mplayer.1 22 Oct 2001 14:49:27 -0000 1.100 +++ mplayer.1 22 Oct 2001 15:20:34 -0000 1.101 @@ -458,12 +458,14 @@ subtitle format, MPsub. Dumps a dump.mpsub file to current directory. .TP .B \-screenw\ pixels -This is for TV-out users! Here you should set the horizontal resolution of your -Matrox framebuffer. Needed for fullscreen playing on -vo mga,vesa,x11 ONLY ! +If you use an output driver which can't know the resolution of the screen +(mga/fbdev/x11 and/or TVout) this is where you can specify the horizontal +resolution. .TP .B \-screenh\ pixels -This is for TV-out users! Here you should set the vertical resolution of your -Matrox framebuffer. Needed for fullscreen playing on -vo mga,vesa,x11 ONLY ! +If you use an output driver which can't know the resolution of the screen +(mga/fbdev/x11 and/or TVout) this is where you can specify the vertical +resolution. .TP .B \-cache\ kbytes See it below, in the ALPHA/BETA CODE section.

1 0

CVS: main/etc example.conf,1.39,1.40
by Winner of tha face compo 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main/etc In directory mplayer:/var/tmp.root/cvs-serv17532/etc Modified Files: example.conf Log Message: busted. szopjatok hanyatt users. Index: example.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/example.conf,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- example.conf 22 Oct 2001 14:49:27 -0000 1.39 +++ example.conf 22 Oct 2001 15:14:48 -0000 1.40 @@ -44,11 +44,6 @@ # monitoraspect=4:3 # standard monitor size, with square pixels # monitoraspect=16:9 # use this for widescreen monitor! non-square pixels -# screenw=720 # this is required for MATROX TV-OUT users ! -# screenh=576 # here you should set the resolution of your - # Matrox framebuffer. Needed for fullscreen playing - # on -vo mga,vesa,x11 ONLY ! - ## ## Use GUI mode by default ##

1 0

CVS: main/DOCS mplayer.1,1.99,1.100
by Winner of tha face compo 22 Oct '01

22 Oct '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv12848/DOCS Modified Files: mplayer.1 Log Message: Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- mplayer.1 22 Oct 2001 12:57:43 -0000 1.99 +++ mplayer.1 22 Oct 2001 14:49:27 -0000 1.100 @@ -146,10 +146,12 @@ bands around it) .TP .B \-vm -use XF86VidMode extension for mode changing +try to change to a different video mode. dga2, x11 (XF86VidMode) and sdl +output drivers support it. .TP .B \-zoom -use software scaling, where available (use with -nofs) +use software scaling, where available (use with -nofs). svga, x11, vesa +output drivers support it. .TP .B \-flip flip image (useful for example for old Indeo codecs). Supported only(?) @@ -457,13 +459,11 @@ .TP .B \-screenw\ pixels This is for TV-out users! Here you should set the horizontal resolution of your -Matrox framebuffer. Needed for fullscreen playing on '-vo mga' and '-vo vesa' -ONLY ! +Matrox framebuffer. Needed for fullscreen playing on -vo mga,vesa,x11 ONLY ! .TP .B \-screenh\ pixels This is for TV-out users! Here you should set the vertical resolution of your -Matrox framebuffer. Needed for fullscreen playing on '-vo mga' and '-vo vesa' -ONLY ! +Matrox framebuffer. Needed for fullscreen playing on -vo mga,vesa,x11 ONLY ! .TP .B \-cache\ kbytes See it below, in the ALPHA/BETA CODE section.

1 0