From 5abb8c42f5ba67a5110a9735ad3f0c7e8c3b8cea Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 5 Jan 2006 23:32:18 +0000 Subject: [PATCH] Improve overall structure by adding a few top-level chapters so that sections no longer nest as deeply. This has the added benefit of removing a few sections that only consisted of the section title. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17322 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/audio.xml | 12 +-- DOCS/xml/en/codecs.xml | 107 ++++++++++----------- DOCS/xml/en/documentation.xml | 12 ++- DOCS/xml/en/features.xml | 14 --- DOCS/xml/en/formats.xml | 109 +++++++++++----------- DOCS/xml/en/install.xml | 34 +++---- DOCS/xml/en/tvinput.xml | 5 + DOCS/xml/en/video.xml | 171 +++++++++++++++++----------------- 8 files changed, 232 insertions(+), 232 deletions(-) delete mode 100644 DOCS/xml/en/features.xml diff --git a/DOCS/xml/en/audio.xml b/DOCS/xml/en/audio.xml index 2edc83cff0..5c42a6ca68 100644 --- a/DOCS/xml/en/audio.xml +++ b/DOCS/xml/en/audio.xml @@ -1,8 +1,8 @@ - + Audio output devices - + Audio/Video synchronization @@ -33,9 +33,9 @@ If you happen to have a bad audio driver, try the option, it should sort out your problems. See the man page for detailed information. - + - + Troubleshooting Some notes: @@ -53,6 +53,6 @@ DEMUXER: Too many (945 in 8390980 bytes) video packets in the buffer! - -Supported codecs + +Codecs - + Video codecs @@ -76,7 +76,7 @@ and help us add support for it. - + DivX4/DivX5 @@ -188,10 +188,10 @@ did not install or configure it correctly. - + - + FFmpeg/libavcodec @@ -276,10 +276,10 @@ You must follow the steps above to obtain the source for this library. With FFmpeg and my Matrox G400, I can view even the highest resolution DivX movies without dropped frames on my K6-2 500. - + - + XAnim codecs @@ -339,10 +339,10 @@ to use them if possible. Tested codecs include: Indeo 3.2, 4.1, 5.0, CVID, 3ivX, H.263. - + - + VIVO video MPlayer can play Vivo (1.0 and 2.0) videos. The @@ -352,10 +352,10 @@ Win32 DLL through the option. If you do not supply command line options MPlayer selects the best codec automatically. - + - + MPEG-1/2 video MPEG-1 and MPEG-2 are decoded by the multiplatform native Signal 11 reinitializing the codec, continuing exactly from where the failure occurred. This recovery technique has no measurable speed penalty. - + - + MS Video1, Cinepak CVID, and other older codecs MPlayer is able to play most of the older codecs @@ -378,10 +378,10 @@ In the past they were decoded with binary Win32 codecs, but now we have native codecs for most of them using libavcodec. - + - + RealVideo @@ -414,10 +414,10 @@ If you want to store them in a different location, pass the only work with Linux, FreeBSD, NetBSD and Cygwin on the x86, Alpha and PowerPC (Linux/Alpha and Linux/PowerPC have been tested) platforms and with Mac OS X. - + - + XviD @@ -478,10 +478,10 @@ then started XviD. So both projects have the same origin. - + - + Sorenson @@ -517,12 +517,12 @@ decoders: compile MPlayer - + - + x264 - + What is x264? x264 is a library for @@ -557,9 +557,9 @@ decoders: Parallel encoding of multiple slices - + - + What is H.264? H.264 is one name for a new digital video codec jointly developed @@ -597,9 +597,9 @@ decoders: but if you are interested in a brief overview, you may want to read The H.264/AVC Advanced Video Coding Standard: Overview and Introduction to the Fidelity Range Extensions. - + - + How can I play H.264 videos with <application>MPlayer</application>? MPlayer uses @@ -619,9 +619,9 @@ decoders: H.264 decoding, you might keep an eye on FFmpeg CVS repository's web interface. - + - + How can I encode videos using <application>MEncoder</application> and <systemitem class="library">x264</systemitem>? If you have the subversion client installed, the latest x264 @@ -657,13 +657,13 @@ decoders: The configure script will autodetect that you have satisfied the requirements for x264. - + - + Audio codecs @@ -711,7 +711,7 @@ decoders: - + Software AC3 decoding @@ -747,10 +747,10 @@ SNDCTL_DSP_CHANNELS ioctl. An example of a suitable driver is emu10k1 (used by Soundblaster Live! cards) from August 2001 or newer (ALSA CVS is also supposed to work). - + - + Hardware AC3 decoding You need an AC3 capable sound card, with digital out (S/PDIF). The card's @@ -760,10 +760,10 @@ hwac3 option. It is experimental but known to work with C-Media cards and Soundblaster Live! + ALSA (but not OSS) drivers and DXR3/Hollywood+ MPEG decoder cards. - + - + libmad support @@ -778,10 +778,10 @@ sometimes has problems with seeking, but it may perform better on FPU-less To enable support, compile with the configure option. - + - + VIVO audio The audio codec used in VIVO files depends on whether it is a VIVO/1.0 or @@ -789,10 +789,10 @@ VIVO/2.0 file. VIVO/1.0 files have g.723 audio, and VIVO/2.0 files have Vivo Siren audio. Both are supported. - + - + RealAudio @@ -815,9 +815,9 @@ RealAudio: Instructions on how to install the RealPlayer libraries are in the RealVideo section. - + - + QDesign codecs QDesign audio streams (fourcc:QDMC, QDM2) are found @@ -825,9 +825,9 @@ in MOV/QT files. Both versions of this codec can be decoded with QuickTime libraries. For installation instructions please see the Sorenson video codec section. - + - + Qualcomm codecs Qualcomm audio streams (fourcc:Qclp) is found @@ -835,9 +835,9 @@ in MOV/QT files. It can be decoded with QuickTime libraries. For installation instructions please see the Sorenson video codec section. - + - + AAC codec AAC (Advanced Audio Coding) is an audio codec sometimes found in MOV and MP4 @@ -867,18 +867,18 @@ packages from Christian Marillat's homepage< Mandrake/Mandriva RPMs from the P.L.F and RedHat RPMs from Grey Sector. - - + + - + Win32 codecs importing HOWTO - + VFW codecs @@ -917,10 +917,10 @@ ftp://ftp.mplayerhq.hu/MPlayer/incoming/[codecname]/ e.g. search for "VIDC.HFYU". To find out how to do this, look at the old DirectShow method below. - + - + DirectShow codecs @@ -1030,6 +1030,7 @@ If you want to add a codec yourself, read DOCS/tech/codecs.conf.txt. - + + diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml index 5bd377c902..4d3b56aac8 100644 --- a/DOCS/xml/en/documentation.xml +++ b/DOCS/xml/en/documentation.xml @@ -172,14 +172,20 @@ can be distributed under the terms of the GNU General Public License Version 2. &history.xml; -&install.xml; +&install.xml; -&features.xml; &usage.xml; -&faq.xml; &cd-dvd.xml; +&faq.xml; + +&formats.xml; +&codecs.xml; +&video.xml; +&audio.xml; +&tvinput.xml; + &ports.xml; &mencoder.xml; &encoding-guide.xml; diff --git a/DOCS/xml/en/features.xml b/DOCS/xml/en/features.xml deleted file mode 100644 index 7acab002ee..0000000000 --- a/DOCS/xml/en/features.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - -Features - -&formats.xml; -&codecs.xml; - -&video.xml; -&audio.xml; - -&tvinput.xml; - - diff --git a/DOCS/xml/en/formats.xml b/DOCS/xml/en/formats.xml index f7f888234c..11582ebd58 100644 --- a/DOCS/xml/en/formats.xml +++ b/DOCS/xml/en/formats.xml @@ -1,7 +1,7 @@ - -Supported formats + +Containers It is important to clarify a common mistake. When people see a file with a @@ -30,10 +30,10 @@ Or you might put MPEG-1 video into an AVI file. - + Video formats - + MPEG files @@ -85,10 +85,10 @@ played at 640x480. AVI files do not have this field, so they have to be rescaled during encoding or played with the option. - + - + AVI files @@ -167,10 +167,10 @@ that most AVI encoders/multiplexers create bad files when using VBR audio. There are only two known exceptions: NanDub and MEncoder. - + - + ASF/WMV files ASF (Active Streaming Format) comes from Microsoft. They developed two @@ -182,10 +182,10 @@ there is no compatibility at all (it is just another legal game). v2.0 files :). Note that ASF files nowadays come with the extension .WMA or .WMV. - + - + QuickTime/MOV files @@ -204,10 +204,10 @@ Most new QuickTime files use Sorenson video and QDesign Music audio. See our Sorenson codec section. - + - + VIVO files @@ -231,10 +231,10 @@ See the VIVO audio codec sections for installation instructions. - + - + FLI files FLI is a very old file format used by @@ -244,10 +244,10 @@ even able to seek within them (useful when looping with the option). FLI files do not have keyframes, so the picture will be messy for a short time after seeking. - + - + RealMedia (RM) files @@ -257,10 +257,10 @@ Here are the lists of the supported RealVideo and RealAudio codecs. - + - + NuppelVideo files NuppelVideo @@ -272,10 +272,10 @@ compressed, and YV12+lzo compressed frames. them with MEncoder to MPEG-4 (DivX)/etc!) them all. Seeking works. - + - + yuv4mpeg files yuv4mpeg / yuv4mpeg2 @@ -284,27 +284,27 @@ is a file format used by the You can grab, produce, filter or encode video in this format using these tools. The file format is really a sequence of uncompressed YUV 4:2:0 images. - + - + FILM files This format is used on old Sega Saturn CD-ROM games. - + - + RoQ files RoQ files are multimedia files used in some ID games such as Quake III and Return to Castle Wolfenstein. - + - + OGG/OGM files This is a new fileformat from Xiphophorus. @@ -313,10 +313,10 @@ It can contain any video or audio codec, CBR or VBR. You'll need libvorbis installed before compiling MPlayer to be able to play it. - + - + SDP files SDP is an @@ -324,19 +324,19 @@ IETF standard format for describing video and/or audio RTP streams. (The "LIVE.COM Streaming Media" are required.) - + - + PVA files PVA is an MPEG-like format used by DVB TV boards' software (e.g.: MultiDec, WinTV under Windows). - + - + NSV files NSV (NullSoft Video) is the file format used by the @@ -350,29 +350,29 @@ can't be decoded yet. Moreover streams from that site need an extra depacketization layer that still has to be implemented (those files are unplayable anyway because they use VLB audio). - + - + Matroska files Matroska is an open container format. Read more on the official site. - + - + NUT files NUT is the container format developed by MPlayer and FFmpeg folks. Both projects support it. Read more on the official site. - + - + GIF files The GIF format is a common format for web @@ -406,12 +406,12 @@ download a copy from the homepage. For detailed technical information, have a look at the GIF89a specification. - + - + Audio formats @@ -422,7 +422,7 @@ a recommended usage of MPlayer, you better use XMMS. - + MP3 files You may have problems playing certain MP3 files that @@ -432,35 +432,35 @@ for certain broken MPEG files and thus will remain like this for the foreseeable future. The flag described in the man page may help you in these cases. - + - + WAV files - + - + OGG/OGM files (Vorbis) Requires properly installed libogg and libvorbis. - + - + WMA/ASF files - + - + MP4 files - + - + CD audio MPlayer can use cdparanoia @@ -472,9 +472,9 @@ to play CDDA (Audio CD). The scope of this section does not contain enumerating See the man page's option which can be used to pass options to cdparanoia. - + - + XMMS MPlayer can use XMMS input @@ -491,6 +491,7 @@ If that does not work, you might need to set the XMMS plugin and library path explicitly by way of the and options. - + + diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index 1b7e64617d..8b04078b6b 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -1,6 +1,6 @@ - + Installation @@ -22,8 +22,7 @@ contain. It will take some time, but it IS worth it. You need a fairly recent system. On Linux, 2.4.x kernels are recommended. - - + Software requirements @@ -132,10 +131,10 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended. ./configure where that file is. - + - + Codecs @@ -258,10 +257,10 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended. section for installation instructions and more information. - + - + Video cards @@ -271,7 +270,7 @@ the other cards don't. - + YUV cards @@ -348,10 +347,10 @@ zooming), thus fullscreen is nice and very fast. - + - + Non-YUV cards @@ -377,10 +376,10 @@ it works with the following drivers: - + - + Cirrus-Logic cards @@ -410,11 +409,11 @@ it works with the following drivers: - + - + Sound cards @@ -435,10 +434,10 @@ it works with the following drivers: to read the sound card section! - + - + Features @@ -521,7 +520,6 @@ font file and telling MPlayer to use it. See the Subtitles and OSD section for details. - @@ -957,3 +955,5 @@ It's a clear way for everyone to become root. + + diff --git a/DOCS/xml/en/tvinput.xml b/DOCS/xml/en/tvinput.xml index 399f659d99..5586c90f42 100644 --- a/DOCS/xml/en/tvinput.xml +++ b/DOCS/xml/en/tvinput.xml @@ -1,5 +1,8 @@ + +TV + TV input @@ -211,3 +214,5 @@ pixel averaging only in the horizontal direction due to a hardware limitation. + + diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index a0e5f4a80f..bcaaffffb3 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -1,9 +1,9 @@ - + Video output devices - + Setting up MTRR @@ -83,11 +83,11 @@ Not all CPUs have MTRRs. For example older K6-2 (around 266MHz, stepping 0) CPUs don't have MTRRs, but stepping 12 does (execute cat /proc/cpuinfo to check it). - + - + Video outputs for traditional video cards - + Xv @@ -161,7 +161,7 @@ screen #0 - + 3dfx cards @@ -179,10 +179,10 @@ If you experience strange effects using , try SDL driver! See the tdfxfb section. - + - + S3 cards @@ -198,10 +198,10 @@ driver (slow). If you suspect your card, get a newer driver, or ask politely on the MPlayer-users mailing list for an MMX/3DNow! enabled driver. - + - + nVidia cards @@ -224,10 +224,10 @@ However, MPlayer contains a is in beta stage, and has some drawbacks. For more information, see nVidia VIDIX section. - + - + ATI cards @@ -245,10 +245,10 @@ happily get accelerated display, with or withou TV output, and no libraries or X are needed. Read the VIDIX section. - + - + NeoMagic cards @@ -277,10 +277,10 @@ Section "Device" EndSection - + - + Trident cards If you want to use Xv with a Trident card, provided that it doesn't work @@ -293,22 +293,22 @@ Alternatively, MPlayer contains a VIDIX driver for the Cyberblade/i1 card. - + - + Kyro/PowerVR cards If you want to use Xv with a Kyro based card (for example Hercules Prophet 4000XT), you should download the drivers from the PowerVR site - + - + DGA @@ -591,12 +591,12 @@ with every chipset driver for XFree out there. - - + + - + SDL @@ -684,10 +684,10 @@ present) black bar. DO NOT USE SDL with GUI! It won't work as it should. - + - + SVGAlib @@ -760,10 +760,10 @@ samplerate on my box, because the sound was broken on 44kHz: You can turn on OSD and subtitles only with the filter, see the man page for exact parameters. - + - + Framebuffer output (FBdev) @@ -857,10 +857,10 @@ framebuffer, and don't ask for it, since it's not an MPlayer limitation. - + - + Matrox framebuffer (mga_vid) @@ -934,10 +934,10 @@ info, for example by and can be written for brightness change: echo "brightness=120" > /dev/mga_vid - + - + 3Dfx YUV support This driver uses the kernel's tdfx framebuffer driver to play movies with @@ -945,10 +945,10 @@ YUV acceleration. You'll need a kernel with tdfxfb support, and recompile with ./configure --enable-tdfxfb - + - + OpenGL output @@ -983,10 +983,10 @@ least on nVidia): export $__GL_SYNC_TO_VBLANK=1 - + - + AAlib - text mode displaying @@ -1112,10 +1112,10 @@ That isn't autodetected by aalib, but vo_aa tries to find the best mode. See for further tuning issues. - + - + <systemitem class="library">libcaca</systemitem> - Color ASCII Art library @@ -1205,10 +1205,10 @@ Use the option if your computer is not fast enough to render all frames. - + - + VESA - output to VESA BIOS @@ -1344,10 +1344,10 @@ It won't work! itself only once during POST procedure. - + - + X11 @@ -1392,10 +1392,10 @@ If you can't find the modes you inserted, browse XFree86's output. Some drivers can't use low pixelclocks that are needed for low resolution video modes. - + - + VIDIX @@ -1541,7 +1541,7 @@ Alternatively, you can use a special kernel module, like this: - + ATI cards Currently most ATI cards are supported natively, from Mach64 to the @@ -1553,9 +1553,9 @@ There are two compiled binaries: radeon_vid for Radeon and rage128_vid for Rage 128 cards. You may force one or let the VIDIX system autoprobe all available drivers. - + - + Matrox cards Matrox G200, G400, G450 and G550 have been reported to work. @@ -1565,9 +1565,9 @@ Matrox G200, G400, G450 and G550 have been reported to work. The driver supports video equalizers and should be nearly as fast as the Matrox framebuffer - + - + Trident cards There is a driver available for the Trident Cyberblade/i1 chipset, which @@ -1578,17 +1578,17 @@ can be found on VIA Epia motherboards. The driver was written and is maintained by Alastair M. Robinson - + - + 3DLabs cards Although there is a driver for the 3DLabs GLINT R3 and Permedia3 chips, no one has tested it, so reports are welcome. - + - + nVidia cards There's a relatively new nVidia driver out there, it's known to work on Riva @@ -1631,9 +1631,9 @@ There's a relatively new nVidia driver out there, it's known to work on Riva Reports awaited! - + - + SiS cards This is very experimental code, just like nvidia_vid. @@ -1647,10 +1647,10 @@ SiS versions of the "Shuttle XPC" barebones boxes out there) Reports awaited! - + - + DirectFB
"DirectFB is a graphics library which was designed with embedded systems @@ -1673,9 +1673,9 @@ the command line, using the option. Layer selection ca be done by the subdevice method, e.g.: (layer -1 is default: autodetect) - + - + DirectFB/Matrox (dfbmga) Please read the main DirectFB section for general @@ -1703,13 +1703,13 @@ patch from the URL above). Porting the CRTC2 code to mga_vid has been planned for years, patches are welcome. - + - + MPEG decoders - + DVB output and input MPlayer supports cards with the Siemens DVB chipset @@ -1948,9 +1948,9 @@ the native OSD feature of DVB cards, as well as more fluent playback of non-25fps movies and realtime transcoding between MPEG-2 and MPEG-4 (partial decompression). - + - + DXR2 MPlayer supports hardware accelerated playback with the Creative DXR2 card. @@ -1988,9 +1988,9 @@ the colorkey settings you should be able to get acceptable results. Please see the man page for available options. - + - + DXR3/Hollywood+ MPlayer supports hardware accelerated playback @@ -2112,14 +2112,14 @@ it must be used to specify the DXR3's output instead of a sound card. - - - + + + Other visualization hardware - + Zr @@ -2212,9 +2212,9 @@ during playback, it will crash your computer. It is, however, fine to start MPlayer, wait for MPlayer to finish and THEN stop XawTV. - + - + Blinkenlights This driver is capable of playback using the Blinkenlights UDP protocol. If you @@ -2228,13 +2228,13 @@ has to offer. Just watch some of the On the Arcade video you can see the Blinkenlights output driver in action at 00:07:50. - + - + TV-out support - + Matrox G400 cards @@ -2374,9 +2374,9 @@ ground are the fifth, sixth, seventh, and fifteenth (5, 6, 7, 15) pins. (info contributed from Balázs Kerekes) - + - + Matrox G450/G550 cards TV output support for these cards has only been recently introduced, and is @@ -2400,10 +2400,10 @@ recommended for G400, see the section above. The necessary kernel patch and the detailed HOWTO is downloadable from - + - + ATI cards @@ -2446,17 +2446,17 @@ Only thing you need to do - Have the TV connector plugged in before booting your PC since video BIOS initializes itself only once during POST procedure. - + - + Voodoo 3 Check this URL. - + - + nVidia First, you MUST download the closed-source drivers from . @@ -2493,9 +2493,9 @@ EndSection Of course the important thing is the TwinView part. - + - + NeoMagic The NeoMagic chip is found in a variety of laptops, some of them are equipped @@ -2542,6 +2542,7 @@ with a simple analog TV encoder, some have a more advanced one. - + +