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

CVS: main/libmpdemux demux_mpg.c,1.34,1.35
by Arpi of Ize 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv7626 Modified Files: demux_mpg.c Log Message: combined PS/PES sync to allow .VDR playback from stdin Index: demux_mpg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- demux_mpg.c 30 Oct 2001 17:03:10 -0000 1.34 +++ demux_mpg.c 1 Dec 2001 22:09:18 -0000 1.35 @@ -278,15 +278,8 @@ // sure: head=0x000001XX mp_dbg(MSGT_DEMUX,MSGL_DBG4,"*** head=0x%X\n",head); if(demux->synced==0){ - if(head==0x1BA) demux->synced=1; -#if 0 - else if(head>=0x1C0 && head<=0x1EF){ - demux->synced=2; - mp_msg(MSGT_DEMUX,MSGL_V,"Mpeg PES stream synced at 0x%X (%d)!\n",demux->filepos,demux->filepos); - num_elementary_packets100=0; // requires for re-sync! - num_elementary_packets101=0; // requires for re-sync! - } -#endif + if(head==0x1BA) demux->synced=1; else + if(head==0x1BD || (head>=0x1C0 && head<=0x1EF)) demux->synced=3; // PES? } else if(demux->synced==1){ if(head==0x1BB || head==0x1BD || (head>=0x1C0 && head<=0x1EF)){ @@ -296,7 +289,7 @@ num_elementary_packets101=0; // requires for re-sync! } else demux->synced=0; } // else - if(demux->synced==2){ + if(demux->synced>=2){ ret=demux_mpg_read_packet(demux,head); if(!ret) if(--max_packs==0){ @@ -304,6 +297,7 @@ mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_DoesntContainSelectedStream); return 0; } + if(demux->synced==3) demux->synced=(ret==1)?2:0; // PES detect } else { if(head>=0x100 && head<0x1B0){ if(head==0x100) ++num_elementary_packets100; else

1 0

CVS: main/DOCS/tech TODO,1.3,1.4
by Arpi of Ize 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/DOCS/tech In directory mplayer:/var/tmp.root/cvs-serv30131 Modified Files: TODO Log Message: some more stuff, vivo seek removed as being impossible Index: TODO =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TODO 29 Nov 2001 17:13:37 -0000 1.3 +++ TODO 1 Dec 2001 21:06:52 -0000 1.4 @@ -8,7 +8,6 @@ - test and cleanup FLI/FLC support (and implement seek) - check dvdread/dvdcss version problems - add -dumpstream -- implement seek for VIVO - clean up vcd support (so it can be en/disabled) - implement forward seeking in indexed avi streams @@ -33,7 +32,7 @@ - implement VBR audio copy - Estimated Size and Time - stop/resume -- image resize filter (->fix/use yuv2yuv scaler?) +- image resize filter - implement bicubic downscaling - image cut/crop filter gui: @@ -41,8 +40,12 @@ - preferences ? other: +- fix DVB a-v sync problems, switch to mp1e - dvd server - sub database - mga_vid crtc2 fix +- make mach64_vid - libvo2 - +- check if runtime cpu detection works and complete, and add ./configure option + and announce it and so on... +

1 0

CVS: main/drivers/radeon README,1.7,1.8 Makefile,1.6,1.7 radeon_vid.c,1.17,1.18
by Nick Kurshev 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/drivers/radeon In directory mplayer:/var/tmp.root/cvs-serv22119/main/drivers/radeon Modified Files: README Makefile radeon_vid.c Log Message: Minor improvements Index: README =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/README,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- README 1 Dec 2001 18:09:32 -0000 1.7 +++ README 1 Dec 2001 20:23:47 -0000 1.8 @@ -53,8 +53,19 @@ echo "deinterlace=off">/dev/radeon_vid To know more about these parameters - try read /dev/radeon_vid file ;) -Note: don't use 'cat' since it can detect EOF during reading such files. +Note: don't use 'cat' since it can't detect EOF during reading such files. (I use midnight commander for that ;) +or try this: +head -n 20 /dev/radeon_vid + +List of parameters: +~~~~~~~~~~~~~~~~~~~ +brightness=decval (-64:+63) doesn't work on radeons +saturation=decval (0:+31) doesn't work on radeons +double_buff=on/off enables/disables double buffering +colour_key=hexval defines colour key +deinterlace=on/off enables/disables adaprive deinterlacing +deinterlace_pattern=hexval defines deinterlacing pattern Note: ~~~~~ Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 1 Dec 2001 17:08:12 -0000 1.6 +++ Makefile 1 Dec 2001 20:23:47 -0000 1.7 @@ -40,7 +40,7 @@ depmod -a nodes: mknod /dev/radeon_vid c 178 0 - mknod /dev/rage128_vid c 178 0 + ln -s /dev/radeon_vid /dev/rage128_vid # Stuff below is for me only ;) vid: make install Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- radeon_vid.c 1 Dec 2001 18:22:32 -0000 1.17 +++ radeon_vid.c 1 Dec 2001 20:23:47 -0000 1.18 @@ -797,6 +797,7 @@ len += sprintf(&buf[len],PARAM_COLOUR_KEY"%X\n",besr.graphics_key_clr); len += sprintf(&buf[len],PARAM_DEINTERLACE"%s\n",besr.deinterlace_on?"on":"off"); len += sprintf(&buf[len],PARAM_DEINTERLACE_PATTERN"%X\n",besr.deinterlace_pattern); + ppos += len; return len; }

1 0

CVS: main/drivers/radeon radeon_vid.c,1.16,1.17
by Nick Kurshev 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/drivers/radeon In directory mplayer:/var/tmp.root/cvs-serv459/main/drivers/radeon Modified Files: radeon_vid.c Log Message: More information Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- radeon_vid.c 1 Dec 2001 17:57:49 -0000 1.16 +++ radeon_vid.c 1 Dec 2001 18:22:32 -0000 1.17 @@ -783,9 +783,12 @@ brightness = besr.brightness; saturation = besr.saturation; len = 0; + len += sprintf(&buf[len],"Interface version: %04X\nDriver version: %s\n",MGA_VID_VERSION,RADEON_VID_VERSION); len += sprintf(&buf[len],"Chip: %s\n",ati_card_ids[detected_chip].name); len += sprintf(&buf[len],"Memory: %p:%x\n",radeon_mem_base,radeon_ram_size*0x100000); - len += sprintf(&buf[len],"MMIO: %p\n\n",radeon_mmio_base); + len += sprintf(&buf[len],"MMIO: %p\n",radeon_mmio_base); + len += sprintf(&buf[len],"Overlay offset: %p\n",radeon_overlay_off); + len += sprintf(&buf[len],"Last fourcc: %s\n\n",fourcc_format_name(besr.fourcc)); len += sprintf(&buf[len],"Configurable stuff:\n"); len += sprintf(&buf[len],"~~~~~~~~~~~~~~~~~~~\n"); len += sprintf(&buf[len],PARAM_DOUBLE_BUFF"%s\n",besr.double_buff?"on":"off");

1 0

CVS: main/drivers/radeon README,1.6,1.7
by Nick Kurshev 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/drivers/radeon In directory mplayer:/var/tmp.root/cvs-serv30820/main/drivers/radeon Modified Files: README Log Message: More useful example Index: README =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- README 1 Dec 2001 17:08:12 -0000 1.6 +++ README 1 Dec 2001 18:09:32 -0000 1.7 @@ -49,11 +49,11 @@ You can tune up some parameters with using following trick: echo "parameter=value">/dev/radeon_vid -Example: -echo "double_buff=on">/dev/radeon_vid +Example (disables adaptive deinterlacing): +echo "deinterlace=off">/dev/radeon_vid To know more about these parameters - try read /dev/radeon_vid file ;) -Note: don't use 'cat' since it cab catch EOF during reading such files. +Note: don't use 'cat' since it can detect EOF during reading such files. (I use midnight commander for that ;) Note:

1 0

CVS: main/drivers/radeon radeon_vid.c,1.15,1.16
by Nick Kurshev 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/drivers/radeon In directory mplayer:/var/tmp.root/cvs-serv29286/main/drivers/radeon Modified Files: radeon_vid.c Log Message: More configurable stuff Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- radeon_vid.c 1 Dec 2001 17:08:37 -0000 1.15 +++ radeon_vid.c 1 Dec 2001 17:57:49 -0000 1.16 @@ -14,7 +14,7 @@ * Also here was used code from CVS of GATOS project and X11 trees. */ -#define RADEON_VID_VERSION "1.0.0" +#define RADEON_VID_VERSION "1.0.1" /* It's entirely possible this major conflicts with something else @@ -29,9 +29,7 @@ Highest priority: fbvid.h compatibility High priority: RGB/BGR 2-32, YVU9, IF09 support Middle priority: - OV0_COLOUR_CNTL brightness saturation SCALER_GAMMA_SEL_BRIGHT gamma correction ??? - OV0_GRAPHICS_KEY_CLR color key OV0_AUTO_FLIP_CNTL OV0_FILTER_CNTL OV0_VIDEO_KEY_CLR @@ -130,12 +128,16 @@ uint32_t exclusive_horz; uint32_t auto_flip_cntl; uint32_t filter_cntl; - int brightness; - int saturation; uint32_t graphics_key_msk; - uint32_t graphics_key_clr; uint32_t key_cntl; uint32_t test; + /* Configurable stuff */ + int double_buff; + int brightness; + int saturation; + uint32_t graphics_key_clr; + int deinterlace_on; + uint32_t deinterlace_pattern; } bes_registers_t; typedef struct video_registers_s @@ -187,7 +189,6 @@ static uint8_t *radeon_mmio_base = 0; static uint32_t radeon_mem_base = 0; static int32_t radeon_overlay_off = 0; -static int radeon_double_buff=1; static uint32_t radeon_ram_size = 0; static mga_vid_config_t radeon_config; @@ -276,13 +277,6 @@ OUTREG(OV0_EXCLUSIVE_HORZ, 0); OUTREG(OV0_AUTO_FLIP_CNTL, 0); /* maybe */ OUTREG(OV0_FILTER_CNTL, 0x0000000f); -/* - OUTREG(OV0_COLOUR_CNTL, (brightness & 0x7f) | - (saturation << 8) | - (saturation << 16)); - OUTREG(OV0_GRAPHICS_KEY_MSK, (1 << depth) - 1); - OUTREG(OV0_GRAPHICS_KEY_CLR, colorKey); -*/ OUTREG(OV0_KEY_CNTL, GRAPHIC_KEY_FN_NE); OUTREG(OV0_TEST, 0); } @@ -303,7 +297,7 @@ OUTREG(OV0_AUTO_FLIP_CNTL,OV0_AUTO_FLIP_CNTL_SOFT_BUF_ODD); - OUTREG(OV0_DEINTERLACE_PATTERN,0x900AAAAA); + OUTREG(OV0_DEINTERLACE_PATTERN,besr.deinterlace_pattern); OUTREG(OV0_AUTO_FLIP_CNTL,(INREG(OV0_AUTO_FLIP_CNTL)^OV0_AUTO_FLIP_CNTL_SOFT_EOF_TOGGLE)); OUTREG(OV0_AUTO_FLIP_CNTL,(INREG(OV0_AUTO_FLIP_CNTL)^OV0_AUTO_FLIP_CNTL_SOFT_EOF_TOGGLE)); @@ -335,10 +329,10 @@ OUTREG(OV0_P23_V_ACCUM_INIT, besr.p23_v_accum_init); bes_flags = SCALER_ENABLE | - SCALER_ADAPTIVE_DEINT | SCALER_SMART_SWITCH | SCALER_HORZ_PICK_NEAREST; - if(radeon_double_buff) bes_flags |= SCALER_DOUBLE_BUFFER; + if(besr.double_buff) bes_flags |= SCALER_DOUBLE_BUFFER; + if(besr.deinterlace_on) bes_flags |= SCALER_ADAPTIVE_DEINT; #ifdef RAGE128 bes_flags |= SCALER_BURST_PER_PLANE; #endif @@ -366,16 +360,6 @@ } RTRACE(RVID_MSG"OV0: SCALER=%x\n",bes_flags); OUTREG(OV0_SCALE_CNTL, bes_flags); -/* - TODO: - brightness: -64 : +63 - saturation: 0 : 31 - OUTREG(OV0_COLOUR_CNTL, (brightness & 0x7f) | - (saturation << 8) | - (saturation << 16)); - OUTREG(OV0_GRAPHICS_KEY_CLR, colkey_red | colkey_green << 8 | colkey_blue << 16); - -*/ OUTREG(OV0_REG_LOAD_CNTL, 0); } @@ -550,7 +534,7 @@ static void radeon_vid_frame_sel(int frame) { uint32_t off0,off1,off2; - if(!radeon_double_buff) return; + if(!besr.double_buff) return; if(frame%2) { off0 = besr.vid_buf3_base_adrs; @@ -571,12 +555,23 @@ OUTREG(OV0_REG_LOAD_CNTL, 0); } +static void radeon_vid_make_default(void) +{ + besr.deinterlace_pattern = 0x900AAAAA; + OUTREG(OV0_DEINTERLACE_PATTERN,besr.deinterlace_pattern); + besr.deinterlace_on=1; + besr.double_buff=1; +} + + static void radeon_vid_preset(void) { unsigned tmp; tmp = INREG(OV0_COLOUR_CNTL); besr.saturation = (tmp>>8)&0x1f; besr.brightness = tmp & 0x7f; + besr.graphics_key_clr = INREG(OV0_GRAPHICS_KEY_CLR); + besr.deinterlace_pattern = INREG(OV0_DEINTERLACE_PATTERN); } static int video_on = 0; @@ -777,6 +772,9 @@ #define PARAM_BRIGHTNESS "brightness=" #define PARAM_SATURATION "saturation=" #define PARAM_DOUBLE_BUFF "double_buff=" +#define PARAM_COLOUR_KEY "colour_key=" +#define PARAM_DEINTERLACE "deinterlace=" +#define PARAM_DEINTERLACE_PATTERN "deinterlace_pattern=" static ssize_t radeon_vid_read(struct file *file, char *buf, size_t count, loff_t *ppos) { @@ -787,11 +785,15 @@ len = 0; len += sprintf(&buf[len],"Chip: %s\n",ati_card_ids[detected_chip].name); len += sprintf(&buf[len],"Memory: %p:%x\n",radeon_mem_base,radeon_ram_size*0x100000); - len += sprintf(&buf[len],"MMIO: %p\n",radeon_mmio_base); + len += sprintf(&buf[len],"MMIO: %p\n\n",radeon_mmio_base); len += sprintf(&buf[len],"Configurable stuff:\n"); - len += sprintf(&buf[len],PARAM_DOUBLE_BUFF"%s\n",radeon_double_buff?"on":"off"); + len += sprintf(&buf[len],"~~~~~~~~~~~~~~~~~~~\n"); + len += sprintf(&buf[len],PARAM_DOUBLE_BUFF"%s\n",besr.double_buff?"on":"off"); len += sprintf(&buf[len],PARAM_BRIGHTNESS"%i\n",brightness); len += sprintf(&buf[len],PARAM_SATURATION"%u\n",saturation); + len += sprintf(&buf[len],PARAM_COLOUR_KEY"%X\n",besr.graphics_key_clr); + len += sprintf(&buf[len],PARAM_DEINTERLACE"%s\n",besr.deinterlace_on?"on":"off"); + len += sprintf(&buf[len],PARAM_DEINTERLACE_PATTERN"%X\n",besr.deinterlace_pattern); return len; } @@ -803,8 +805,8 @@ brightness=simple_strtol(&buf[strlen(PARAM_BRIGHTNESS)],NULL,10); if(brightness >= -64 && brightness <= 63) OUTREG(OV0_COLOUR_CNTL, (brightness & 0x7f) | - (besr.saturation << 8) | - (besr.saturation << 16)); + (besr.saturation << 8) | + (besr.saturation << 16)); } else if(memcmp(buf,PARAM_SATURATION,min(count,strlen(PARAM_SATURATION))) == 0) @@ -813,14 +815,34 @@ saturation=simple_strtol(&buf[strlen(PARAM_SATURATION)],NULL,10); if(saturation >= 0 && saturation <= 31) OUTREG(OV0_COLOUR_CNTL, (besr.brightness & 0x7f) | - (saturation << 8) | - (saturation << 16)); + (saturation << 8) | + (saturation << 16)); } else if(memcmp(buf,PARAM_DOUBLE_BUFF,min(count,strlen(PARAM_DOUBLE_BUFF))) == 0) { - if(memcmp(&buf[strlen(PARAM_DOUBLE_BUFF)],"on",2) == 0) radeon_double_buff = 1; - else radeon_double_buff = 0; + if(memcmp(&buf[strlen(PARAM_DOUBLE_BUFF)],"on",2) == 0) besr.double_buff = 1; + else besr.double_buff = 0; + } + else + if(memcmp(buf,PARAM_COLOUR_KEY,min(count,strlen(PARAM_COLOUR_KEY))) == 0) + { + long ckey; + ckey=simple_strtol(&buf[strlen(PARAM_COLOUR_KEY)],NULL,16); + OUTREG(OV0_GRAPHICS_KEY_CLR, ckey); + } + else + if(memcmp(buf,PARAM_DEINTERLACE,min(count,strlen(PARAM_DEINTERLACE))) == 0) + { + if(memcmp(&buf[strlen(PARAM_DEINTERLACE)],"on",2) == 0) besr.deinterlace_on = 1; + else besr.deinterlace_on = 0; + } + else + if(memcmp(buf,PARAM_DEINTERLACE_PATTERN,min(count,strlen(PARAM_DEINTERLACE_PATTERN))) == 0) + { + long dpat; + dpat=simple_strtol(&buf[strlen(PARAM_DEINTERLACE_PATTERN)],NULL,16); + OUTREG(OV0_DEINTERLACE_PATTERN, dpat); } radeon_vid_preset(); return count; @@ -922,6 +944,7 @@ return -EINVAL; } radeon_vid_save_state(); + radeon_vid_make_default(); radeon_vid_preset(); return(0); }

1 0

CVS: main/libmpdemux tv.c,1.14,1.15
by Alex Beregszaszi 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv26574 Modified Files: tv.c Log Message: init_v4l only present if HAVE_TV_V4L Index: tv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- tv.c 17 Nov 2001 00:23:03 -0000 1.14 +++ tv.c 1 Dec 2001 17:41:59 -0000 1.15 @@ -307,8 +307,10 @@ { if (!strcmp(tv_param_driver, "dummy")) return (tvi_handle_t *)tvi_init_dummy(tv_param_device); +#ifdef HAVE_TV_V4L if (!strcmp(tv_param_driver, "v4l")) return (tvi_handle_t *)tvi_init_v4l(tv_param_device); +#endif mp_msg(MSGT_TV, MSGL_ERR, "No such driver: %s\n", tv_param_driver); return(NULL);

1 0

CVS: main configure,1.310,1.311
by pl 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv22114 Modified Files: configure Log Message: linux() bsd() ... etc is no longer case sensitive (workaround for gabucino's not wanting to type --target=i386-Linux :)) unified a few echores messages Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- configure 1 Dec 2001 15:05:08 -0000 1.310 +++ configure 1 Dec 2001 17:17:32 -0000 1.311 @@ -51,16 +51,19 @@ } # OS test booleans functions -linux() { test "$system_name" = "Linux" ; return "$?" ; } -sunos() { test "$system_name" = "SunOS" ; return "$?" ; } -irix() { test "$system_name" = "IRIX" ; return "$?" ; } -cygwin() { test "$system_name" = "CYGWIN" ; return "$?" ; } -freebsd() { test "$system_name" = "FreeBSD" ; return "$?" ; } -netbsd() { test "$system_name" = "NetBSD" ; return "$?" ; } -bsdos() { test "$system_name" = "BSD/OS" ; return "$?" ; } -openbsd() { test "$system_name" = "OpenBSD" ; return "$?" ; } +issystem() { + test "`echo $system_name | tr A-Z a-z`" = "`echo $1 | tr A-Z a-z`" +} +linux() { issystem "Linux" ; return "$?" ; } +sunos() { issystem "SunOS" ; return "$?" ; } +irix() { issystem "IRIX" ; return "$?" ; } +cygwin() { issystem "CYGWIN" ; return "$?" ; } +freebsd() { issystem "FreeBSD" ; return "$?" ; } +netbsd() { issystem "NetBSD" ; return "$?" ; } +bsdos() { issystem "BSD/OS" ; return "$?" ; } +openbsd() { issystem "OpenBSD" ; return "$?" ; } bsd() { freebsd || netbsd || bsdos || openbsd ; return "$?" ; } -qnx() { test "$system_name" = "QNX" ; return "$?" ; } +qnx() { issystem "QNX" ; return "$?" ; } # arch test boolean functions x86() { @@ -1043,9 +1046,9 @@ cc_check $_ld_sock -lsocket && _ld_sock="$_ld_sock -lsocket" cc_check $_ld_sock -lnsl && _ld_sock="$_ld_sock -lnsl" if test "$_ld_sock" ; then - echores "using $_ld_sock" + echores "yes (using $_ld_sock)" else - echores "not needed" + echores "no" fi @@ -1163,7 +1166,7 @@ else die "Lib pthread not found. (needed by windows and networking stuff)" fi -echores "using $_ld_pthread" +echores "yes (using $_ld_pthread)" echocheck "sys/soundcard.h" @@ -1373,11 +1376,11 @@ if test "$_xdpms4" = yes ; then _def_xdpms='#define HAVE_XDPMS 1' - echores "using xdpms4" + echores "yes (using Xdpms 4)" elif test "$_xdpms3" = yes ; then _def_xdpms='#define HAVE_XDPMS 1' _ld_x11="$_ld_x11 -lXdpms" - echores "using xdpms3" + echores "yes (using Xdpms 3)" else _def_xdpms='#undef HAVE_XDPMS' echores "no" @@ -1480,14 +1483,14 @@ _ld_dga='-lXxf86dga' _vosrc="$_vosrc vo_dga.c" _vomodules="dga $_vomodules" - echores "using DGA 1.0" + echores "yes (using DGA 1.0)" elif test "$_dga" = 2 ; then _def_dga='#define HAVE_DGA 1' _def_dga2='#define HAVE_DGA2 1' _ld_dga='-lXxf86dga' _vosrc="$_vosrc vo_dga.c" _vomodules="dga $_vomodules" - echores "using DGA 2.0" + echores "yes (using DGA 2.0)" elif test "$_dga" = no ; then echores "no" else @@ -1686,9 +1689,9 @@ if x86 && linux ; then _vosrc="$_vosrc vo_vesa.c vesa_lvo.c" _vomodules="vesa $_vomodules" - echores "ok" + echores "yes" else - echores "not supported on this OS/architecture" + echores "no (not supported on this OS/architecture" fi

1 0

CVS: main/drivers/radeon radeon_vid.c,1.14,1.15
by Nick Kurshev 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/drivers/radeon In directory mplayer:/var/tmp.root/cvs-serv20918/main/drivers/radeon Modified Files: radeon_vid.c Log Message: Tune up driver through reading and writing /dev/radeon_vid ;) Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- radeon_vid.c 29 Nov 2001 17:07:52 -0000 1.14 +++ radeon_vid.c 1 Dec 2001 17:08:37 -0000 1.15 @@ -130,7 +130,8 @@ uint32_t exclusive_horz; uint32_t auto_flip_cntl; uint32_t filter_cntl; - uint32_t colour_cntl; + int brightness; + int saturation; uint32_t graphics_key_msk; uint32_t graphics_key_clr; uint32_t key_cntl; @@ -186,7 +187,7 @@ static uint8_t *radeon_mmio_base = 0; static uint32_t radeon_mem_base = 0; static int32_t radeon_overlay_off = 0; - +static int radeon_double_buff=1; static uint32_t radeon_ram_size = 0; static mga_vid_config_t radeon_config; @@ -334,10 +335,10 @@ OUTREG(OV0_P23_V_ACCUM_INIT, besr.p23_v_accum_init); bes_flags = SCALER_ENABLE | - SCALER_DOUBLE_BUFFER | SCALER_ADAPTIVE_DEINT | SCALER_SMART_SWITCH | SCALER_HORZ_PICK_NEAREST; + if(radeon_double_buff) bes_flags |= SCALER_DOUBLE_BUFFER; #ifdef RAGE128 bes_flags |= SCALER_BURST_PER_PLANE; #endif @@ -549,6 +550,7 @@ static void radeon_vid_frame_sel(int frame) { uint32_t off0,off1,off2; + if(!radeon_double_buff) return; if(frame%2) { off0 = besr.vid_buf3_base_adrs; @@ -569,6 +571,14 @@ OUTREG(OV0_REG_LOAD_CNTL, 0); } +static void radeon_vid_preset(void) +{ + unsigned tmp; + tmp = INREG(OV0_COLOUR_CNTL); + besr.saturation = (tmp>>8)&0x1f; + besr.brightness = tmp & 0x7f; +} + static int video_on = 0; static int radeon_vid_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) @@ -730,6 +740,8 @@ #endif }; +static int detected_chip; + static int radeon_vid_config_card(void) { struct pci_dev *dev = NULL; @@ -756,20 +768,62 @@ /* mem size is bits [28:0], mask off the rest. Range: from 1Mb up to 512 Mb */ radeon_ram_size &= CONFIG_MEMSIZE_MASK; radeon_ram_size /= 0x100000; + detected_chip = i; printk(RVID_MSG"Found %s (%uMb memory)\n",ati_card_ids[i].name,radeon_ram_size); return TRUE; } +#define PARAM_BRIGHTNESS "brightness=" +#define PARAM_SATURATION "saturation=" +#define PARAM_DOUBLE_BUFF "double_buff=" static ssize_t radeon_vid_read(struct file *file, char *buf, size_t count, loff_t *ppos) { - return -EINVAL; + unsigned len,saturation; + long brightness; + brightness = besr.brightness; + saturation = besr.saturation; + len = 0; + len += sprintf(&buf[len],"Chip: %s\n",ati_card_ids[detected_chip].name); + len += sprintf(&buf[len],"Memory: %p:%x\n",radeon_mem_base,radeon_ram_size*0x100000); + len += sprintf(&buf[len],"MMIO: %p\n",radeon_mmio_base); + len += sprintf(&buf[len],"Configurable stuff:\n"); + len += sprintf(&buf[len],PARAM_DOUBLE_BUFF"%s\n",radeon_double_buff?"on":"off"); + len += sprintf(&buf[len],PARAM_BRIGHTNESS"%i\n",brightness); + len += sprintf(&buf[len],PARAM_SATURATION"%u\n",saturation); + return len; } static ssize_t radeon_vid_write(struct file *file, const char *buf, size_t count, loff_t *ppos) { - return -EINVAL; + if(memcmp(buf,PARAM_BRIGHTNESS,min(count,strlen(PARAM_BRIGHTNESS))) == 0) + { + long brightness; + brightness=simple_strtol(&buf[strlen(PARAM_BRIGHTNESS)],NULL,10); + if(brightness >= -64 && brightness <= 63) + OUTREG(OV0_COLOUR_CNTL, (brightness & 0x7f) | + (besr.saturation << 8) | + (besr.saturation << 16)); + } + else + if(memcmp(buf,PARAM_SATURATION,min(count,strlen(PARAM_SATURATION))) == 0) + { + long saturation; + saturation=simple_strtol(&buf[strlen(PARAM_SATURATION)],NULL,10); + if(saturation >= 0 && saturation <= 31) + OUTREG(OV0_COLOUR_CNTL, (besr.brightness & 0x7f) | + (saturation << 8) | + (saturation << 16)); + } + else + if(memcmp(buf,PARAM_DOUBLE_BUFF,min(count,strlen(PARAM_DOUBLE_BUFF))) == 0) + { + if(memcmp(&buf[strlen(PARAM_DOUBLE_BUFF)],"on",2) == 0) radeon_double_buff = 1; + else radeon_double_buff = 0; + } + radeon_vid_preset(); + return count; } static int radeon_vid_mmap(struct file *file, struct vm_area_struct *vma) @@ -868,6 +922,7 @@ return -EINVAL; } radeon_vid_save_state(); + radeon_vid_preset(); return(0); }

1 0

CVS: main/drivers/radeon Makefile,1.5,1.6 README,1.5,1.6
by Nick Kurshev 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/drivers/radeon In directory mplayer:/var/tmp.root/cvs-serv20813/main/drivers/radeon Modified Files: Makefile README Log Message: Improving auto-install Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 1 Dec 2001 15:22:10 -0000 1.5 +++ Makefile 1 Dec 2001 17:08:12 -0000 1.6 @@ -38,6 +38,11 @@ cp radeon_vid.o $(MOD_PATH) cp rage128_vid.o $(MOD_PATH) depmod -a +nodes: mknod /dev/radeon_vid c 178 0 mknod /dev/rage128_vid c 178 0 - +# Stuff below is for me only ;) +vid: + make install + rmmod radeon_vid + modprobe radeon_vid Index: README =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README 1 Dec 2001 15:22:10 -0000 1.5 +++ README 1 Dec 2001 17:08:12 -0000 1.6 @@ -33,6 +33,8 @@ Simply type two commands in this directory: make make install +If you install it first time then type also: +make nodes Using with mplayer: ~~~~~~~~~~~~~~~~~~~ @@ -41,6 +43,18 @@ mplayer -vo vesa:lvo:/dev/radeon_vid -<your options> filename or mplayer -vo vesa:lvo:/dev/rage128_vid -<your options> filename + +Configuring: +~~~~~~~~~~~~ + +You can tune up some parameters with using following trick: +echo "parameter=value">/dev/radeon_vid +Example: +echo "double_buff=on">/dev/radeon_vid + +To know more about these parameters - try read /dev/radeon_vid file ;) +Note: don't use 'cat' since it cab catch EOF during reading such files. +(I use midnight commander for that ;) Note: ~~~~~

1 0