Mercurial > mplayer.hg
changeset 13912:c66b1514ce5b
Remove pointless devices section, make video and audio top level sections.
author | diego |
---|---|
date | Thu, 11 Nov 2004 02:09:15 +0000 |
parents | bb37fefc205b |
children | c7d1760a4767 |
files | DOCS/xml/en/audio.xml DOCS/xml/en/faq.xml DOCS/xml/en/features.xml DOCS/xml/en/install.xml DOCS/xml/en/video.xml |
diffstat | 5 files changed, 133 insertions(+), 136 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $Revision$ --> -<sect2 id="audio-dev"> +<sect1 id="audio"> <title>Audio output devices</title> -<sect3 id="sync"> +<sect2 id="sync"> <title>Audio/Video synchronisation</title> <para> @@ -112,9 +112,9 @@ <link linkend="drives">CD-ROM</link> section. </para></listitem> </itemizedlist> -</sect3> +</sect2> -<sect3 id="experiences"> +<sect2 id="experiences"> <title>Soundcard experiences, recommendations</title> <para> 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 <application>MPlayer</application> and your sound card(s) worked together. </para> -</sect3> +</sect2> -<sect3 id="af"> +<sect2 id="af"> <title>Audio filters</title> <para> The old audio plugins have been superseded by a new audio filter layer. Audio @@ -491,7 +491,7 @@ </varlistentry> </variablelist> -<sect4 id="af_resample"> +<sect3 id="af_resample"> <title>Up/Downsampling</title> <para> @@ -547,9 +547,9 @@ would set the output frequency of the resample filter to 44100Hz using exact output frequency scaling and linear interpolation. </para> -</sect4> +</sect3> -<sect4 id="af_channels"> +<sect3 id="af_channels"> <title>Changing the number of channels</title> <para> The <option>channels</option> 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. </para> -</sect4> +</sect3> -<sect4 id="af_format"> +<sect3 id="af_format"> <title>Sample format converter</title> <para> The <option>format</option> filter converts between different sample formats. It @@ -648,9 +648,9 @@ <screen>mplayer -af format=4:float <replaceable>media.avi</replaceable></screen> would set the output format to 4 bytes per sample floating point data. </para> -</sect4> +</sect3> -<sect4 id="af_delay"> +<sect3 id="af_delay"> <title>Delay</title> <para> The <option>delay</option> filter delays the sound to the loudspeakers such that @@ -699,9 +699,9 @@ by 0ms and the center channel by 7ms. </para> -</sect4> +</sect3> -<sect4 id="af_volume"> +<sect3 id="af_volume"> <title>Software volume control</title> <para>Software volume control is implemented by the <option>volume</option> 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 <application>MEncoder</application> such that the maximum dynamic range is utilized. </para> -</sect4> +</sect3> -<sect4 id="af_equalizer"> +<sect3 id="af_equalizer"> <title>Equalizer</title> <para> The <option>equalizer</option> 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. </para> -</sect4> +</sect3> -<sect4 id="af_panning"> +<sect3 id="af_panning"> <title>Panning filter</title> <para> Use the <option>pan</option> 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). </para> -</sect4> +</sect3> -<sect4 id="af_sub"> +<sect3 id="af_sub"> <title>Sub-woofer</title> <para> The <option>sub</option> 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. </para> -</sect4> +</sect3> -<sect4 id="af_surround"> +<sect3 id="af_surround"> <title>Surround-sound decoder</title> <para> Matrix encoded surround sound can be decoded by the <option>surround</option> @@ -944,9 +944,9 @@ would add surround sound decoding with 15ms delay for the sound to the rear speakers. </para> -</sect4> +</sect3> -<sect4 id="af_export"> +<sect3 id="af_export"> <title>Audio Exporter</title> <para> This audio filter exports the incoming signal to other processes using memory @@ -984,9 +984,9 @@ <screen>mplayer -af export=/tmp/mplayer-af_export:1024 <replaceable>media.avi</replaceable></screen> would export 1024 samples per channel to <filename>/tmp/mplayer-af_export</filename>. </para> -</sect4> +</sect3> -<sect4 id="af_extrastereo"> +<sect3 id="af_extrastereo"> <title>Extrastereo</title> <para> @@ -1015,9 +1015,9 @@ mplayer -af extrastereo=3.45 <replaceable>media.avi</replaceable><!-- --></screen> </para> -</sect4> +</sect3> -<sect4 id="af_volnorm"> +<sect3 id="af_volnorm"> <title>Volume normalizer</title> <para> @@ -1028,11 +1028,11 @@ Usage: <screen>mplayer -af volnorm <replaceable>media.avi</replaceable></screen> </para> -</sect4> - </sect3> -<sect3 id="audio-plugins"> +</sect2> + +<sect2 id="audio-plugins"> <title>Audio plugins (deprecated)</title> <note><para><emphasis role="bold">Audio plugins have been deprecated by audio filters and will be removed soon.</emphasis></para></note> @@ -1070,7 +1070,7 @@ </para> -<sect4 id="updn-sampling"> +<sect3 id="updn-sampling"> <title>Up/Downsampling</title> <para> @@ -1100,10 +1100,10 @@ motion in addition to audio distortion. </para> </note> -</sect4> +</sect3> -<sect4 id="surround-decode"> +<sect3 id="surround-decode"> <title>Surround Sound decoding</title> <para> @@ -1118,10 +1118,10 @@ Usage: <screen>mplayer <replaceable>media.avi</replaceable> -aop list=surround</screen> </para> -</sect4> +</sect3> -<sect4 id="sample-format-conv"> +<sect3 id="sample-format-conv"> <title>Sample format converter</title> <para> @@ -1143,10 +1143,10 @@ where <literal><replaceable>outfmt</replaceable></literal> is the required output format. </para> -</sect4> +</sect3> -<sect4 id="audio-delay"> +<sect3 id="audio-delay"> <title>Delay</title> <para> 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. </para> -</sect4> +</sect3> -<sect4 id="sw-volume"> +<sect3 id="sw-volume"> <title>Software volume control</title> <para> @@ -1195,9 +1195,9 @@ <screen> mplayer <replaceable>media.avi</replaceable> -aop list=volume:softclip</screen> </para> -</sect4> +</sect3> -<sect4 id="extrastereo"> +<sect3 id="extrastereo"> <title>Extrastereo</title> <para> @@ -1219,10 +1219,10 @@ <literal>1.0</literal>, sound will be unchanged, if you set it to <literal>-1.0</literal>, left and right channels will be swapped. </para> -</sect4> +</sect3> -<sect4 id="volnorm"> +<sect3 id="volnorm"> <title>Volume normalizer</title> <para> @@ -1233,6 +1233,6 @@ Usage: <screen>mplayer <replaceable>media.avi</replaceable> -aop list=volnorm</screen> </para> -</sect4> </sect3> </sect2> +</sect1>
--- 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 @@ </para></listitem> <listitem><para> Your sound driver is buggy, or you use ALSA 0.5 with <option>-ao oss</option>. -See the <link linkend="audio-dev">sound card section</link>. +See the <link linkend="audio">sound card section</link>. </para></listitem> <listitem><para> The AVI has a bad header, try the <option>-nobps</option> option, and/or <option>-mc 0</option>.
--- 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; -<sect1 id="devices"> -<title>Output devices</title> &video.xml; &audio.xml; -</sect1> &tvinput.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 @@ <listitem><simpara> Features of <emphasis role="bold">other cards</emphasis> aren't supported by <application>MPlayer</application>. <emphasis role="bold">It's very recommended - to read the <link linkend="audio-dev">sound card</link> section!</emphasis> + to read the <link linkend="audio">sound card</link> section!</emphasis> </simpara></listitem> </itemizedlist> </sect2>
--- 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 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $Revision$ --> -<sect2 id="video-dev"> +<sect1 id="video"> <title>Video output devices</title> -<sect3 id="mtrr"> +<sect2 id="mtrr"> <title>Setting up MTRR</title> <para> @@ -83,11 +83,11 @@ stepping 0) CPUs don't have MTRRs, but stepping 12 does (execute <command>cat /proc/cpuinfo</command> to check it). </para> -</sect3> +</sect2> -<sect3 id="output-trad"> +<sect2 id="output-trad"> <title>Video outputs for traditional video cards</title> -<sect4 id="xv"> +<sect3 id="xv"> <title>Xv</title> <para> @@ -161,7 +161,7 @@ </orderedlist> </para> -<sect5 id="tdfx"> +<sect4 id="tdfx"> <title>3dfx cards</title> <para> @@ -179,10 +179,10 @@ <option>-vo tdfxfb</option> driver! See the <link linkend="tdfxfb">tdfxfb</link> section. </para> -</sect5> +</sect4> -<sect5 id="s3"> +<sect4 id="s3"> <title>S3 cards</title> <para> @@ -198,10 +198,10 @@ on the mplayer-users mailing list for an MMX/3DNow! enabled driver. </para> </note> -</sect5> +</sect4> -<sect5 id="nvidia"> +<sect4 id="nvidia"> <title>nVidia cards</title> <para> @@ -224,10 +224,10 @@ is in beta stage, and has some drawbacks. For more information, see <link linkend="vidix-nvidia">nVidia VIDIX</link> section. </para> -</sect5> +</sect4> -<sect5 id="ati"> +<sect4 id="ati"> <title>ATI cards</title> <para> @@ -245,10 +245,10 @@ <emphasis role="bold">TV output</emphasis>, and no libraries or X are needed. Read the <link linkend="vidix">VIDIX</link> section. </para> -</sect5> +</sect4> -<sect5 id="neomagic"> +<sect4 id="neomagic"> <title>NeoMagic cards</title> <para> @@ -277,10 +277,10 @@ EndSection<!-- --></programlisting> </para> -</sect5> +</sect4> -<sect5 id="trident"> +<sect4 id="trident"> <title>Trident cards</title> <para> If you want to use xv with a trident card, provided that it doesn't work @@ -293,22 +293,22 @@ <link linkend="vidix">VIDIX</link> driver for the Cyberblade/i1 card. </para> -</sect5> +</sect4> -<sect5 id="kyro"> +<sect4 id="kyro"> <title>Kyro/PowerVR cards</title> <para> If you want to use Xv with a Kyro based card (for example Hercules Prophet 4000XT), you should download the drivers from the <ulink url="http://www.powervr.com/">PowerVR site</ulink> </para> -</sect5> </sect4> +</sect3> <!-- ********** --> -<sect4 id="dga"> +<sect3 id="dga"> <title>DGA</title> <formalpara> @@ -591,12 +591,12 @@ </simpara></listitem> </itemizedlist> -</sect4> -<!--</sect3>--> +</sect3> +<!--</sect2>--> <!-- ********** --> -<sect4 id="sdl"> +<sect3 id="sdl"> <title>SDL</title> <para> @@ -684,10 +684,10 @@ DO NOT USE SDL with GUI! It won't work as it should. </simpara></listitem> </itemizedlist> -</sect4> +</sect3> -<sect4 id="svgalib"> +<sect3 id="svgalib"> <title>SVGAlib</title> <formalpara> @@ -760,10 +760,10 @@ You can turn on OSD and subtitles only with the <option>expand</option> filter, see the man page for exact parameters. </para> -</sect4> +</sect3> -<sect4 id="fbdev"> +<sect3 id="fbdev"> <title>Framebuffer output (FBdev)</title> <para> @@ -857,10 +857,10 @@ <application>MPlayer</application> limitation. </para> </note> -</sect4> +</sect3> -<sect4 id="mga_vid"> +<sect3 id="mga_vid"> <title>Matrox framebuffer (mga_vid)</title> <para> @@ -934,10 +934,10 @@ and can be written for brightness change: <screen>echo "brightness=120" > /dev/mga_vid</screen> </para> -</sect4> +</sect3> -<sect4 id="tdfxfb" xreflabel="3Dfx YUV support (tdfxfb)"> +<sect3 id="tdfxfb" xreflabel="3Dfx YUV support (tdfxfb)"> <title>3Dfx YUV support</title> <para> This driver uses the kernel's tdfx framebuffer driver to play movies with @@ -945,10 +945,10 @@ with <screen>./configure --enable-tdfxfb</screen> </para> -</sect4> +</sect3> -<sect4 id="opengl"> +<sect3 id="opengl"> <title>OpenGL output</title> <para> @@ -983,10 +983,10 @@ <command>export $__GL_SYNC_TO_VBLANK=1</command> </para> -</sect4> +</sect3> -<sect4 id="aalib"> +<sect3 id="aalib"> <title>AAlib - text mode displaying</title> <para> @@ -1112,10 +1112,10 @@ See <ulink url="http://aa-project.sourceforge.net/tune"/> for further tuning issues. </para> -</sect4> +</sect3> -<sect4 id="caca"> +<sect3 id="caca"> <title><systemitem class="library">libcaca</systemitem> - Color ASCII Art library</title> <para> @@ -1205,10 +1205,10 @@ enough to render all frames. </para> -</sect4> +</sect3> -<sect4 id="vesa"> +<sect3 id="vesa"> <title>VESA - output to VESA BIOS</title> <para> @@ -1344,10 +1344,10 @@ itself only once during POST procedure. </simpara></listitem> </itemizedlist> -</sect4> +</sect3> -<sect4 id="x11"> +<sect3 id="x11"> <title>X11</title> <para> @@ -1392,10 +1392,10 @@ drivers can't use low pixelclocks that are needed for low resolution video modes. </para> -</sect4> +</sect3> -<sect4 id="vidix"> +<sect3 id="vidix"> <title>VIDIX</title> <formalpara> @@ -1541,7 +1541,7 @@ </para></step> </procedure> -<sect5 id="vidix-ati"> +<sect4 id="vidix-ati"> <title>ATI cards</title> <para> Currently most ATI cards are supported natively, from Mach64 to the @@ -1553,9 +1553,9 @@ <filename>rage128_vid</filename> for Rage 128 cards. You may force one or let the VIDIX system autoprobe all available drivers. </para> -</sect5> +</sect4> -<sect5 id="vidix-mga"> +<sect4 id="vidix-mga"> <title>Matrox cards</title> <para> 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 <link linkend="mga_vid">Matrox framebuffer</link> </para> -</sect5> +</sect4> -<sect5 id="vidix-trident"> +<sect4 id="vidix-trident"> <title>Trident cards</title> <para> There is a driver available for the Trident Cyberblade/i1 chipset, which @@ -1578,17 +1578,17 @@ The driver was written and is maintained by <ulink url="http://www.blackfiveservices.co.uk/EPIAVidix.shtml">Alastair M. Robinson</ulink> </para> -</sect5> +</sect4> -<sect5 id="vidix-3dlabs"> +<sect4 id="vidix-3dlabs"> <title>3DLabs cards</title> <para> Although there is a driver for the 3DLabs GLINT R3 and Permedia3 chips, no one has tested it, so reports are welcome. </para> -</sect5> +</sect4> -<sect5 id="vidix-nvidia"> +<sect4 id="vidix-nvidia"> <title>nVidia cards</title> <para> There's a relatively new nVidia driver out there, it's known to work on Riva @@ -1631,9 +1631,9 @@ <para> Reports awaited! </para> -</sect5> +</sect4> -<sect5 id="vidix-sis"> +<sect4 id="vidix-sis"> <title>SiS cards</title> <para> This is very experimental code, just like nvidia_vid. @@ -1647,10 +1647,10 @@ <para> Reports awaited! </para> -</sect5> </sect4> +</sect3> -<sect4 id="directfb"> +<sect3 id="directfb"> <title>DirectFB</title> <blockquote><para> "DirectFB is a graphics library which was designed with embedded systems @@ -1673,9 +1673,9 @@ be done by the subdevice method, e.g.: <option>-vo directfb:2</option> (layer -1 is default: autodetect) </para> -</sect4> +</sect3> -<sect4 id="dfbmga"> +<sect3 id="dfbmga"> <title>DirectFB/Matrox (dfbmga)</title> <para> Please read the <link linkend="directfb">main DirectFB</link> section for general @@ -1703,13 +1703,13 @@ <link linkend="mga_vid">mga_vid</link> has been planned for years, <ulink url="../../tech/patches.txt">patches</ulink> are welcome. </para></note> -</sect4> </sect3> +</sect2> -<sect3 id="mpeg_decoders"> +<sect2 id="mpeg_decoders"> <title>MPEG decoders</title> -<sect4 id="dvb"> +<sect3 id="dvb"> <title>DVB output and input</title> <para> <application>MPlayer</application> supports cards with the Siemens DVB chipset @@ -1945,9 +1945,9 @@ non-25fps movies and realtime transcoding between MPEG2 and MPEG4 (partial decompression). </para> -</sect4> +</sect3> -<sect4 id="dxr2"> +<sect3 id="dxr2"> <title>DXR2</title> <para><application>MPlayer</application> supports hardware accelerated playback with the Creative DXR2 card.</para> @@ -1985,9 +1985,9 @@ </para> <para>Please see the man page for available options.</para> -</sect4> +</sect3> -<sect4 id="dxr3"> +<sect3 id="dxr3"> <title>DXR3/Hollywood+</title> <para> <application>MPlayer</application> supports hardware accelerated playback @@ -2109,14 +2109,14 @@ </para></listitem> </varlistentry> </variablelist> -</sect4> - </sect3> -<sect3 id="other"> +</sect2> + +<sect2 id="other"> <title>Other visualization hardware</title> -<sect4 id="zr"> +<sect3 id="zr"> <title>Zr</title> <para> @@ -2209,9 +2209,9 @@ start <application>MPlayer</application>, wait for <application>MPlayer</application> to finish and <emphasis role="bold">THEN</emphasis> stop XawTV. </para> -</sect4> +</sect3> -<sect4 id="blinkenlights"> +<sect3 id="blinkenlights"> <title>Blinkenlights</title> <para> 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. </para> -</sect4> </sect3> +</sect2> -<sect3 id="tvout"> +<sect2 id="tvout"> <title>TV-out support</title> -<sect4 id="tvout-mga-g400"> +<sect3 id="tvout-mga-g400"> <title>Matrox G400 cards</title> <para> @@ -2371,9 +2371,9 @@ pins. (info contributed from Balázs Kerekes) </para> </formalpara> -</sect4> +</sect3> -<sect4 id="tv-out_matrox_g450"> +<sect3 id="tv-out_matrox_g450"> <title>Matrox G450/G550 cards</title> <para> 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 <ulink url="http://www.bglug.ca/matrox_tvout/"/> </para> -</sect4> +</sect3> -<sect4 id="tvout-ati"> +<sect3 id="tvout-ati"> <title>ATI cards</title> <formalpara> @@ -2443,17 +2443,17 @@ plugged in before booting your PC</emphasis> since video BIOS initializes itself only once during POST procedure. </para> -</sect4> +</sect3> -<sect4 id="tvout-voodoo"> +<sect3 id="tvout-voodoo"> <title>Voodoo 3</title> <para> Check <ulink url="http://www.iki.fi/too/tvout-voodoo3-3000-xfree">this URL</ulink>. </para> -</sect4> +</sect3> -<sect4 id="tvout-nvidia"> +<sect3 id="tvout-nvidia"> <title>nVidia</title> <para> First, you MUST download the closed-source drivers from <ulink url="http://nvidia.com"/>. @@ -2490,9 +2490,9 @@ <para> Of course the important thing is the TwinView part. </para> -</sect4> +</sect3> -<sect4 id="tvout-neomagic"> +<sect3 id="tvout-neomagic"> <title>NeoMagic</title> <para> The NeoMagic chip is found in a variety of laptops, some of them are equipped @@ -2539,6 +2539,6 @@ </listitem> </itemizedlist> </para> -</sect4> </sect3> </sect2> +</sect1>