Mercurial > mplayer.hg
changeset 907:b194061e3f03
pre-review
author | gabucino |
---|---|
date | Tue, 29 May 2001 19:46:50 +0000 |
parents | 8eca9b7aafae |
children | 8184b287f1e3 |
files | DOCS/AUTHORS DOCS/BUGREPORTS DOCS/DGA DOCS/Hungarian/DGA DOCS/Hungarian/MPlayer-FAQ DOCS/Hungarian/README DOCS/Hungarian/SOUNDCARDS DOCS/MPlayer-FAQ DOCS/README DOCS/Requirements DOCS/SOUNDCARDS |
diffstat | 11 files changed, 81 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/AUTHORS Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/AUTHORS Tue May 29 19:46:50 2001 +0000 @@ -35,7 +35,8 @@ Gábor Bérczi (Gabucino): <gabucino@k2.jozsef.kando.hu> - documentation maintainer -- documentation hungarian translation +- hungarian translation of documentation +- second webpage design&gfx - webpage maintainer - testing, codecs quality & speed comparsions - IRC channel #MPlayer operator @@ -52,7 +53,7 @@ Gyula László (Chass, Tégla): <chass-@freemail.hu> - first fonts (mp_font1.zip) -- new homepage design&gfx +- third (current) homepage design&gfx Zoltán Márk Vicián (Se7en): <se7en@sch.bme.hu> - SVGAlib support in libvo @@ -69,7 +70,7 @@ - PNG file output support in libvo TeLeNiEkO: <telenieko@telenieko.com> -- spanish translations (see DOCS/Spanish/*) +- spanish translation of documentation Michael Graffam: <mgraffam@idsi.net> - XF86VidMode support to vo_x11 and vo_dga @@ -83,7 +84,7 @@ - memcpy optimizations for AMD K7 and Intel Pentium III (fastmemcpy.h) - CDROM tune info - further 3DNow! optimizations into mp3lib and libac3 -- russian DOCS translation +- russian translation of documentation German Gomez Garcia: <german@piraos.com> - DVD .ifo parser and chapter selection [not yet in the main trunk]
--- a/DOCS/BUGREPORTS Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/BUGREPORTS Tue May 29 19:46:50 2001 +0000 @@ -15,6 +15,7 @@ We are working together on code, so everyone is interested in it. BTW many times other users know the solution (system config probs, bad drivers etc), even when we think it's a bug in our code. +The language of this list is ENGLISH ! Please describe your problem in details, examples etc, and don't forget to include these:
--- a/DOCS/DGA Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/DGA Tue May 29 19:46:50 2001 +0000 @@ -23,17 +23,18 @@ 2. What is DGA? ~~~~~~~~~~~~~~~ - DGA is short for Direct Graphics Access and is a mean for a program to - bypass the X-Server and directly modifying the framebuffer memory. + DGA is short for Direct Graphics Access and is a method for a program to + bypass the X-Server and directly modify the framebuffer memory. Technically spoken this happens by mapping the framebuffer memory into - the memory range of your process. This is just allowed by the kernel + the memory range of your process. This is only allowed by the kernel if you have superuser privileges. You can get these either by logging in - as root or by setting the suid bit on the mplayer executable. + as root or by setting the suid bit on the mplayer executable (NOT + recommended!). - There are two versions of DGA: DGA1 is used by XFree 3.X.X and DGA2 was + There are two versions of DGA: DGA1 is used by XFree 3.x.x and DGA2 was introduced with XFree 4.0.1. - DGA1 just provides direct framebuffer access as described above. For + DGA1 provides only the direct framebuffer access as described above. For switching the resolution of the video signal you have to rely on the XVidMode extension. @@ -57,12 +58,12 @@ /etc/X11/XF86Config (/etc/X11/XF86Config-4 for XFree 4.0.X respectively). Those are defined by so-called modelines and depend on the capabilites of your video hardware. The XServer scans this config file on startup and - disables those modelines not suitable for your hardware. You can find + disables the modelines not suitable for your hardware. You can find out which modes survive with the X11 log file. It can be found at: /var/log/XFree86.0.log See appendix A for some sample modeline definitions. -4. DGA & MPLayer +4. DGA & MPlayer ~~~~~~~~~~~~~~~~ DGA is used in two places with MPlayer: The SDL driver can be made to make @@ -107,12 +108,15 @@ ~~~~~~~~~~~~~~~~~~~ Section "Modes" Identifier "Modes[0]" + # 800x600 @ 60 Hz, 37.8 kHz hsync + Modeline "800x600" 40 800 840 968 1056 600 601 605 628 Modeline "712x600" 35.0 712 740 850 900 400 410 412 425 Modeline "640x480" 25.175 640 664 760 800 480 491 493 525 + Modeline "400x300" 20 400 416 480 528 300 301 303 314 Doublescan + Modeline "352x288" 25.10 352 368 416 432 288 296 290 310 Modeline "352x240" 15.750 352 368 416 432 240 244 246 262 Doublescan - # 800x600 @ 60 Hz, 37.8 kHz hsync - Modeline "800x600" 40 800 840 968 1056 600 601 605 628 - Modeline "352x288" 25.10 352 368 416 432 288 296 290 310 + Modeline "320x240" 12.588 320 336 384 400 240 245 246 262 Doublescan + EndSection
--- a/DOCS/Hungarian/DGA Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/Hungarian/DGA Tue May 29 19:46:50 2001 +0000 @@ -28,7 +28,7 @@ memoriaba. Szaknyelven szolva ez a framebuffer memorianak a processz teruletere torteno lapozasaval tortenik. Ezt a kernel csak root jogosultsaggal engedi. Ez tortenhet root-kent torteno bejelentkezessel, vagy a suid bit - beallitasaval az mplayer programon. + beallitasaval az mplayer programon (NEM ajanlott!). A DGA-nak ket verzioja van: a DGA1-et az XFree 3.X.X hasznalja, a DGA2 pedig az XFree 4.0.1 ota letezik. @@ -75,12 +75,14 @@ ~~~~~~~~~~~~~~~~~~ Section "Modes" Identifier "Modes[0]" + # 800x600 @ 60 Hz, 37.8 kHz hsync + Modeline "800x600" 40 800 840 968 1056 600 601 605 628 Modeline "712x600" 35.0 712 740 850 900 400 410 412 425 Modeline "640x480" 25.175 640 664 760 800 480 491 493 525 + Modeline "400x300" 20 400 416 480 528 300 301 303 314 Doublescan + Modeline "352x288" 25.10 352 368 416 432 288 296 290 310 Modeline "352x240" 15.750 352 368 416 432 240 244 246 262 Doublescan - # 800x600 @ 60 Hz, 37.8 kHz hsync - Modeline "800x600" 40 800 840 968 1056 600 601 605 628 - Modeline "352x288" 25.10 352 368 416 432 288 296 290 310 + Modeline "320x240" 12.588 320 336 384 400 240 245 246 262 Doublescan EndSection
--- a/DOCS/Hungarian/MPlayer-FAQ Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/Hungarian/MPlayer-FAQ Tue May 29 19:46:50 2001 +0000 @@ -228,3 +228,6 @@ Q: Gondjaim vannak az icewm-el es a teljeskepernyos xv moddal.. A: Tudjuk, az icewm szar. + +Q: Dehat aviplay-jel mukodik ! +A: Es?
--- a/DOCS/Hungarian/README Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/Hungarian/README Tue May 29 19:46:50 2001 +0000 @@ -4,8 +4,8 @@ Röviden: ~~~~~~~~ -Az MPlayer egy LINUXON működő videolejátszó. Le tudja játszani a legtöbb mpeg, -avi és asf file-t, valamint felsorakoztat jónéhány nativ és Win32 codecet. +Az MPlayer egy LINUXON működő videolejátszó. Le tudja játszani a legtöbb MPEG, +AVI és ASF file-t, valamint felsorakoztat jónéhány nativ és Win32 codecet. Nézhetsz vele VCD-t, DVD-t, és még DivX-et is. A másik óriási tulajdonsága az MPlayernek a megjelenítési módok széles választéka. Működik X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib driverekkel, sőt SDL-lel is (beleértve ezáltal az @@ -22,7 +22,7 @@ Nagyon sok lejátszót próbáltam Linux alatt (mtv,xmps,dvdview,livid/oms, VideoLAN,xine,xanim,avifile,xmmp), de mindnek ugyanazok a problémái. Többnyire a különleges file-okkal, vagy a hang/kép szinkronnal. Legtöbbjük -képtelen mind mpeg1, mpeg2 ÉS avi (DivX) lejátszásra. Sokuknak gondjuk van +képtelen mind MPEG1, MPEG2 ÉS AVI (DivX) lejátszásra. Sokuknak gondjuk van a képminőséggel, vagy a sebességgel is. Elhatároztam, hogy (át)írok egyet... - mpg12play v0.1-v0.3: @@ -57,7 +57,7 @@ media player nem. Még az index chunk nélküli AVI-k is lejátszhatók, sőt az indexet fel is lehet építeni a '-idx' opcióval, így seekelni is lehet bennük! Amint az látszik, a stabilitás és a minőség a legfontosabbak -a számomra, de a sebesség se éppen alacsony. +a számomra, de a sebesség se semmi. És a grafikus felület? ~~~~~~~~~~~~~~~~~~~~~~ @@ -82,14 +82,14 @@ *** a teljes listához *** A legfontosabb video codecek: -- mpeg1 (VCD) és mpeg2 (DVD) video +- MPEG1 (VCD) és MPEG2 (DVD) video - DivX, OpenDivX és más MPEG4 variánsok - Windows Media Video 7 (WMV1) ami .wmv file-okban van - Intel Indeo codecek (3.1, 3.2, 4.1, 5.0) - MJPEG, ASV2 és más hardware formátumok A legfontosabb audio codecek: -- mpeg layer 2, és layer 3 (MP3) audio +- MPEG layer 2, és layer 3 (MP3) audio - AC3 dolby audio - VoxWare audio - alaw, msgsm, pcm és más régi formátumok @@ -103,7 +103,8 @@ Általános: - x11: X11 az SHM kiterjesztéssel - xv: X11 az XVideo kiterjesztés overlay-eivel (hardware támogatás) -- gl: OpenGL renderelő, csak Utah-GLX-szel működik! +- gl: OpenGL renderelő, csak Utah-GLX-szel működik, vagy Matrox es + X >= 4.0.3 kombinacioval! (mas DRI vagy nVidia nem tamogatott!) - dga: X11 a DGA kiterjesztéssel - fsdga:X11 a DGA kiterjesztéssel + teljesképernyős render (csak 24/32bpp és MPEG!) @@ -123,7 +124,7 @@ Egyéb: - png: output PNG file-okba (-z kapcsoló a tömörítés mértékét állítja) - pgm: output PGM file-okba (tesztelésre, vagy ffmpeg enkódoláshoz) -- md5: MD5sum támogatás (mpeg konformancia tesztekhez) +- md5: MD5sum támogatás (MPEG konformancia tesztekhez) - odivx:OpenDivX AVI file output (-br a bitrate-et állítja) - null: output a nagy semmibe (sebességtesztekhez) @@ -192,10 +193,10 @@ Például egy épp most letöltött divx film megnézése: rar p ast-nssvcd.rar | mplayer -vo xmga -fs - -Egy asf grabberrel vagy HTTP dump programmal a netről is lejátszhatsz. +Egy ASF grabberrel vagy HTTP dump programmal a netről is lejátszhatsz. wget ftp://micorsops.com/something.avi -O - | mplayer - -(később majd lesz közvetlen asf/http/ftp olvasás, kereséssel stb, de egyelőre +(később majd lesz közvetlen ASF/http/ftp olvasás, kereséssel stb, de egyelőre ez van) TV output: @@ -258,12 +259,13 @@ Licensz: ~~~~~~~~ -Mivel MPlayer rengeteg kódot tartalmaz más projectekből, ez még nincs -eldöntve. A GPL-re hajtunk (bár igen nehéz lesz). +Az MPlayer tartalmaz jonehany mas projectekbol atvett kodot, de jelenleg az +OpenDivX kivetelevel minden a General Public License (GPL) version 2 vagy +kesobbi ala tartozik. +Lasd DOCS/COPYING Standard Disclaimer: ~~~~~~~~~~~~~~~~~~~~ Csak a saját felelősségedre használd! Hibák és pontatlanságok előfordulhatnak, -amik kárt tesznek a rendszeredben és/vagy a szemedben. Óvatosan járj el, mert -semmiféle felelősséget nem vállalunk! - +amik kárt tesznek a rendszeredben és/vagy a szemedben/fuledben. Óvatosan járj +el, mert semmiféle felelősséget nem vállalunk!
--- a/DOCS/Hungarian/SOUNDCARDS Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/Hungarian/SOUNDCARDS Tue May 29 19:46:50 2001 +0000 @@ -7,8 +7,9 @@ OSS : OK ALSA : nincs Max kHz : 48 - Driver : aureal.sourceforge.net (nem jo, ha gyenge - a geped) + Driver : aureal.sourceforge.net + Driver2 : http://makacs.poliod.hu/~pontscho/aureal/au88xx-1.1.3.tar.bz2 + (buffermeret megnovelve 64k-ra) GUS PnP: OSS/Free: nincs
--- a/DOCS/MPlayer-FAQ Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/MPlayer-FAQ Tue May 29 19:46:50 2001 +0000 @@ -220,3 +220,6 @@ Q: I have problems with icewm and fullscreen xv mode.. A: Known problem, icewm sucks. + +Q: But it works with aviplay/etc ! +A: So what?
--- a/DOCS/README Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/README Tue May 29 19:46:50 2001 +0000 @@ -4,8 +4,8 @@ About: ~~~~~~ -MPlayer is a movie player for LINUX. It plays most mpeg, avi and asf files, -supported by many native and win32 DLL codecs. You can watch VCD, DVD and even +MPlayer is a movie player for LINUX. It plays most MPEG, AVI and ASF files, +supported by many native and Win32 DLL codecs. You can watch VCD, DVD and even DivX movies too. The another big feature of mplayer is the wide range of supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, but you can use SDL (and this way all drivers of SDL) and some lowlevel @@ -21,7 +21,7 @@ I've tried lots of players under linux (mtv,xmps,dvdview,livid/oms,VideoLAN, xine,xanim,avifile,xmmp) but they all have some problem. Mostly with special files or with audio/video sync. Most of them is unable to play -both mpeg1, mpeg2 and avi (DivX) files. Many players have image quality +both MPEG1, MPEG2 and AVI (DivX) files. Many players have image quality or speed problems too. So I've decided to write/modify one... - mpg12play v0.1-v0.3: @@ -34,14 +34,14 @@ - mpg12play v0.9-v0.95pre5: Mpeg codec was libmpeg2 (mpeg2dec) by Aaron Holtzman & Michel Lespinasse. It's great, optimized very fast C code with perfect image quality and - 100% mpeg standard conformance. + 100% MPEG standard conformance. - MPlayer v0.3-v0.9: It was a pack of two programs: mpg12playv0.95pre6 and my new simple AVI player 'avip' based on avifile's Win32 DLL loader. - MPlayer v0.10: - The mpeg and avi player in a single binary! + The MPEG and AVI player in a single binary! - MPlayer v0.11: - Added .asf file support, and OpenDivX (see www.projectmayo.com) en/decoding. + Added .ASF file support, and OpenDivX (see www.projectmayo.com) en/decoding. - MPlayer v0.17 "The IdegCounter" The release version of the 0.11pre after 4 months of heavy development! Try it, and be amazed! Thousands of new features added... and of course @@ -49,19 +49,19 @@ As you see, I didn't write any codecs, just some players. Instead I spent a lot of time finding the best way to parse bad damaged input files -(both mpg and avi) and to do perfect A-V sync with seeking ability. -My player is rock solid playing damaged mpeg files (useful for some VCDs), +(both MPEG and AVI) and to do perfect A-V sync with seeking ability. +My player is rock solid playing damaged MPEG files (useful for some VCDs), and it plays bad AVI files which are unplayable with the famous windows media player. Even AVI files without index chunk are playable, and you can rebuild their indexes with the -idx option, thus enabling seeking! As you see, stability and quality are the most important things for me, -speed has lower priority, but is still very important. +but the speed is also amazing. What about the GUI? ~~~~~~~~~~~~~~~~~~~ I'm not a GUI programmer. I hate GUIs, I like the pure black 80x25 console. So the player has only keyboard control from the controlling console/xterm now. -But there is a GUI development for the player, coordinated by Pontscho/Fresh! +There is a GUI development for the player, coordinated by Pontscho/Fresh! It's still under development, but it will be merged and released real soon. BTW he needs some nice skins, if you are a good graphician, contact him!!! @@ -80,14 +80,14 @@ *** for the complete list *** The most important video codecs: -- mpeg1 (VCD) and mpeg2 (DVD) video +- MPEG1 (VCD) and MPEG2 (DVD) video - DivX, OpenDivX and other MPEG4 variants - Windows Media Video 7 (WMV1) used in .wmv files - Intel Indeo codecs (3.1,3.2,4.1,5.0) - MJPEG, ASV2 and other hardware formats The most important audio codecs: -- mpeg layer 2, and layer 3 (MP3) audio +- MPEG layer 2, and layer 3 (MP3) audio - AC3 dolby audio - Voxware audio - alaw, msgsm, pcm and other simple old audio formats @@ -101,7 +101,8 @@ General: - x11: X11 with SHM extension - xv: X11 using overlays with the Xvideo extension (hardware YUV & scaling) -- gl: OpenGL renderer, works only with Utah-GLX! (no DRI or nVidia drivers) +- gl: OpenGL renderer, works only with Utah-GLX or Matrox with X >=4.0.3 ! + (no other DRI or nVidia drivers) - dga: X11 DGA extension - fsdga:X11 DGA extension with fullscreen scaling (only 24/32bpp and MPEG!) - fbdev:Output to general framebuffers @@ -114,13 +115,13 @@ - mga: Matrox G200/G400 hardware YUV overlay via the mga_vid device - xmga: Matrox G200/G400 overlay (mga_vid) in X11 window (Xv emulation on X 3.3.x !) -- syncfb: Matrox G400 YUV support on framebuffer (obsoloted, use mga/xmga) +- syncfb: Matrox G400 YUV support on framebuffer (obsoleted, use mga/xmga) - 3dfx: Voodoo2/3 hardware YUV (/dev/3dfx) support (not yet tested, maybe broken) Special: - png: PNG files output (use -z switch to set compression) - pgm: PGM files output (for testing purposes or ffmpeg encoding) -- md5: MD5sum output (for mpeg conformance tests) +- md5: MD5sum output (for MPEG conformance tests) - odivx:OpenDivX AVI File writer (use -br to set encoding bitrate) - null: Null output (for speed tests/benchmarking) @@ -138,7 +139,7 @@ ~~~~~~ Most of time-critical parts are optimized for MMX/MMXext/SSE/3DNow!/3DNow!Ex. You can improve rendering speed by setting up MTRR registers, see doc in MTRR. -Some *old* benchmark results can be found in the doc file SPEED. +Some *old* benchmark results can be found in the file DOCS/SPEED. Usage: ~~~~~~ @@ -190,10 +191,10 @@ server: rar p ast-nssvcd.rar | mplayer -vo xmga -fs - -With an asf grabber or http dump program you can play from the net. +With an ASF grabber or http dump program you can play from the net. wget ftp://micorsops.com/something.avi -O - | mplayer - -(however we planned to add direct asf/http/ftp inputs with seeking and other +(however we planned to add direct ASF/http/ftp inputs with seeking and other stuff, but for now it's a good workaround) TV output: @@ -254,11 +255,12 @@ License: ~~~~~~~~ -Since MPlayer incorporates a lot of code from other projects, this isn't -decided yet. We're going for GPL (will be pretty hard, though). +MPlayer incorporates a lot of code from other projects, but for now everything +except the OpenDivX stuff is under General Public License (GPL) version 2 or +later. See DOCS/COPYING Standard Disclaimer: ~~~~~~~~~~~~~~~~~~~~ Use only at your own risk! There may be errors and inaccuracies that could -damage your system or your eye. Proceed with caution, and although this is +damage your system, your eye or ear. Proceed with caution, and although this is highly unlikely, we don't take any responsibility for that!
--- a/DOCS/Requirements Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/Requirements Tue May 29 19:46:50 2001 +0000 @@ -100,4 +100,6 @@ Note: For details see DOCS/ChangeLog Enjoy! + MPlayer team +
--- a/DOCS/SOUNDCARDS Tue May 29 17:16:15 2001 +0000 +++ b/DOCS/SOUNDCARDS Tue May 29 19:46:50 2001 +0000 @@ -7,7 +7,9 @@ OSS : OK ALSA : no driver Max kHz : 48 - Driver : aureal.sourceforge.net (not OK with slow CPU) + Driver : aureal.sourceforge.net + Driver2 : http://makacs.poliod.hu/~pontscho/aureal/au88xx-1.1.3.tar.bz2 + (buffer size increased to 64k) GUS PnP: OSS/Free: no driver