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

CVS: main/vidix/drivers nvidia_vid.c,1.8,1.9
by Sascha Sommer CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/vidix/drivers In directory mail:/var/tmp.root/cvs-serv8562/vidix/drivers Modified Files: nvidia_vid.c Log Message: make it work in textmode again && support for nv03 with 4MB RAM Index: nvidia_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/nvidia_vid.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nvidia_vid.c 1 Oct 2003 21:03:00 -0000 1.8 +++ nvidia_vid.c 2 Oct 2003 10:46:33 -0000 1.9 @@ -409,31 +409,35 @@ } } +static void nv_waitidle(struct rivatv_info *info ){ + while (info->chip.PGRAPH[0x1C0] & 1) {} +} + /* Start overlay video. */ void rivatv_overlay_start (struct rivatv_info *info,int bufno){ uint32_t base, size, offset, xscale, yscale, pan,bpp, pitch0=0; - int x, y; + int x=8, y=8; int lwidth=info->d_width, lheight=info->d_height; int bps; + size = info->buffer_size; + base = info->picture_offset; + offset = bufno*size; /*update depth & dimensions here because it may change with vo vesa or vo fbdev*/ info->chip.lock (&info->chip, 0); - do { + nv_waitidle(info); switch (info->chip.arch) { case NV_ARCH_03: pitch0 = info->chip.PGRAPH[0x00000650/4]; break; - case NV_ARCH_04: + case NV_ARCH_04: case NV_ARCH_10: case NV_ARCH_20: case NV_ARCH_30: pitch0 = info->chip.PGRAPH[0x00000670/4]; break; } - if (pitch0 == 0) - printf("[nvidia_vid]: pitch0 = 0!!! Rereading\n"); - } while (pitch0 == 0); VID_WR08(info->chip.PCIO, 0x03D4, 0x28); bpp = VID_RD08(info->chip.PCIO,0x03D5); if(bpp==3)bpp = 4; //fixme do nvidia cards support 24bpp? @@ -444,32 +448,35 @@ { // printf("[nvidia_vid] video mode: %ux%u@%u\n",info->screen_x = pitch0/bpp,(pitch0/bpp*3)/4,info->depth); info->screen_x = pitch0/bpp; + bps = info->screen_x * ((info->depth+1)/8); + /* get pan offset of the physical screen */ + pan = rivatv_overlay_pan (info); + /* adjust window position depending on the pan offset */ + x = info->wx - (pan % bps) * 8 / info->depth; + y = info->wy - (pan / bps); + /* adjust negative output window variables */ + if (x < 0) { + lwidth = info->d_width + x; + offset += (-x * info->width / info->d_width) << 1; +// offset += (-window->x * port->vld_width / window->width) << 1; + x = 0; + } + if (y < 0) { + lheight = info->d_height + y; + offset += (-y * info->height / info->d_height * info->width) << 1; +// offset += (-window->y * port->vld_height / window->height * port->org_width) << 1; + y = 0; + } + + + + + + } - - bps = info->screen_x * ((info->depth+1)/8); - /* get pan offset of the physical screen */ - pan = rivatv_overlay_pan (info); - size = info->buffer_size; - /* adjust window position depending on the pan offset */ - x = info->wx - (pan % bps) * 8 / info->depth; - y = info->wy - (pan / bps); - base = info->picture_offset; - offset = bufno*size; - /* adjust negative output window variables */ - if (x < 0) { - lwidth = info->d_width + x; - offset += (-x * info->width / info->d_width) << 1; -// offset += (-window->x * port->vld_width / window->width) << 1; - x = 0; - } - if (y < 0) { - lheight = info->d_height + y; - offset += (-y * info->height / info->d_height * info->width) << 1; -// offset += (-window->y * port->vld_height / window->height * port->org_width) << 1; - y = 0; - } + switch (info->chip.arch) { case NV_ARCH_10: @@ -601,6 +608,11 @@ } + + + + + static rivatv_info* info; @@ -648,7 +660,7 @@ /* This maps framebuffer @6MB, thus 2MB are left for video. */ info->video_base = map_phys_mem(pci_info.base1, info->chip.fbsize); /* This may trash your screen for resolutions greater than 1024x768, sorry. */ - info->picture_offset = 2*1024*768*4 ; + info->picture_offset = 1024*768* 4 * ((info->chip.fbsize > 4194304)?2:1); info->picture_base = (uint32_t) info->video_base + info->picture_offset; info->chip.PRAMIN = (uint32_t *) (info->video_base + 0x00C00000); break; @@ -677,21 +689,18 @@ { uint32_t bpp=0,pitch0=0; info->chip.lock (&info->chip, 0); - do { + nv_waitidle(info); switch (info->chip.arch) { case NV_ARCH_03: pitch0 = info->chip.PGRAPH[0x00000650/4]; break; - case NV_ARCH_04: + case NV_ARCH_04: case NV_ARCH_10: case NV_ARCH_20: case NV_ARCH_30: pitch0 = info->chip.PGRAPH[0x00000670/4]; break; } - if (pitch0 == 0) - printf("[nvidia_vid]: pitch0 = 0!!! Rereading\n"); - } while (pitch0 == 0); VID_WR08(info->chip.PCIO, 0x03D4, 0x28); bpp = VID_RD08(info->chip.PCIO,0x03D5); if(bpp==3)bpp = 4; //fixme do nvidia cards support 24bpp?

1 0

CVS: homepage/src projects.src.en,1.17,1.18 projects.src.hu,1.14,1.15
by Diego Biurrun CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/homepage/src In directory mail:/var/tmp.root/cvs-serv13088/src Modified Files: projects.src.en projects.src.hu Log Message: Windows section added, typos. Index: projects.src.en =================================================================== RCS file: /cvsroot/mplayer/homepage/src/projects.src.en,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- projects.src.en 29 Sep 2003 23:38:00 -0000 1.17 +++ projects.src.en 2 Oct 2003 01:18:51 -0000 1.18 @@ -58,6 +58,22 @@ </ul> + Windows + + +<ul> + <li>beta releases (<a href="http://www.mplayerhq.hu/MPlayer/releases/win32-beta/">http://www.mplayerhq.hu/MPlayer/releases/win32-beta/</a>) + beta releases of MPlayer for Windows by Sascha Sommer</li> + <li>Installer packages (<a href="http://joey.nicewarrior.org/cygmp/">http://joey.nicewarrior.org/cygmp/</a>) + packages with installer and file associations by Joey Parrish</li> + <li>Binary installer (<a href="http://www.csant.info/mplayer.htm">http://www.csant.info/mplayer.htm</a>) + Windows installer package, documentation and codecs by Claudio + Santambrogio</li> + <li>MPlayer on win32 (<a href="http://oss.netfarm.it/mplayer-win32.php">http://oss.netfarm.it/mplayer-win32.php</a>) + binaries and supporting libraries by Gianluigi Tiesi</li> +</ul> + + Miscellaneous @@ -93,18 +109,18 @@ <li>MPlayer for Zaurus (<a href="http://www.killefiz.de/zaurus/showdetail.php?app=353">http://www.killefiz.de/zaurus/showdetail.php?app=353</a>) Zaurus port of MPlayer</li> <li>X-Box MediaPlayer (<a href="http://xbplayer.sf.net">http://xbplayer.sf.net</a>) - This project uses MPlayer and ffmpeg to form a media player on the X-Box + This project uses MPlayer and FFmpeg to form a media player on the X-Box platform. There used to be some license problems, but now they seem to be GPL-compliant.</li> <li>PS2 MediaPlayer (<a href="http://ps2reality.net">http://ps2reality.net</a>) It's a media player for the Playstation 2, using - ffmpeg. Their changes to ffmpeg can be found in the ffmpeg-devel + FFmpeg. Their changes to FFmpeg can be found in the ffmpeg-devel mailing list archives.</li> <li>BroadQ / QCast Tuner (<a href="http://www.broadq.com">http://www.broadq.com</a>) - A media player for the Playstation 2, using ffmpeg. Yet to receive their - modified ffmpeg sources.</li> + A media player for the Playstation 2, using FFmpeg. Yet to receive their + modified FFmpeg sources.</li> <li>LindowsOS (<a href="http://www.lindowsos.com">http://www.lindowsos.com</a>) Uses MPlayer as standard media player. Advertised as: "MPlayer - The Ultimate Media Player for LindowsOS..."</li> @@ -128,7 +144,7 @@ This russian program is (was?) the exact copy of MPlayer, plus OS/2 video+audio output drivers.</li> <li>QuickView Pro (<a href="http://linuxvideo.info">http://linuxvideo.info</a>) - Closed source media player for DOS and Linux, using ffmpeg. Its license + Closed source media player for DOS and Linux, using FFmpeg. Its license conflicts with LGPL (forbids reverse engineering).</li> </ul> Index: projects.src.hu =================================================================== RCS file: /cvsroot/mplayer/homepage/src/projects.src.hu,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- projects.src.hu 29 Sep 2003 23:38:00 -0000 1.14 +++ projects.src.hu 2 Oct 2003 01:18:51 -0000 1.15 @@ -58,6 +58,22 @@ </ul> + Windows + + +<ul> + <li>beta releases (<a href="http://www.mplayerhq.hu/MPlayer/releases/win32-beta/">http://www.mplayerhq.hu/MPlayer/releases/win32-beta/</a>) + beta releases of MPlayer for Windows by Sascha Sommer</li> + <li>Installer packages (<a href="http://joey.nicewarrior.org/cygmp/">http://joey.nicewarrior.org/cygmp/</a>) + packages with installer and file associations by Joey Parrish</li> + <li>Binary installer (<a href="http://www.csant.info/mplayer.htm">http://www.csant.info/mplayer.htm</a>) + Windows installer package, documentation and codecs by Claudio + Santambrogio</li> + <li>MPlayer on win32 (<a href="http://oss.netfarm.it/mplayer-win32.php">http://oss.netfarm.it/mplayer-win32.php</a>) + binaries and supporting libraries by Gianluigi Tiesi</li> +</ul> + + Miscellaneous @@ -93,18 +109,18 @@ <li>MPlayer for Zaurus (<a href="http://www.killefiz.de/zaurus/showdetail.php?app=353">http://www.killefiz.de/zaurus/showdetail.php?app=353</a>) Zaurus port of MPlayer</li> <li>X-Box MediaPlayer (<a href="http://xbplayer.sf.net">http://xbplayer.sf.net</a>) - This project uses MPlayer and ffmpeg to form a media player on the X-Box + This project uses MPlayer and FFmpeg to form a media player on the X-Box platform. There used to be some license problems, but now they seem to be GPL-compliant.</li> <li>PS2 MediaPlayer (<a href="http://ps2reality.net">http://ps2reality.net</a>) It's a media player for the Playstation 2, using - ffmpeg. Their changes to ffmpeg can be found in the ffmpeg-devel + FFmpeg. Their changes to FFmpeg can be found in the ffmpeg-devel mailing list archives.</li> <li>BroadQ / QCast Tuner (<a href="http://www.broadq.com">http://www.broadq.com</a>) - A media player for the Playstation 2, using ffmpeg. Yet to receive their - modified ffmpeg sources.</li> + A media player for the Playstation 2, using FFmpeg. Yet to receive their + modified FFmpeg sources.</li> <li>LindowsOS (<a href="http://www.lindowsos.com">http://www.lindowsos.com</a>) Uses MPlayer as standard media player. Advertised as: "MPlayer - The Ultimate Media Player for LindowsOS..."</li> @@ -128,7 +144,7 @@ This russian program is (was?) the exact copy of MPlayer, plus OS/2 video+audio output drivers.</li> <li>QuickView Pro (<a href="http://linuxvideo.info">http://linuxvideo.info</a>) - Closed source media player for DOS and Linux, using ffmpeg. Its license + Closed source media player for DOS and Linux, using FFmpeg. Its license conflicts with LGPL (forbids reverse engineering).</li> </ul>

2 1

CVS: main/DOCS/hu video.html,1.88,1.89
by Gabucino 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/DOCS/hu In directory mail:/var/tmp.root/cvs-serv27485 Modified Files: video.html Log Message: sync Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/hu/video.html,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- video.html 1 Sep 2003 19:47:34 -0000 1.88 +++ video.html 2 Oct 2003 09:41:14 -0000 1.89 @@ -1285,7 +1285,7 @@ A <CODE>-zrcrop</CODE> használatával állítható be a cinerama mód is. Tegyük fel hogy 2 kivetítõd van. A bal oldali a <CODE>/dev/video1</CODE>-en, a jobb oldali pedig a <CODE>/dev/video0</CODE>-án érhetõ el. A film mérete - <CODE>704x288</CODE>. Tegyük fel továbbá hogy a jobb oldalit fekete + <CODE>704x288</CODE>. Tegyük fel továbbá hogy a bal oldalit fekete fehérbe akarod állítani, 10-es JPEG minõségre: <PRE>

1 0

CVS: main/DOCS/hu mplayer.1,1.85,1.86
by Gabucino 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/DOCS/hu In directory mail:/var/tmp.root/cvs-serv27194 Modified Files: mplayer.1 Log Message: sync Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/hu/mplayer.1,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- mplayer.1 1 Oct 2003 07:17:29 -0000 1.85 +++ mplayer.1 2 Oct 2003 09:40:08 -0000 1.86 @@ -3078,6 +3078,11 @@ .B cbp\ \ \ \ Rate distorted optimal coded block pattern .TP +.B mv0\ \ \ \ +megpróbál minden MB-t MV=<0,0>-vel kódólni, majd kiválasztja +a legjobbat. +Nincs hatása, ha mbd=0 +.TP .IPs last_pred=<0\-99> Amount of motion predictors from the previous frame .RSss

1 0

CVS: main/DOCS/en video.html,1.151,1.152
by Diego Biurrun CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/DOCS/en In directory mail:/var/tmp.root/cvs-serv24844/DOCS/en Modified Files: video.html Log Message: Clumsy wording improved byRuben Garcia <ruben(a)ugr.es> and Torinthiel <torinthiel(a)wp.pl>. Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/en/video.html,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- video.html 1 Sep 2003 18:34:31 -0000 1.151 +++ video.html 2 Oct 2003 00:03:09 -0000 1.152 @@ -749,7 +749,7 @@ <LI>You have chances to get working TV-out. (It's known at least for ATI's cards).</LI> <LI>This driver calls int 10h handler thus it's not an emulator - it - calls real things of real BIOS in real-mode. (Finely - + calls real things of real BIOS in real-mode (actually in vm86 mode).</LI> <LI>You can use VIDIX with it, thus getting accelerated video display AND TV output at the same time! (recommended for ATI cards)</LI>

2 2

CVS: main/DOCS/xml/en video.xml,1.17,1.18
by Diego Biurrun CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/DOCS/xml/en In directory mail:/var/tmp.root/cvs-serv5149/xml/en Modified Files: video.xml Log Message: Typos and some confusion noticed by Lukasz frogu Proszek <l_j_p(a)wp.pl>. Index: video.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/video.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- video.xml 2 Oct 2003 00:03:33 -0000 1.17 +++ video.xml 2 Oct 2003 00:36:54 -0000 1.18 @@ -1862,13 +1862,13 @@ </para> <para> -Extra occurances of <option>-zrcrop</option> invoke <emphasis>cinerama</emphasis> -ode, i.e. you can distribute the movie over several TV's or beamers to create a +Extra occurrences of <option>-zrcrop</option> invoke <emphasis>cinerama</emphasis> +mode, i.e. you can distribute the movie over several TV's or beamers to create a larger screen. Suppose you have two beamers. The left one is connected to your Buz at <systemitem>/dev/video1</systemitem> and the right one is connected to your DC10+ at <systemitem>/dev/video0</systemitem>. The movie has a resolution of 704x288. Suppose also that you want the right beamer in black and white and -that the right beamer should have jpeg frames at quality 10, then you would +that the left beamer should have JPEG frames at quality 10, then you would issue the following command <screen> mplayer -vo zr -zrdev /dev/video0 -zrcrop 352x288+352+0 -zrxdoff 0 -zrbw \

1 0

CVS: main/DOCS/en video.html,1.152,1.153
by Diego Biurrun CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/DOCS/en In directory mail:/var/tmp.root/cvs-serv5149/en Modified Files: video.html Log Message: Typos and some confusion noticed by Lukasz frogu Proszek <l_j_p(a)wp.pl>. Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/en/video.html,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- video.html 2 Oct 2003 00:03:09 -0000 1.152 +++ video.html 2 Oct 2003 00:36:30 -0000 1.153 @@ -1366,13 +1366,13 @@ mplayer -vo zr -vf crop=720:320:80:0 benhur.avi </PRE> -Extra occurances of <CODE>-zrcrop</CODE> invoke cinerama mode, i.e. +Extra occurrences of <CODE>-zrcrop</CODE> invoke cinerama mode, i.e. you can distribute the movie over several TV's or beamers to create a larger screen. Suppose you have two beamers. The left one is connected to your Buz at <CODE>/dev/video1</CODE> and the right one is connected to your DC10+ at <CODE>/dev/video0</CODE>. The movie has a resolution of <CODE>704x288</CODE>. Suppose also that you want the right beamer in black and white and that - the right beamer should have jpeg frames at quality <CODE>10</CODE>, + the left beamer should have JPEG frames at quality <CODE>10</CODE>, then you would issue the following command <PRE>

1 0

CVS: main/libmpcodecs ve_lavc.c,1.75,1.76
by Michael Niedermayer CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv3358/libmpcodecs Modified Files: ve_lavc.c Log Message: mv0 Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- ve_lavc.c 30 Sep 2003 22:32:13 -0000 1.75 +++ ve_lavc.c 2 Oct 2003 00:28:04 -0000 1.76 @@ -130,6 +130,7 @@ static char *lavc_param_intra_matrix = NULL; static char *lavc_param_inter_matrix = NULL; static int lavc_param_cbp= 0; +static int lavc_param_mv0= 0; #include "m_option.h" @@ -228,6 +229,9 @@ #if LIBAVCODEC_BUILD >= 4681 {"cbp", &lavc_param_cbp, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD, NULL}, #endif +#if LIBAVCODEC_BUILD >= 4683 + {"mv0", &lavc_param_mv0, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0, NULL}, +#endif {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif @@ -471,6 +475,7 @@ lavc_venc_context->flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0; lavc_venc_context->flags|= lavc_param_data_partitioning; lavc_venc_context->flags|= lavc_param_cbp; + lavc_venc_context->flags|= lavc_param_mv0; if(lavc_param_gray) lavc_venc_context->flags|= CODEC_FLAG_GRAY; if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;

1 0

CVS: main ChangeLog,1.60,1.61
by Diego Biurrun CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv25734 Modified Files: ChangeLog Log Message: typos and lavc voodoo Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ChangeLog 30 Sep 2003 00:53:51 -0000 1.60 +++ ChangeLog 2 Oct 2003 00:07:32 -0000 1.61 @@ -12,9 +12,9 @@ * numerous sections updated Ports: - * initial Amiga/MorphOS (throught GeekGadgets) support + * initial Amiga/MorphOS (through GeekGadgets) support * libmenu now works on mingw - * freebsd 5.x (libkse/libthr) support in win32 dll loader + * freebsd 5.x (libkse/libthr) support in win32 DLL loader * fixed mpdvdkit on mingw * slave mode, vobsub and mencoder support on windows * finally fixed the compilation on non-mvi capable alpha CPUs @@ -26,7 +26,7 @@ * disabled internal FAAD when using buggy GCC * --enable-externalfaad option to force using external FAAD library * imaadpcm bug fixed - * ViVD v2 codec support (dll only) + * ViVD v2 codec support (DLL only) * QuickTime codecs support inside Matroska * improved seeking inside Matroska * some bugs with DMO codecs have been fixed @@ -47,12 +47,13 @@ * Xan DPCM, DK3 & DK4 ADPCM audio decoders * detect old xvid with fourcc=DIVX * vp3 decoder fixes - * improved the Alpha optimiziations + * improved the Alpha optimizations * x86 optimiziations are thread-safe now - * settable scenechange threshold + * settable scene change threshold * better MPEG1/MPEG2 conformance encoder * quality improvement for high bitrate videos with trellis quantization * indeo3 decoder fixed + * Rate distorted optimal coded block pattern Drivers: * VIDIX driver for nVidia cards

1 0

CVS: main/DOCS/xml/en video.xml,1.16,1.17
by Diego Biurrun CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/DOCS/xml/en In directory mail:/var/tmp.root/cvs-serv24844/DOCS/xml/en Modified Files: video.xml Log Message: Clumsy wording improved byRuben Garcia <ruben(a)ugr.es> and Torinthiel <torinthiel(a)wp.pl>. Index: video.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/video.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- video.xml 1 Oct 2003 09:25:05 -0000 1.16 +++ video.xml 2 Oct 2003 00:03:33 -0000 1.17 @@ -1153,8 +1153,8 @@ <listitem><simpara> This driver calls <function>int 10h</function> handler thus it's not an emulator - it calls <emphasis role="bold">real</emphasis> things of - <emphasis>real</emphasis> BIOS in <emphasis>real-mode</emphasis>. - (Finely - in vm86 mode). + <emphasis>real</emphasis> BIOS in <emphasis>real-mode</emphasis> + (actually in vm86 mode). </simpara></listitem> <listitem><simpara> You can use VIDIX with it, thus getting accelerated video display

1 0