# HG changeset patch # User diego # Date 1100138955 0 # Node ID c66b1514ce5b78ad412a0775ced1ac622f3df531 # Parent bb37fefc205b735de28e5d11344606412947dc46 Remove pointless devices section, make video and audio top level sections. diff -r bb37fefc205b -r c66b1514ce5b DOCS/xml/en/audio.xml --- a/DOCS/xml/en/audio.xml Wed Nov 10 19:46:16 2004 +0000 +++ b/DOCS/xml/en/audio.xml Thu Nov 11 02:09:15 2004 +0000 @@ -1,8 +1,8 @@ - + Audio output devices - + Audio/Video synchronisation @@ -112,9 +112,9 @@ CD-ROM section. - + - + Soundcard experiences, recommendations On Linux, a 2.4.x kernel is highly recommended. Kernel 2.2 is not tested. @@ -331,9 +331,9 @@ Feedback to this document is welcome. Please tell us how MPlayer and your sound card(s) worked together. - + - + Audio filters The old audio plugins have been superseded by a new audio filter layer. Audio @@ -491,7 +491,7 @@ - + Up/Downsampling @@ -547,9 +547,9 @@ would set the output frequency of the resample filter to 44100Hz using exact output frequency scaling and linear interpolation. - + - + Changing the number of channels The filter can be used for adding and removing @@ -611,9 +611,9 @@ would change the number of channels to 6 and set up 4 routes that copy channel 0 to channels 0 to 3. Channel 4 and 5 will contain silence. - + - + Sample format converter The filter converts between different sample formats. It @@ -648,9 +648,9 @@ mplayer -af format=4:float media.avi would set the output format to 4 bytes per sample floating point data. - + - + Delay The filter delays the sound to the loudspeakers such that @@ -699,9 +699,9 @@ by 0ms and the center channel by 7ms. - + - + Software volume control Software volume control is implemented by the audio filter. Use this filter with caution since it can reduce the signal to @@ -747,9 +747,9 @@ This volume estimate can be used for setting the sound level in MEncoder such that the maximum dynamic range is utilized. - + - + Equalizer The filter represents a 10 octave band graphic @@ -809,9 +809,9 @@ would amplify the sound in the upper and lower frequency region while canceling it almost completely around 1kHz. - + - + Panning filter Use the filter to mix channels arbitrarily. It is @@ -867,9 +867,9 @@ channels 0 and 1 into output channel 2 (which could be sent to a sub-woofer for example). - + - + Sub-woofer The filter adds a sub woofer channel to the audio @@ -911,9 +911,9 @@ would add a sub-woofer channel with a cutoff frequency of 100Hz to output channel 4. - + - + Surround-sound decoder Matrix encoded surround sound can be decoded by the @@ -944,9 +944,9 @@ would add surround sound decoding with 15ms delay for the sound to the rear speakers. - + - + Audio Exporter This audio filter exports the incoming signal to other processes using memory @@ -984,9 +984,9 @@ mplayer -af export=/tmp/mplayer-af_export:1024 media.avi would export 1024 samples per channel to /tmp/mplayer-af_export. - + - + Extrastereo @@ -1015,9 +1015,9 @@ mplayer -af extrastereo=3.45 media.avi - + - + Volume normalizer @@ -1028,11 +1028,11 @@ Usage: mplayer -af volnorm media.avi - - - + + + Audio plugins (deprecated) Audio plugins have been deprecated by audio filters and will be removed soon. @@ -1070,7 +1070,7 @@ - + Up/Downsampling @@ -1100,10 +1100,10 @@ motion in addition to audio distortion. - + - + Surround Sound decoding @@ -1118,10 +1118,10 @@ Usage: mplayer media.avi -aop list=surround - + - + Sample format converter @@ -1143,10 +1143,10 @@ where outfmt is the required output format. - + - + Delay This plugin delays the sound and is intended as an example of how to @@ -1154,10 +1154,10 @@ perspective and is mentioned here for the sake of completeness only. Do not use this plugin unless you are a developer. - + - + Software volume control @@ -1195,9 +1195,9 @@ mplayer media.avi -aop list=volume:softclip - + - + Extrastereo @@ -1219,10 +1219,10 @@ 1.0, sound will be unchanged, if you set it to -1.0, left and right channels will be swapped. - + - + Volume normalizer @@ -1233,6 +1233,6 @@ Usage: mplayer media.avi -aop list=volnorm - + diff -r bb37fefc205b -r c66b1514ce5b DOCS/xml/en/faq.xml --- a/DOCS/xml/en/faq.xml Wed Nov 10 19:46:16 2004 +0000 +++ b/DOCS/xml/en/faq.xml Thu Nov 11 02:09:15 2004 +0000 @@ -918,7 +918,7 @@ Your sound driver is buggy, or you use ALSA 0.5 with . -See the sound card section. +See the sound card section. The AVI has a bad header, try the option, and/or . diff -r bb37fefc205b -r c66b1514ce5b DOCS/xml/en/features.xml --- a/DOCS/xml/en/features.xml Wed Nov 10 19:46:16 2004 +0000 +++ b/DOCS/xml/en/features.xml Thu Nov 11 02:09:15 2004 +0000 @@ -6,11 +6,8 @@ &formats.xml; &codecs.xml; - -Output devices &video.xml; &audio.xml; - &tvinput.xml; diff -r bb37fefc205b -r c66b1514ce5b DOCS/xml/en/install.xml --- a/DOCS/xml/en/install.xml Wed Nov 10 19:46:16 2004 +0000 +++ b/DOCS/xml/en/install.xml Thu Nov 11 02:09:15 2004 +0000 @@ -429,7 +429,7 @@ Features of other cards aren't supported by MPlayer. It's very recommended - to read the sound card section! + to read the sound card section! diff -r bb37fefc205b -r c66b1514ce5b DOCS/xml/en/video.xml --- a/DOCS/xml/en/video.xml Wed Nov 10 19:46:16 2004 +0000 +++ b/DOCS/xml/en/video.xml Thu Nov 11 02:09:15 2004 +0000 @@ -1,9 +1,9 @@ - + Video output devices - + Setting up MTRR @@ -83,11 +83,11 @@ 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 @@ - + 3dfx cards @@ -179,10 +179,10 @@ driver! See the tdfxfb section. - + - + S3 cards @@ -198,10 +198,10 @@ on the mplayer-users mailing list for an MMX/3DNow! enabled driver. - + - + nVidia cards @@ -224,10 +224,10 @@ is in beta stage, and has some drawbacks. For more information, see nVidia VIDIX section. - + - + ATI cards @@ -245,10 +245,10 @@ TV output, and no libraries or X are needed. Read the VIDIX section. - + - + NeoMagic cards @@ -277,10 +277,10 @@ EndSection - + - + Trident cards If you want to use xv with a trident card, provided that it doesn't work @@ -293,22 +293,22 @@ 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 @@ - - + + - + SDL @@ -684,10 +684,10 @@ DO NOT USE SDL with GUI! It won't work as it should. - + - + SVGAlib @@ -760,10 +760,10 @@ 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 @@ MPlayer limitation. - + - + Matrox framebuffer (mga_vid) @@ -934,10 +934,10 @@ 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 @@ with ./configure --enable-tdfxfb - + - + OpenGL output @@ -983,10 +983,10 @@ export $__GL_SYNC_TO_VBLANK=1 - + - + AAlib - text mode displaying @@ -1112,10 +1112,10 @@ See for further tuning issues. - + - + <systemitem class="library">libcaca</systemitem> - Color ASCII Art library @@ -1205,10 +1205,10 @@ enough to render all frames. - + - + VESA - output to VESA BIOS @@ -1344,10 +1344,10 @@ itself only once during POST procedure. - + - + X11 @@ -1392,10 +1392,10 @@ drivers can't use low pixelclocks that are needed for low resolution video modes. - + - + VIDIX @@ -1541,7 +1541,7 @@ - + ATI cards Currently most ATI cards are supported natively, from Mach64 to the @@ -1553,9 +1553,9 @@ 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 @@ 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 @@ 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 @@ Reports awaited! - + - + SiS cards This is very experimental code, just like nvidia_vid. @@ -1647,10 +1647,10 @@ Reports awaited! - + - + DirectFB
"DirectFB is a graphics library which was designed with embedded systems @@ -1673,9 +1673,9 @@ 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 @@ mga_vid has been planned for years, patches are welcome. - + - + MPEG decoders - + DVB output and input MPlayer supports cards with the Siemens DVB chipset @@ -1945,9 +1945,9 @@ non-25fps movies and realtime transcoding between MPEG2 and MPEG4 (partial decompression). - + - + DXR2 MPlayer supports hardware accelerated playback with the Creative DXR2 card. @@ -1985,9 +1985,9 @@ Please see the man page for available options. - + - + DXR3/Hollywood+ MPlayer supports hardware accelerated playback @@ -2109,14 +2109,14 @@ - - - + + + Other visualization hardware - + Zr @@ -2209,9 +2209,9 @@ 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 @@ -2225,13 +2225,13 @@ On the Arcade video you can see the Blinkenlights output driver in action at 00:07:50. - + - + TV-out support - + Matrox G400 cards @@ -2371,9 +2371,9 @@ pins. (info contributed from Balázs Kerekes) - + - + Matrox G450/G550 cards TV output support for these cards has only been recently introduced, and is @@ -2397,10 +2397,10 @@ The necessary kernel patch and the detailed HOWTO is downloadable from - + - + ATI cards @@ -2443,17 +2443,17 @@ 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 . @@ -2490,9 +2490,9 @@ 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 @@ -2539,6 +2539,6 @@ - +