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

CVS: main/libvo sub.h,1.1,1.2 sub.c,1.3,1.4
by GEREOFFY 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv4288 Modified Files: sub.h sub.c Log Message: use subreader's sub struct Index: sub.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** sub.h 2001/03/27 00:32:24 1.1 --- sub.h 2001/03/30 03:01:50 1.2 *************** *** 7,12 **** extern int vo_osd_progbar_value; // 0..255 ! extern int vo_sub_lines; ! extern unsigned char* vo_sub_text[8]; #define OSD_PLAY 0x01 --- 7,11 ---- extern int vo_osd_progbar_value; // 0..255 ! extern subtitle* vo_sub; #define OSD_PLAY 0x01 Index: sub.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** sub.c 2001/03/27 00:32:24 1.3 --- sub.c 2001/03/30 03:01:50 1.4 *************** *** 1,3 **** --- 1,4 ---- + #include "subreader.h" #include "sub.h" *************** *** 90,95 **** ! int vo_sub_lines=2; ! unsigned char* vo_sub_text[8]; void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ --- 91,95 ---- ! subtitle* vo_sub=NULL; void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ *************** *** 97,104 **** int y; ! y=dys-(1+vo_sub_lines)*vo_font->height; ! for(i=0;i<vo_sub_lines;i++){ ! unsigned char* text="Hello World! HÛDEJÓ!"; //vo_sub_text[i]; int len=strlen(text); int j; --- 97,104 ---- int y; ! y=dys-(1+vo_sub->lines)*vo_font->height; ! for(i=0;i<vo_sub->lines;i++){ ! unsigned char* text=vo_sub->text[i];// "Hello World! HÛDEJÓ!"; int len=strlen(text); int j; *************** *** 145,149 **** } ! if(vo_sub_lines>0){ vo_draw_text_sub(dxs,dys,draw_alpha); } --- 145,149 ---- } ! if(vo_sub){ vo_draw_text_sub(dxs,dys,draw_alpha); } _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS CODECS,1.10,1.11
by GEREOFFY 30 Mar '01

30 Mar '01

Update of /cvsroot/mplayer/main/DOCS In directory usw-pr-cvs1:/tmp/cvs-serv20670 Modified Files: CODECS Log Message: status updated... Index: CODECS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/CODECS,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** CODECS 2001/03/29 20:30:15 1.10 --- CODECS 2001/03/30 00:22:34 1.11 *************** *** 52,56 **** ativcr1.dll: can't load (16-bit DLL) - TrueMotion 2.0: (TM20) ! tm20dec.ax: segfault Not tested: --- 52,63 ---- ativcr1.dll: can't load (16-bit DLL) - TrueMotion 2.0: (TM20) ! tm20dec.ax: dest format not accepted ! - ZLIB ! avizlib.dll: YUY2 only (no RGB), Called unk_RegEnumValueA -> endless loop ! - MSZH ! avimszh.dll: RGB only (no YUV), Called unk_RegEnumValueA -> endless loop ! - DV - Sony Digital Video (dvsd) ! qdv.dll: source format not accepted ! - MWV1: calls many unk_ functions and then segfaults. Not tested: *************** *** 64,69 **** - Windows Media Video 8 (WMV2) wmv8ds32.ax: not tested (no sample file) - - DV - Sony Digital Video (dvsd) - qdv.dll: not tested --- 71,74 ---- _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS/Spanish CODECS,1.7,1.8
by TeLeNiEkO 29 Mar '01

29 Mar '01

Update of /cvsroot/mplayer/main/DOCS/Spanish In directory usw-pr-cvs1:/tmp/cvs-serv15154 Modified Files: CODECS Log Message: Updated Spanish CODECS Index: CODECS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Spanish/CODECS,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** CODECS 2001/03/29 14:57:01 1.7 --- CODECS 2001/03/29 20:41:52 1.8 *************** *** 38,41 **** --- 38,44 ---- - Windows Media Video 7 (WMV1) wmvds32.ax: funciona, YUV soportado. + - I263: (I263) + i263_32.drv: funciona + Problemas: *************** *** 54,59 **** No probados: - - I263: (I263) - i263_32.drv: violacion de segmento - TrueMotion 2.0: (TM20) tm20dec.ax: violacion de segmento --- 57,60 ---- *************** *** 97,105 **** - MS-GSM: (0x31,0x32) msgsm32.acm: funciona (o puedes usar el codec integrado) Problemas: - - - IMA ADPCM (0x11) - imaadp32.acm: violacion de segmento No probados: --- 98,105 ---- - MS-GSM: (0x31,0x32) msgsm32.acm: funciona (o puedes usar el codec integrado) + - IMA ADPCM (0x11) + imaadp32.acm: funciona Problemas: No probados: _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS CODECS,1.9,1.10
by Berczi Gabor 29 Mar '01

29 Mar '01

Update of /cvsroot/mplayer/main/DOCS In directory usw-pr-cvs1:/tmp/cvs-serv13625/DOCS Modified Files: CODECS Log Message: imadpcm works Index: CODECS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/CODECS,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** CODECS 2001/03/29 16:00:52 1.9 --- CODECS 2001/03/29 20:30:15 1.10 *************** *** 94,102 **** - MS-GSM: (0x31,0x32) msgsm32.acm: works (or you can use the built-in codec) Problems: - - - IMA ADPCM (0x11) - imaadp32.acm: segfault Not tested: --- 94,101 ---- - MS-GSM: (0x31,0x32) msgsm32.acm: works (or you can use the built-in codec) + - IMA ADPCM (0x11) + imaadp32.acm: works Problems: Not tested: _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo vo_fbdev.c,1.6,1.7
by Szabolcs Berecz 29 Mar '01

29 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv15545 Modified Files: vo_fbdev.c Log Message: alpha rendering, virtual screensize reset fix Index: vo_fbdev.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** vo_fbdev.c 2001/03/29 14:20:01 1.6 --- vo_fbdev.c 2001/03/29 17:59:21 1.7 *************** *** 172,176 **** return 1; } - close(fb_dev_fd); printf("fb_init: framebuffer @ %p\n", frame_buffer); --- 172,175 ---- *************** *** 275,281 **** for (x = 0; x < w; x++) { if (srca[x]) { ! dst[0] = (dst[0]*(srca[x]^255)+src[x]*(srca[x]))>>8; ! dst[1] = (dst[1]*(srca[x]^255)+src[x]*(srca[x]))>>8; ! dst[2] = (dst[2]*(srca[x]^255)+src[x]*(srca[x]))>>8; } dst += fb_bpp / 8; --- 274,280 ---- for (x = 0; x < w; x++) { if (srca[x]) { ! dst[0]=((dst[0]*srca[x])>>8)+src[x]; ! dst[1]=((dst[1]*srca[x])>>8)+src[x]; ! dst[2]=((dst[2]*srca[x])>>8)+src[x]; } dst += fb_bpp / 8; *************** *** 341,344 **** --- 340,344 ---- if (ioctl(fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_var_info)) printf("vo_fbdev: Can't set virtual screensize to original value: %s\n", strerror(errno)); + close(fb_dev_fd); memset(next_frame, '\0', in_height * in_width * (fb_bpp / 8)); put_frame(); _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo font_load.c,1.7,1.8
by GEREOFFY 29 Mar '01

29 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv32713 Modified Files: font_load.c Log Message: optimized alpha resampling Index: font_load.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/font_load.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** font_load.c 2001/03/29 16:06:36 1.7 --- font_load.c 2001/03/29 16:39:37 1.8 *************** *** 211,218 **** int y=desc->pic_b[i]->bmp[j]; ! x=((x*f)>>8); // scale ! if(x<0) x=0; else if(x>255) x=255; ! x^=255; // invert ! if(x+y>255) x=255-y; // to avoid overflows --- 211,218 ---- int y=desc->pic_b[i]->bmp[j]; ! x=255-((x*f)>>8); // scale ! //if(x<0) x=0; else if(x>255) x=255; ! //x^=255; // invert ! if(x+y>255) x=255-y; // to avoid overflows *************** *** 221,229 **** //x=((x*f*(255-y))>>16)+y; //x=(x*f)>>8;if(x<y) x=y; ! if(x<1) x=1; else if(x>=252) x=0; ! desc->pic_a[i]->bmp[j]=x; } printf("DONE!\n"); --- 221,230 ---- //x=((x*f*(255-y))>>16)+y; //x=(x*f)>>8;if(x<y) x=y; ! if(x<1) x=1; else if(x>=252) x=0; ! desc->pic_a[i]->bmp[j]=x; + // desc->pic_b[i]->bmp[j]=0; // hack } printf("DONE!\n"); _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo font_load.c,1.6,1.7 vo_xv.c,1.4,1.5 mga_common.c,1.5,1.6 vo_x11.c,1.5,1.6
by GEREOFFY 29 Mar '01

29 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv26112 Modified Files: font_load.c vo_xv.c mga_common.c vo_x11.c Log Message: OSD/SUB image quality & speed improvement Index: font_load.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/font_load.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** font_load.c 2001/03/27 00:38:09 1.6 --- font_load.c 2001/03/29 16:06:36 1.7 *************** *** 200,204 **** return NULL; } ! if(factor!=1.0f){ // re-sample alpha int f=factor*256.0f; --- 200,205 ---- return NULL; } ! //if(factor!=1.0f) ! { // re-sample alpha int f=factor*256.0f; *************** *** 209,218 **** int x=desc->pic_a[i]->bmp[j]; int y=desc->pic_b[i]->bmp[j]; ! ! x=((x*f*(255-y))>>16)+y; //x=(x*f)>>8;if(x<y) x=y; ! if(x<0) x=0; else ! if(x>255) x=255; desc->pic_a[i]->bmp[j]=x; } --- 210,228 ---- int x=desc->pic_a[i]->bmp[j]; int y=desc->pic_b[i]->bmp[j]; ! ! x=((x*f)>>8); // scale ! if(x<0) x=0; else if(x>255) x=255; ! x^=255; // invert ! ! if(x+y>255) x=255-y; // to avoid overflows ! ! //x=0; ! //x=((x*f*(255-y))>>16); ! //x=((x*f*(255-y))>>16)+y; //x=(x*f)>>8;if(x<y) x=y; ! if(x<1) x=1; else ! if(x>=252) x=0; ! desc->pic_a[i]->bmp[j]=x; } Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** vo_xv.c 2001/03/29 15:32:42 1.4 --- vo_xv.c 2001/03/29 16:06:36 1.5 *************** *** 265,269 **** // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]) ! dst[x]=(dst[x]*(srca[x]^255)+src[x]*(srca[x]))>>8; } src+=stride; --- 265,270 ---- // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]) ! // dst[x]=(dst[x]*(srca[x]^255)+src[x]*(srca[x]))>>8; ! dst[x]=((dst[x]*srca[x])>>8)+src[x]; } src+=stride; *************** *** 278,282 **** // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]) ! dst[2*x]=(dst[2*x]*(srca[x]^255)+src[x]*(srca[x]))>>8; } src+=stride; --- 279,284 ---- // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]) ! // dst[2*x]=(dst[2*x]*(srca[x]^255)+src[x]*(srca[x]))>>8; ! dst[2*x]=((dst[2*x]*srca[x])>>8)+src[x]; } src+=stride; Index: mga_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** mga_common.c 2001/03/24 04:35:45 1.5 --- mga_common.c 2001/03/29 16:06:36 1.6 *************** *** 19,23 **** // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]) ! dst[x]=(dst[x]*(srca[x]^255)+src[x]*(srca[x]))>>8; } src+=stride; --- 19,24 ---- // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]) ! dst[x]=((dst[x]*srca[x])>>8)+src[x]; ! //dst[x]=(dst[x]*(srca[x]^255)+src[x]*(srca[x]))>>8; } src+=stride; *************** *** 32,36 **** // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]) ! dst[2*x]=(dst[2*x]*(srca[x]^255)+src[x]*(srca[x]))>>8; } src+=stride; --- 33,38 ---- // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]) ! dst[2*x]=((dst[2*x]*srca[x])>>8)+src[x]; ! //dst[2*x]=(dst[2*x]*(srca[x]^255)+src[x]*(srca[x]))>>8; } src+=stride; Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** vo_x11.c 2001/03/25 04:28:40 1.5 --- vo_x11.c 2001/03/29 16:06:36 1.6 *************** *** 393,399 **** // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]){ ! dst[0]=(dst[0]*(srca[x]^255)+src[x]*(srca[x]))>>8; ! dst[1]=(dst[1]*(srca[x]^255)+src[x]*(srca[x]))>>8; ! dst[2]=(dst[2]*(srca[x]^255)+src[x]*(srca[x]))>>8; } dst+=dbpp; --- 393,402 ---- // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; if(srca[x]){ ! dst[0]=((dst[0]*srca[x])>>8)+src[x]; ! dst[1]=((dst[1]*srca[x])>>8)+src[x]; ! dst[2]=((dst[2]*srca[x])>>8)+src[x]; ! //dst[0]=(dst[0]*(srca[x]^255)+src[x]*(srca[x]))>>8; ! //dst[1]=(dst[1]*(srca[x]^255)+src[x]*(srca[x]))>>8; ! //dst[2]=(dst[2]*(srca[x]^255)+src[x]*(srca[x]))>>8; } dst+=dbpp; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS CODECS,1.8,1.9
by Berczi Gabor 29 Mar '01

29 Mar '01

Update of /cvsroot/mplayer/main/DOCS In directory usw-pr-cvs1:/tmp/cvs-serv25060/DOCS Modified Files: CODECS Log Message: i263 update Index: CODECS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/CODECS,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** CODECS 2001/03/28 22:55:36 1.8 --- CODECS 2001/03/29 16:00:52 1.9 *************** *** 36,39 **** --- 36,41 ---- - Windows Media Video 7 (WMV1) wmvds32.ax: works, YUV supported + - I263: (I263) + i263_32.drv: works Problems: *************** *** 49,54 **** - ATI VCR1: (VCR1) ativcr1.dll: can't load (16-bit DLL) - - I263: (I263) - i263_32.drv: segfault - TrueMotion 2.0: (TM20) tm20dec.ax: segfault --- 51,54 ---- _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo vo_xv.c,1.3,1.4
by GEREOFFY 29 Mar '01

29 Mar '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv19778 Modified Files: vo_xv.c Log Message: OSD/SUB support Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** vo_xv.c 2001/03/21 19:10:55 1.3 --- vo_xv.c 2001/03/29 15:32:42 1.4 *************** *** 254,259 **** --- 254,294 ---- } + + static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ + int x,y; + + if (xv_format==IMGFMT_YV12){ + + for(y=0;y<h;y++){ + uint8_t *dst = xvimage[0]->data + image_width * (y+y0) + x0; + for(x=0;x<w;x++){ + // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; + if(srca[x]) + dst[x]=(dst[x]*(srca[x]^255)+src[x]*(srca[x]))>>8; + } + src+=stride; + srca+=stride; + } + + } else { + + for(y=0;y<h;y++){ + uint8_t *dst = xvimage[0]->data + 2*(image_width * (y+y0) + x0); + for(x=0;x<w;x++){ + // dst[x]=(dst[x]*srca[x]+src[x]*(srca[x]^255))>>8; + if(srca[x]) + dst[2*x]=(dst[2*x]*(srca[x]^255)+src[x]*(srca[x]))>>8; + } + src+=stride; + srca+=stride; + } + + } + + } + static void flip_page(void) { + vo_draw_text(image_width,image_height,draw_alpha); check_events(); XvShmPutImage(mydisplay, xv_port, mywindow, mygc, xvimage[0], *************** *** 264,267 **** --- 299,304 ---- return; } + + static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

Re: Re: [Mplayer-cvslog] CVS: main/DOCS CODECS,1.7,1.8
by Arpi 29 Mar '01

29 Mar '01

Hi, > Then for the FAQ: > How can one decide which codec to use? ;o) Using the -afm option. 0 - nosound 1 - mpeg layer 2/3 2 - PCM 3 - AC3 4 - Win32/ACM DLL 5 - aLaw 6 - msgsm 7 - Win32/DSHow DLL The native codec is the default is possible, so use -afm 4 or 7 to enforce using DLL files. Only exception is the MP3, because on Intel systems the DLL is the default (because it's optimized to Intel CPUs). But for AMD CPUs, the native 3dnow-optimized MP3 codec is faster... but it's sometimes unstable. but has better seeking/resync code... So there are many differences between native (linux) and dll (windows) codecs, all of them has advantages and disadvantages. I'll leave the choose to the user. A'rpi / Astral & ESP-team -- mailto:arpi@thot.banki.hu http://esp-team.scene.hu _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

2 1