April 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/drivers mgavid.patch,NONE,1.1
by Dariush Pietrzak 15 Apr '02

15 Apr '02

Update of /cvsroot/mplayer/main/drivers In directory mplayer:/var/tmp.root/cvs-serv29363 Added Files: mgavid.patch Log Message: mga_vid driver in form of a patch against linux-2.4.18 applicable using for example cd linux && patch -p1 < ~/mgavid.patch --- NEW FILE --- diff -ruN linux.orig/Documentation/Configure.help linux/Documentation/Configure.help --- linux.orig/Documentation/Configure.help Mon Apr 15 00:58:14 2002 +++ linux/Documentation/Configure.help Mon Apr 15 01:04:11 2002 @@ -4542,6 +4542,15 @@ There is no need for enabling 'Matrox multihead support' if you have only one Matrox card in the box. +Matrox mga_vid driver +CONFIG_FB_MATROX_MGAVID + Say Y here if you want to use /dev/mga_vid driver used by + advanced video players like mplayer and aviplay. + You'll need to mknod /dev/mga_vid c 178 0 + If you compile it as module, it will create a module named + mga_vid.o. + + 3Dfx Voodoo Graphics / Voodoo2 frame buffer support CONFIG_FB_VOODOO1 Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or [...1672 lines suppressed...] + +#define MGA_VID_FORMAT_YV12 0x32315659 +#define MGA_VID_FORMAT_IYUV (('I'<<24)|('Y'<<16)|('U'<<8)|'V') +#define MGA_VID_FORMAT_I420 (('I'<<24)|('4'<<16)|('2'<<8)|'0') +#define MGA_VID_FORMAT_YUY2 (('Y'<<24)|('U'<<16)|('Y'<<8)|'2') +#define MGA_VID_FORMAT_UYVY (('U'<<24)|('Y'<<16)|('V'<<8)|'Y') + +#define MGA_VID_CONFIG _IOR('J', 1, mga_vid_config_t) +#define MGA_VID_ON _IO ('J', 2) +#define MGA_VID_OFF _IO ('J', 3) +#define MGA_VID_FSEL _IOR('J', 4, int) +#define MGA_VID_GET_LUMA _IOR('J', 5, int) +#define MGA_VID_SET_LUMA _IOR('J', 6, int) + +#define MGA_G200 0x1234 +#define MGA_G400 0x5678 + +#define MGA_VID_VERSION 0x0201 + +#endif

1 0

CVS: main/libmpcodecs ve_lavc.c,1.5,1.6
by Arpi of Ize 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mplayer:/var/tmp.root/cvs-serv11988 Modified Files: ve_lavc.c Log Message: workaround Juanjo's stupid vme change Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ve_lavc.c 13 Apr 2002 19:14:31 -0000 1.5 +++ ve_lavc.c 14 Apr 2002 23:16:55 -0000 1.6 @@ -123,10 +123,12 @@ lavc_venc_context.flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0; - /* motion estimation (0 = none ... 3 = high quality but slow) */ - /* this is just an extern from libavcodec but it should be in the - encoder context - FIXME */ +#ifdef ME_ZERO + // workaround Juanjo's stupid incompatible change: motion_estimation_method = lavc_param_vme; +#else + lavc_venc_context.me_method = ME_ZERO+lavc_param_vme; +#endif /* fixed qscale :p */ if (lavc_param_vqscale)

2 1

CVS: main/drivers mga_vid.c,1.40,1.41
by Dariush Pietrzak 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/drivers In directory mplayer:/var/tmp.root/cvs-serv10551 Modified Files: mga_vid.c Log Message: Most of informational printk's ifdef'd. Now without debug only initial and error messages go to syslog. eyck added to list of people who messed with this file(?). Index: mga_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/mga_vid.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- mga_vid.c 25 Mar 2002 16:22:15 -0000 1.40 +++ mga_vid.c 14 Apr 2002 23:14:26 -0000 1.41 @@ -2,6 +2,7 @@ // YUY2 support (see config.format) added by A'rpi/ESP-team // double buffering added by A'rpi/ESP-team +// brightness/contrast introduced by eyck // Set this value, if autodetection fails! (video ram size in megabytes) // #define MGA_MEMORY_SIZE 16 @@ -426,8 +427,10 @@ // restore it colkey_saved=0; +#ifdef MP_DEBUG printk("mga_vid: Restoring colorkey (ON: %d %02X:%02X:%02X)\n", colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]); +#endif // Set color key registers: writeb( XKEYOPMODE, mga_mmio_base + PALWTADD); @@ -476,8 +479,10 @@ writeb( XCOLMSK, mga_mmio_base + PALWTADD); colkey_mask[3]=(unsigned char)readb(mga_mmio_base + X_DATAREG); +#ifdef MP_DEBUG printk("mga_vid: Saved colorkey (ON: %d %02X:%02X:%02X)\n", colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]); +#endif } @@ -615,7 +620,9 @@ // writel(cregs.c2vsync, mga_mmio_base + C2VSYNC); writel(cregs.c2misc, mga_mmio_base + C2MISC); +#ifdef MP_DEBUG printk("c2offset = %d\n",cregs.c2offset); +#endif writel(cregs.c2offset, mga_mmio_base + C2OFFSET); writel(cregs.c2startadd0, mga_mmio_base + C2STARTADD0); @@ -664,8 +671,10 @@ dw = config->dest_width; dh = config->dest_height; +#ifdef MP_DEBUG printk(KERN_DEBUG "mga_vid: Setting up a %dx%d+%d+%d video window (src %dx%d) format %X\n", dw, dh, x, y, sw, sh, config->format); +#endif if(sw<4 || sh<4 || dw<4 || dh<4){ printk(KERN_ERR "mga_vid: Invalid src/dest dimenstions\n"); @@ -1149,11 +1158,13 @@ case MGA_VID_CONFIG: //FIXME remove // printk(KERN_DEBUG "vcount = %d\n",readl(mga_mmio_base + VCOUNT)); +#ifdef MP_DEBUG printk(KERN_DEBUG "mga_mmio_base = %p\n",mga_mmio_base); printk(KERN_DEBUG "mga_mem_base = %08x\n",mga_mem_base); //FIXME remove printk(KERN_DEBUG "mga_vid: Received configuration\n"); +#endif if(copy_from_user(&mga_config,(mga_vid_config_t*) arg,sizeof(mga_vid_config_t))) { @@ -1181,7 +1192,9 @@ return(-EFAULT); } mga_src_base &= (~0xFFFF); // 64k boundary +#ifdef MP_DEBUG printk(KERN_DEBUG "mga YUV buffer base: 0x%X\n", mga_src_base); +#endif if (is_g400) mga_config.card_type = MGA_G400; @@ -1199,7 +1212,9 @@ break; case MGA_VID_ON: +#ifdef MP_DEBUG printk(KERN_DEBUG "mga_vid: Video ON\n"); +#endif vid_src_ready = 1; if(vid_overlay_on) { @@ -1213,7 +1228,9 @@ break; case MGA_VID_OFF: +#ifdef MP_DEBUG printk(KERN_DEBUG "mga_vid: Video OFF (ioctl)\n"); +#endif vid_src_ready = 0; #ifdef MGA_ALLOW_IRQ if ( mga_irq != -1 ) disable_irq(); @@ -1442,7 +1459,9 @@ static int mga_vid_mmap(struct file *file, struct vm_area_struct *vma) { +#ifdef MP_DEBUG printk(KERN_DEBUG "mga_vid: mapping video memory into userspace\n"); +#endif if(remap_page_range(vma->vm_start, mga_mem_base + mga_src_base, vma->vm_end - vma->vm_start, vma->vm_page_prot)) { @@ -1456,7 +1475,9 @@ static int mga_vid_release(struct inode *inode, struct file *file) { //Close the window just in case +#ifdef MP_DEBUG printk(KERN_DEBUG "mga_vid: Video OFF (release)\n"); +#endif vid_src_ready = 0; regs.besctl &= ~1;

1 0

CVS: main/libvo vo_xv.c,1.70,1.71
by Atmosfear 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv28166/libvo Modified Files: vo_xv.c Log Message: Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com> Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- vo_xv.c 13 Apr 2002 19:14:33 -0000 1.70 +++ vo_xv.c 14 Apr 2002 22:15:29 -0000 1.71 @@ -493,24 +493,48 @@ * allocate XvImages. FIXME: no error checking, without * mit-shm this will bomb... */ - xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); - - Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); - Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); - Shminfo[foo].readOnly = False; + if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag = 1; + else + { + Shmem_Flag = 0; + if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xv\n" ); + } + if ( Shmem_Flag ) + { + xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); - xvimage[foo]->data = Shminfo[foo].shmaddr; - XShmAttach(mDisplay, &Shminfo[foo]); - XSync(mDisplay, False); - shmctl(Shminfo[foo].shmid, IPC_RMID, 0); + Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); + Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); + Shminfo[foo].readOnly = False; + + xvimage[foo]->data = Shminfo[foo].shmaddr; + XShmAttach(mDisplay, &Shminfo[foo]); + XSync(mDisplay, False); + shmctl(Shminfo[foo].shmid, IPC_RMID, 0); + } + else + { + xvimage[foo] = XvCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height); + xvimage[foo]->data = malloc(xvimage[foo]->data_size); + XSync(mDisplay,False); + } memset(xvimage[foo]->data,128,xvimage[foo]->data_size); return; } static void deallocate_xvimage(int foo) { - XShmDetach( mDisplay,&Shminfo[foo] ); - shmdt( Shminfo[foo].shmaddr ); + if ( Shmem_Flag ) + { + XShmDetach( mDisplay,&Shminfo[foo] ); + shmdt( Shminfo[foo].shmaddr ); + } + else + { + free(xvimage[foo]->data); + } + XFree(xvimage[foo]); + XFlush( mDisplay ); XSync(mDisplay, False); return; @@ -541,8 +565,16 @@ } if ( e & VO_EVENT_EXPOSE ) { - XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); - XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight), False); + if ( Shmem_Flag ) + { + XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); + XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight), False); + } + else + { + XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1); + XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight)); + } } } @@ -551,10 +583,19 @@ static void flip_page(void) { - XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], + if ( Shmem_Flag ) + { + XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight), False); + } + else + { + XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], + 0, 0, image_width, image_height, + drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight)); + } if (num_buffers>1){ current_buf=(current_buf+1)%num_buffers; XFlush(mDisplay);

1 0

CVS: main/libmpcodecs ve_lavc.c,1.5,1.6
by Richard Felker CVS 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mplayer:/var/tmp.root/cvs-serv27029/libmpcodecs Modified Files: ve_lavc.c Log Message: fixed broken mencoder compile after motion est method for lavc was moved from a global to the encoder context. Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ve_lavc.c 13 Apr 2002 19:14:31 -0000 1.5 +++ ve_lavc.c 14 Apr 2002 20:32:21 -0000 1.6 @@ -126,7 +126,7 @@ /* motion estimation (0 = none ... 3 = high quality but slow) */ /* this is just an extern from libavcodec but it should be in the encoder context - FIXME */ - motion_estimation_method = lavc_param_vme; + lavc_venc_context.me_method = lavc_param_vme; /* fixed qscale :p */ if (lavc_param_vqscale)

2 1

CVS: main mplayer.c,1.466,1.467
by Arpi of Ize 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv12176 Modified Files: mplayer.c Log Message: some more statistics: BENCHMARKn Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.466 retrieving revision 1.467 diff -u -r1.466 -r1.467 --- mplayer.c 14 Apr 2002 01:20:26 -0000 1.466 +++ mplayer.c 14 Apr 2002 19:43:23 -0000 1.467 @@ -159,8 +159,9 @@ double vout_time_usage=0; static double audio_time_usage=0; static int total_time_usage_start=0; +static int total_frame_cnt=0; +static int drop_frame_cnt=0; // total number of dropped frames int benchmark=0; -static unsigned bench_dropped_frames=0; // static int play_in_bg=0; @@ -1343,7 +1344,6 @@ char osd_text_buffer[64]; int drop_frame=0; // current dropping status int dropped_frames=0; // how many frames dropped since last non-dropped frame -int drop_frame_cnt=0; // total number of dropped frames int too_slow_frame_cnt=0; int too_fast_frame_cnt=0; // for auto-quality: @@ -1522,6 +1522,7 @@ } else { drop_frame=dropped_frames=0; } + ++total_frame_cnt; } // decode: current_module="decode_video"; @@ -2866,6 +2867,15 @@ 100.0*audio_time_usage/total_time_usage, 100.0*(total_time_usage-tot)/total_time_usage, 100.0); + if(total_frame_cnt) + mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n", + total_frame_cnt-drop_frame_cnt, + (total_time_usage>0.5)?((total_frame_cnt-drop_frame_cnt)/total_time_usage):0, + drop_frame_cnt, + 100*drop_frame_cnt/total_frame_cnt, + total_frame_cnt, + (total_time_usage>0.5)?(total_frame_cnt/total_time_usage):0); + } #ifdef HAVE_NEW_GUI

1 0

CVS: main/DOCS DVB,1.6,1.7
by Arpi of Ize 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv5943 Modified Files: DVB Log Message: updated Index: DVB =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/DVB,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DVB 3 Dec 2001 21:53:09 -0000 1.6 +++ DVB 14 Apr 2002 19:18:34 -0000 1.7 @@ -2,23 +2,18 @@ Some words about Siemens-DVB card support. by A'rpi ========================================== -NOTE: this is very experimental! - Requirements: ~~~~~~~~~~~~~ - Siemens DVB-S card or compatible (technotrend,galaxis,hauppage etc) see www.linuxtv.org for details and download latest driver there. -- MPlayer-CVS, ffmpeg-libavcodec. divx4linux is recommended for speed & pp. -- Fast CPU - at least for software decoding (divx...) +- MPlayer-CVS, ffmpeg-libavcodec CVS are recommended for speed & pp. +- Fast CPU - 1GHz+ recommended at least for software transcoding (divx->mpeg) How to enable? ~~~~~~~~~~~~~~ -1. Download ffmpeg-CVS and copy libavcodec to mplayer (see DOC for details) - Move this line from #ifdef CONFIG_ENCODERS .. #endif section to outside - (after the #endif line) at libavcodec/utils.c:361 : - register_avcodec(&mpeg1video_encoder); +1. Download ffmpeg-CVS and copy libavcodec to mplayer (see DOCS for details) 2. Compile mplayer: ./configure should detect it. If didn't, force with ./configure --enable-dvb @@ -32,15 +27,15 @@ ~~~~~~~~~~~ To play standard mpeg 1/2 files: (hardware decoding) - mplayer -ao mpegpes -vo mpegpes -vc mpegpes file.mpg|vob + mplayer -ao mpegpes -vo mpegpes file.mpg|vob To play non-standard mpeg files: (software decoding) - mplayer -ao mpegpes -vo mpegpes file.mpg|vob + mplayer -ao mpegpes -vo mpegpes -vc mpeg12 file.mpg|vob To play divx files: - mplayer -vo mpegpes -vc ffdivx|odivx file.avi|asf + mplayer -ao mpegpes -vo mpegpes file.avi|asf|mov... To play non-25fps movies, or with slow CPU, add option: -framedrop @@ -53,6 +48,13 @@ To force pan&scan (16:9 at 4:3 TV), add options: -x 352 -y 288 +If you have powerfull CPU, you can also scale image up, using the +swscale filter. For example, to watch a 640x288 video fullscreen, +use -vop scale=640:400 +Note that you don't have to scale horizontally, the card will do it +by hardware, but you have to scale vertically keeping the aspect ratio. + + Mailing list: ~~~~~~~~~~~~~ http://mplayerhq.hu/mailman/listinfo/mplayer-dvb @@ -66,7 +68,5 @@ - display OSD and subtitles using DVB card's OSD feature - better (more fluent) playback of non-25fps movies -- more speed optimizations -- YUY2 support (for win32 codecs, like Indeo5 and WMV 7/8) - realtime transcoding between mpeg2 <-> mpeg4 (partial decompression) - +- better quality for lowres mpeg1

1 0

CVS: main/DOCS/SGML DO_NOT_USE,NONE,1.1
by Winner of tha face compo 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/DOCS/SGML In directory mplayer:/var/tmp.root/cvs-serv28837 Added Files: DO_NOT_USE Log Message: notice --- NEW FILE ---

1 0

CVS: main/DOCS/SGML c,NONE,1.1
by Winner of tha face compo 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/DOCS/SGML In directory mplayer:/var/tmp.root/cvs-serv28575 Added Files: c Log Message: "compiling" "script" .. --- NEW FILE --- #!/bin/sh sgml2html docs.sgml

1 0

CVS: main/DOCS/SGML docs.sgml,NONE,1.1
by Winner of tha face compo 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/DOCS/SGML In directory mplayer:/var/tmp.root/cvs-serv27686 Added Files: docs.sgml Log Message: temporary, B U G G Y, work-in-progess version, commited for others' review (contains the HTML docs, without Diego's latest codecs.html patch) will be deleted, removed, moved, and abused in every possible way ;) don't use for reading.. :) --- NEW FILE --- <!doctype linuxdoc system> <article> <title>MPlayer - The Movie Player for Linux - Documentation <author>Gabucino, gabucino(a)mplayerhq.hu <date>v0.9, 2002 April 07 <abstract> </abstract> <toc> <sect>How to read this documentation<label id="0"> <p> [...6493 lines suppressed...] Now some quotes from different people about Joe Barr (just for you understand why doesn't he matter at all): <it>"You may all remember the LinuxWorld 2000, when he claimed that Linus T said that 'FreeBSD is just a handful of programmers'. Linus said NOTHING of the sort. When Joe was called on this, his reaction was to call BSD supporters assholes and jerks."</it> <it>"He's interesting, but not good at avoiding, um... controversy. Joe Barr used to be one of the regulars on Will Zachmann's Canopus forum on Compuserve, years ago. He was an OS/2 advocate then (I was an OS/2 fan too). He used to go over-the-top, flaming people, and I suspect he had some hard times, then. He's mellowed some, judging by his columns recently. Moderately subtle humor was not his mode in those earlier days, not at all."</it> </article>

1 0