diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-27 18:06:07 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-27 18:06:07 +0000 |
| commit | f833f5b1a50296bac3d3f91be656660e7055c92d (patch) | |
| tree | cfd34656dde567372fd828d4725658b435724a5a /DOCS | |
| parent | 477850a1155997cbff1c959c1f10f7a1d9aca772 (diff) | |
| download | mpv-f833f5b1a50296bac3d3f91be656660e7055c92d.tar.bz2 mpv-f833f5b1a50296bac3d3f91be656660e7055c92d.tar.xz | |
Applied patch by Andras Mohari <mayday@varoshaza.nagyatad.hu>, with some
small additions.
* Replaced <UL> with <OL> where it made sense (to me :-)).
* Moved "Developer Cries" into the appendix (as Appendix F)
with s/Flame Wars/Developer Cries/ and
s/In medias res/Developer Cries/.
* Renamed "Appendix X" to "Appendix E".
* Put a "Hint" inside <BLOCKQUOTE>.
* Converted 3-pass encoding and mga_vid installation
instructions to lists.
* Converted options tables (video eq, SDL, fbdev, VESA, DXR3, TV input,
DivX4Linux, AAlib) to <DL> lists.
* The "sections" for MPsub and INSTALLING OSD are numbered and displayed
in the TOC now.
* Changed the text inside some <H4> tags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7100 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/codecs.html | 33 | ||||
| -rw-r--r-- | DOCS/documentation.html | 214 | ||||
| -rw-r--r-- | DOCS/encoding.html | 70 | ||||
| -rw-r--r-- | DOCS/sound.html | 29 | ||||
| -rw-r--r-- | DOCS/users_against_developers.html | 12 | ||||
| -rw-r--r-- | DOCS/video.html | 277 |
6 files changed, 319 insertions, 316 deletions
diff --git a/DOCS/codecs.html b/DOCS/codecs.html index 3146a82bfd..a2e4c53de6 100644 --- a/DOCS/codecs.html +++ b/DOCS/codecs.html @@ -73,15 +73,16 @@ <P>DivX4Linux works in two modes:</P> -<TABLE BORDER=0> - <TR><TD> </TD><TD VALIGN=top><CODE>-vc odivx</CODE></TD><TD> </TD> - <TD>Uses the codec in OpenDivX fashion. In this case it +<DL> + <DT><CODE>-vc odivx</CODE></DT> + <DD>Uses the codec in OpenDivX fashion. In this case it produces YV12 images in its own buffer, and <B>MPlayer</B> does colorspace - conversion via libvo. (<B>Fast, recommended!</B>)</TD></TR> - <TR><TD></TD><TD VALIGN=top><CODE>-vc divx4</CODE></TD><TD></TD> - <TD>Uses the colorspace conversion of the codec. - In this mode you can use YUY2/UYVY, too. (<B>SLOW</B>)</TD></TR> -</TABLE> + conversion via libvo. (<B>Fast, recommended!</B>)</DD> + + <DT><CODE>-vc divx4</CODE></DT> + <DD>Uses the colorspace conversion of the codec. + In this mode you can use YUY2/UYVY, too. (<B>SLOW</B>)</DD> +</DL> <P>The <CODE>-vc odivx</CODE> method is usually faster, due to the fact that it transfers image data in YV12 (planar YUV 4:2:0) format, thus requiring much @@ -142,7 +143,7 @@ <P><B>MPlayer</B> is capable of employing the XAnim codecs for decoding. Follow the instructions to enable them:</P> -<UL> +<OL> <LI>Download the codecs you wish to use from the <A HREF="http://xanim.va.pubnix.com">XAnim site</A>. The <B>3ivx</B> codec is not there, but at the <A HREF="http://www.3ivx.com">3ivx site</A>.</LI> @@ -153,7 +154,7 @@ the directory of the XAnim codecs.</LI> <LI>Rename/symlink the files, cutting out the architecture stuff, so they will have filenames like these: <CODE>vid_cvid.xa, vid_h263.xa, vid_iv50.xa</CODE>.</LI> -</UL> +</OL> <P>XAnim is video codec family number 10, so you may want to use the <CODE>-vfm 10</CODE> option to tell <B>MPlayer</B> to use them if possible.</P> @@ -250,9 +251,7 @@ <LI>under development</LI> </UL> -<H4>Installation:</H4> - -<P>It is currently available only from CVS. Here are the +<P>XViD is currently available only from CVS. Here are the download and installation instructions:</P> <OL> @@ -284,9 +283,7 @@ <LI>SVQ3 is still not reverse engineered.</LI> </UL> -<H4>Installation:</H4> - -<P>It's compiled and usable per default.</P> +<P>The Sorenson decoder is compiled and usable per default.</P> <H3><A NAME="audio_codecs">2.2.2 Audio codecs</A></H3> @@ -422,7 +419,7 @@ <P>Take a deep breath and start searching the registry...</P> -<UL> +<OL> <LI>Start <CODE>regedit</CODE>. <LI>Press <CODE>Ctrl-f</CODE>, disable the first two checkboxes, and enable the third. Type in the fourcc of the codec (e.g. TM20). @@ -435,7 +432,7 @@ If not, you are out of luck. Try guessing (e.g. search for TrueMotion). <LI>If the GUID is found you should see a FriendlyName and a CLSID field. Write down the 16 byte CLSID, this is the GUID we need. -</UL> +</OL> <P><B>Note:</B> If searching fails, try enabling all the checkboxes. You may have false hits, but you may get lucky...</P> diff --git a/DOCS/documentation.html b/DOCS/documentation.html index 52953da301..d7f147f8aa 100644 --- a/DOCS/documentation.html +++ b/DOCS/documentation.html @@ -35,6 +35,10 @@ <LI><A HREF="#installation">1.2 Installation</A></LI> <LI><A HREF="#gui">1.3 What about the GUI?</A></LI> <LI><A HREF="#subtitles_osd">1.4 Subtitles and OSD</A></LI> + <UL> + <LI><A HREF="#mpsub">1.4.1 MPlayer's own subtitle format (MPsub)</A></LI> + <LI><A HREF="#install_osd">1.4.2 Installing OSD and subtitles</A></LI> + </UL> <LI><A HREF="#rtc">1.5 RTC</A></LI> </UL> </LI> @@ -280,17 +284,14 @@ </UL> </LI> <LI><A HREF="#known_bugs">Appendix D - Known bugs</A></LI> - <LI><A HREF="skin-en.html">Appendix X - MPlayer skin format</A></LI> -</UL> - -<HR> -Developer Cries -<HR> - -<UL> - <LI><A HREF="users_against_developers.html#gcc">1. GCC 2.96</A></LI> - <LI><A HREF="users_against_developers.html#nvidia">2. NVidia opinions</A></LI> - <LI><A HREF="users_against_developers.html#barr">3. About Joe Barr</A></LI> + <LI><A HREF="skin-en.html">Appendix E - MPlayer skin format</A></LI> + <LI><A HREF="users_against_developers.html">Appendix F - Developer Cries</A></LI> + <UL> + <LI><A HREF="users_against_developers.html#gcc">GCC 2.96</A></LI> + <LI><A HREF="users_against_developers.html#binary">Binary distribution</A></LI> + <LI><A HREF="users_against_developers.html#nvidia">nVidia</A></LI> + <LI><A HREF="users_against_developers.html#barr">Joe Barr</A></LI> + </UL> </UL> <HR> @@ -422,7 +423,7 @@ Developer Cries <P>You need a fairly recent system. On Linux, 2.4.x kernels are recommended.</P> -<H4>SOFTWARE REQUIREMENTS</H4> +<H4>Software requirements:</H4> <UL> <LI><B>binutils</B> - suggested version is <B>2.11.x</B> . This program is @@ -462,7 +463,7 @@ Developer Cries <LI><B>libvorbis</B> - optional, needed for playing OGG Vorbis audio.</LI> </UL> -<H4>CODECS</H4> +<H4>Codecs:</H4> <UL> <LI><B>libavcodec</B>: This codec package is capable of decoding @@ -533,7 +534,7 @@ Developer Cries installation instructions and more information.</LI> </UL> -<H4>VIDEO CARDS</H4> +<H4>Video Cards</H4> <P>There are generally two kind of video cards. One kind (the newer cards) has <B>hardware scaling and YUV acceleration</B> support, the other cards don't.</P> @@ -647,7 +648,7 @@ Developer Cries </UL> -<H4>SOUND CARDS</H4> +<H4>Sound cards:</H4> <UL> <LI><B>Soundblaster Live!</B>: with this card you can use 4 or 6 (<B>5.1</B>) @@ -662,7 +663,7 @@ Developer Cries section</A>!</U></LI> </UL> -<H4>FEATURES</H4> +<H4>Features:</H4> <UL> <LI>Decide if you need GUI. If you do, see the <A HREF="#gui">GUI section</A> @@ -768,8 +769,9 @@ Developer Cries The command line options differ slightly for the different formats: -<P><B>VobSub subtitles</B><BR> - VobSub subtitles consist of a big (some megabytes) .SUB file, and optional +<H4>VobSub subtitles</H4> + +<P>VobSub subtitles consist of a big (some megabytes) .SUB file, and optional .IDX and/or .IFO files.<BR> Usage: if you have files like <CODE>sample.sub</CODE>, <CODE>sample.ifo</CODE>, <CODE>sample.idx</CODE> - you have to pass the @@ -778,18 +780,25 @@ The command line options differ slightly for the different formats: <CODE>-vobsubid</CODE> option is like <CODE>-sid</CODE> for DVDs, you can choose between subtitle tracks (languages) with it.</P> -<P><B>Other subtitles</B><BR> - The other formats consist of a single text file containing timing, placement - and text information.<BR> +<H4>Other subtitles</H4> + +<P>The other formats consist of a single text file containing timing, + placement and text information.<BR> Usage: if you have a file like <CODE>sample.txt</CODE>, you have to pass the option <CODE>-sub sample.txt</CODE> (optionally with pathname, of course).</P> -<P><B>Adjusting subtitle timing and placement</B><BR> - <CODE>-subdelay <sec></CODE>: Delays subtitles by <sec> seconds. - Can be negative.<BR> - <CODE>-subfps <rate></CODE>: Specify frame/sec rate of subtitle file - (float number)<BR> - <CODE>-subpos <0 - 100></CODE>: Specify the position of subtitles.</P> +<H4>Adjusting subtitle timing and placement:</H4> + +<DL> + <DT><CODE>-subdelay <sec></CODE></DT> + <DD>Delays subtitles by <sec> seconds. Can be negative.</DD> + + <DT><CODE>-subfps <rate></CODE></DT> + <DD>Specify frame/sec rate of subtitle file (float number)</DD> + + <DT><CODE>-subpos <0 - 100></CODE></DT> + <DD>Specify the position of subtitles.</DD> +</DL> <P>If you experience a growing delay between the movie and the subtitles when using a MicroDVD subtitle file, most likely the frame rate of the movie and @@ -803,6 +812,9 @@ The command line options differ slightly for the different formats: <P>About DVD subtitles, read the <A HREF="cd-dvd.html#dvd">DVD section</A>.</P> + +<H3><A NAME="mpsub">1.4.1 MPlayer's own subtitle format (MPsub)</A></H3> + <P><B>MPlayer</B> introduces a new subtitle format called <B>MPsub</B>. It was designed by me (Gabucino). Basically its main feature is being <I>dynamically</I> time-based (although it has frame-based mode too). Example @@ -833,7 +845,7 @@ The command line options differ slightly for the different formats: Display</B>. OSD is used to display current time, volume bar, seek bar etc.</P> -<H4>INSTALLING OSD and SUB</H4> +<H3><A NAME="install_osd">1.4.2 Installing OSD and subtitles</A></H3> <P>You need an <B>MPlayer</B> font package to be able to use OSD/SUB feature. There are many ways to get it:</P> @@ -958,105 +970,71 @@ TV tuner</B>.</P> <H3><A NAME="tv_compilation">2.5.1 Compilation</A></H3> -<UL> +<OL> <LI>First, you have to recompile. <CODE>./configure</CODE> will autodetect kernel headers of v4l stuff and the existence of <CODE>/dev/video*</CODE> entries. If they exist, TV support will be built (see the output of <CODE>./configure</CODE>).</LI> <LI>Make sure your tuner works with another TV software in Linux, for example xawtv.</LI> -</UL> +</OL> -<P><B>Hint:</B> Are the colors messed up? Then your tuner cannot display +<BLOCKQUOTE> + <B>Hint</B><BR> + Are the colors messed up? Then your tuner cannot display in YV12 colorspace. Try I420 (<CODE>-vc rawi420</CODE>) or YUY2, UYVY, RGB32 (<CODE>-vo sdl</CODE>) colorspaces. - You can specify these with the <CODE>outfmt=YV12</CODE> option, see below.</P> + You can specify these with the <CODE>outfmt=YV12</CODE> option, see below. +</BLOCKQUOTE> <H3><A NAME="tv_options">2.5.2 Available options</A></H3> -<TABLE BORDER=0> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>on</CODE></TD> - <TD> </TD> - <TD>Use TV input.</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>noaudio</CODE></TD> - <TD> </TD> - <TD>No sound, thanks.</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>driver</CODE></TD> - <TD></TD> - <TD> <B>dummy</B> - NULL TV input :) Used for testing only, generates dummy +<DL> + <DT><CODE>on</CODE></DT> + <DD>Use TV input.</DD> + + <DT><CODE>noaudio</CODE></DT> + <DD>No sound, thanks.</DD> + + <DT><CODE>driver</CODE></DT> + <DD><B>dummy</B> - NULL TV input :) Used for testing only, generates dummy input.<BR> <B>v4l</B> - Captures images from standard V4L interface (default - <CODE>/dev/video0</CODE>).</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>device</CODE></TD> - <TD> </TD> - <TD>Specify a device other than the default <CODE>/dev/video0</CODE>.</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>input</CODE></TD> - <TD> </TD> - <TD>Specify from which input of the TV tuner you wish to grab + <CODE>/dev/video0</CODE>).</DD> + + <DT><CODE>device</CODE></DT> + <DD>Specify a device other than the default <CODE>/dev/video0</CODE>.</DD> + + <DT><CODE>input</CODE></DT> + <DD>Specify from which input of the TV tuner you wish to grab (e.g. <B>television</B>, <B>s-video</B>, <B>composite</B>, ...)<BR> - Prints the available ones during init.</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>freq</CODE></TD> - <TD> </TD> - <TD>Specify the frequency to set the tuner to (e.g. <B>511.250</B>).</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>outfmt</CODE></TD> - <TD> </TD> - <TD>Specify the output format the tuner should use to transport images to us + Prints the available ones during init.</DD> + + <DT><CODE>freq</CODE></DT> + <DD>Specify the frequency to set the tuner to (e.g. <B>511.250</B>).</DD> + + <DT><CODE>outfmt</CODE></DT> + <DD>Specify the output format the tuner should use to transport images to us (<B>rgb32</B>, <B>rgb24</B>, <B>yv12</B>, <B>uyvy</B>, <B>i420</B> (for i420 you have to pass the <CODE>-vc rawi420</CODE> option, because of a fourcc - conflict)).</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>width</CODE></TD> - <TD> </TD> - <TD>width of the output window in pixels</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>height</CODE></TD> - <TD> </TD> - <TD>height of the output window in pixels</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>norm</CODE></TD> - <TD> </TD> - <TD>available: PAL, SECAM, NTSC</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>channel</CODE></TD> - <TD> </TD> - <TD>Set the tuner to the given channel.</TD> -</TR> -<TR> - <TD> </TD> - <TD VALIGN="top"><CODE>chanlist</CODE></TD> - <TD> </TD> - <TD>available: <CODE>us-bcast, us-cable, europe-west, europe-east, etc</CODE></TD> -</TR> -</TABLE> + conflict)).</DD> + + <DT><CODE>width</CODE></DT> + <DD>width of the output window in pixels</DD> + + <DT><CODE>height</CODE></DT> + <DD>height of the output window in pixels</DD> + + <DT><CODE>norm</CODE></DT> + <DD>available: PAL, SECAM, NTSC</DD> + + <DT><CODE>channel</CODE></DT> + <DD>Set the tuner to the given channel.</DD> + + <DT><CODE>chanlist</CODE></DT> + <DD>available: <CODE>us-bcast, us-cable, europe-west, europe-east, etc</CODE></DD> +</DL> <H3><A NAME="tv_keyboard">2.5.3 Keyboard control</A></H3> @@ -1353,7 +1331,7 @@ TV tuner</B>.</P> <H3><A NAME="default_controls">3.2.1 Default controls</A></H3> -<H4>Keyboard</H4> +<H4>Keyboard controls from terminal:</H4> <TABLE BORDER=0> <TR><TD> </TD><TD><- or -></TD><TD> </TD><TD>seek backward/forward 10 seconds</TD></TR> @@ -1377,7 +1355,7 @@ TV tuner</B>.</P> <TR><TD></TD><TD>7 or 8</TD><TD></TD><TD>adjust saturation</TD></TR> </TABLE> -<H4>GUI</H4> +<H4>GUI keyboard controls:</H4> <TABLE BORDER=0> <TR><TD> </TD><TD>, and .</TD><TD> </TD><TD>previous / next file</TD></TR> @@ -1394,7 +1372,7 @@ TV tuner</B>.</P> <TR><TD></TD><TD>m</TD><TD></TD><TD>toggle mute</TD></TR> </TABLE> -<H4>TV</H4> +<H4>Keyboard controls for TV input:</H4> <TABLE BORDER=0> <TR><TD> </TD><TD>h or l</TD><TD> </TD><TD>select previous/next channel</TD></TR> @@ -1434,7 +1412,7 @@ ENTER pt_step 1 1 <P>You can have a full list by running <CODE>mplayer -input keylist</CODE></P> -<H4>Keyboard</H4> +<H4>Keyboard:</H4> <UL> <LI>Any printable character</LI> @@ -1456,9 +1434,7 @@ ENTER pt_step 1 1 <LI>DOWN</LI> </UL> -<H4>Mouse</H4> - -<P>Note: mouse is only supported under X</P> +<H4>Mouse (only supported under X):</H4> <UL> <LI>MOUSE_BTN0 (Left button)</LI> @@ -1470,9 +1446,7 @@ ENTER pt_step 1 1 <LI>MOUSE_BTN9</LI> </UL> -<H4>Joystick</H4> - -<P>Note: joystick support must be enabled at compile time</P> +<H4>Joystick (support must be enabled at compile time):</H4> <UL> <LI>JOY_RIGHT or JOY_AXIS0_PLUS</LI> @@ -1481,7 +1455,7 @@ ENTER pt_step 1 1 <LI>JOY_DOWN or JOY_AXIS1_PLUS</LI> <LI>JOY_AXIS2_PLUS</LI> <LI>JOY_AXIS2_MINUS</LI> - <LI>....</LI> + <LI>...</LI> <LI>JOY_AXIS9_PLUS</LI> <LI>JOY_AXIS9_MINUS</LI> </UL> diff --git a/DOCS/encoding.html b/DOCS/encoding.html index b18f8e2c22..5be3ad8d7f 100644 --- a/DOCS/encoding.html +++ b/DOCS/encoding.html @@ -114,36 +114,30 @@ estimation of recommended video bitrate in order to fit on a CD. Also, the audio is encoded only once, unlike in 2-pass mode. The schematics:</P> -<TABLE> - <TR> - <TD><CODE>rm frameno.avi</CODE></TD> - <TD><B>remove conflicting temporary file</B></TD> - </TR> - <TR> - <TD><CODE>mencoder <file/DVD> -ovc frameno -o - frameno.avi</CODE></TD> - <TD><B><U>First pass:</U> an audio-only avi file will be created, containing - ONLY the requested audio stream. Don't forget <CODE>-lameopts</CODE>, if - you need to set it. If you were encoding a long movie, MEncoder prints - the recommended bitrate values for 650Mb, 700Mb, and 800Mb destination - sizes, after this pass finishes.</B></TD> - </TR> - <TR> - <TD><CODE>mencoder <file/DVD> -oac copy -pass 1 - -ovc divx4 -divx4opts br=<bitrate></CODE></TD> - <TD><B><U>Second pass:</U> alias the first pass of DivX4 video encoding. - Optionally specify the video bitrate MEncoder printed at the end of the - previous pass.</B></TD> - </TR> - <TR> - <TD><CODE>mencoder <file/DVD> -oac copy -pass 2 - -ovc divx4 -divx4opts br=<bitrate></CODE></TD> - <TD><B><U>Third pass:</U> alias the second pass of DivX4 video encoding. - Optionally specify the video bitrate MEncoder printed at the end of the - previous pass. In this pass, audio from <CODE>frameno.avi</CODE> will be - inserted into the destination file.. and it's all ready!</B></TD> - </TR> -</TABLE> +<OL> + <LI>Remove conflicting temporary file: + <P><CODE>rm frameno.avi</CODE></P></LI> + <LI>First pass: + <P><CODE>mencoder <file/DVD> -ovc frameno -o frameno.avi</CODE></P> + <P>An audio-only avi file will be created, containing + <B>only</B> the requested audio stream. Don't forget <CODE>-lameopts</CODE>, + if you need to set it. If you were encoding a long movie, <B>MEncoder</B> + prints the recommended bitrate values for 650Mb, 700Mb, and 800Mb + destination sizes, after this pass finishes.</P></LI> + <LI>Second pass: + <P><CODE>mencoder <file/DVD> -oac copy -pass 1 + -ovc divx4 -divx4opts br=<bitrate></CODE></P> + <P>Alias the first pass of DivX4 video encoding. + Optionally specify the video bitrate <B>MEncoder</B> printed at the end of + the previous pass.</P></LI> + <LI>Third pass: + <P><CODE>mencoder <file/DVD> -oac copy -pass 2 + -ovc divx4 -divx4opts br=<bitrate></CODE></P> + <P>Alias the second pass of DivX4 video encoding. + Optionally specify the video bitrate <B>MEncoder</B> printed at the end of + the previous pass. In this pass, audio from <CODE>frameno.avi</CODE> will + be inserted into the destination file.. and it's all ready!</P></LI> +</OL> <H4>Example for 3-pass encoding:</H4> @@ -264,15 +258,17 @@ files. With simple framecopy it can create MJPEG (Motion JPEG) or MPNG (Motion PNG) files.</P> -<H4>Explanation of the process</H4> +Explanation of the process: -<P><B>MEncoder</B> <I>decodes</I> the input image(s) with <CODE>libjpeg</CODE> - (when decoding PNGs, it will use <B>libpng</B>).</P> +<OL> + <LI><B>MEncoder</B> <I>decodes</I> the input image(s) with <CODE>libjpeg</CODE> + (when decoding PNGs, it will use <B>libpng</B>).</LI> -<P><B>MEncoder</B> then feeds the decoded image to the chosen video compressor - (DivX4, Xvid, ffmpeg msmpeg4, etc...). Watch for the PNG decoder, as - currently it can output only to RGB formats, thus can't be used with codecs - that require YUV as input, like DivX4 or ffmpeg's msmpeg4.</P> + <LI><B>MEncoder</B> then feeds the decoded image to the chosen video compressor + (DivX4, Xvid, ffmpeg msmpeg4, etc...). Watch for the PNG decoder, as + currently it can output only to RGB formats, thus can't be used with codecs + that require YUV as input, like DivX4 or ffmpeg's msmpeg4.</LI> +</OL> <H4>Examples</H4> diff --git a/DOCS/sound.html b/DOCS/sound.html index 66be60f359..3063e3f418 100644 --- a/DOCS/sound.html +++ b/DOCS/sound.html @@ -119,20 +119,21 @@ <TR><TD></TD><TD>Driver:</TD><TD><A HREF="ftp://ftp.infradead.org/pub/pcsp">ftp://ftp.infradead.org/pub/pcsp</A></TD></TR> </TABLE> -<UL> - <LI>On Linux, a 2.4.x kernel is highly recommended. Kernel 2.2 is not tested.</LI> - <LI>If sound clicks when playing from CD-ROM, turn on IRQ unmasking, e.g. - <CODE>hdparm -u1 /dev/cdrom</CODE> (<CODE>man hdparm</CODE>). This is - generally beneficial and described more detailed in the <A - HREF="cd-dvd.html#drives">CD-ROM section</A>.</LI> - <LI>Sharing your sound card with another application like XMMS is <B>strongly - discouraged</B>! If the other sound application is using ESD, start - <B>MPlayer</B> with the <CODE>-vo sdl:esd</CODE> option to combine both - sound streams. In fact, the option <CODE>-vo sdl:esd</CODE> could be used - with ESD even when playing <B>Mplayer</B> alone.</LI> - <LI>Feedback to this document is welcome. Please tell us how <B>MPlayer</B> - and your sound card(s) worked together.</LI> -</UL> +<P>On Linux, a 2.4.x kernel is highly recommended. Kernel 2.2 is not tested.</P> + +<P>If sound clicks when playing from CD-ROM, turn on IRQ unmasking, e.g. + <CODE>hdparm -u1 /dev/cdrom</CODE> (<CODE>man hdparm</CODE>). This is + generally beneficial and described more detailed in the <A + HREF="cd-dvd.html#drives">CD-ROM section</A>.</P> + +<P>Sharing your sound card with another application like XMMS is <B>strongly + discouraged</B>! If the other sound application is using ESD, start + <B>MPlayer</B> with the <CODE>-vo sdl:esd</CODE> option to combine both + sound streams. In fact, the option <CODE>-vo sdl:esd</CODE> could be used + with ESD even when playing <B>Mplayer</B> alone.</P> + +<P>Feedback to this document is welcome. Please tell us how <B>MPlayer</B> + and your sound card(s) worked together.</P> <H4><A NAME="plugins">2.3.2.2 Audio plugins</A></H4> diff --git a/DOCS/users_against_developers.html b/DOCS/users_against_developers.html index 28136dd54b..1569d7b392 100644 --- a/DOCS/users_against_developers.html +++ b/DOCS/users_against_developers.html @@ -2,7 +2,7 @@ <HTML> <HEAD> - <TITLE>Flame Wars - MPlayer - The Movie Player for Linux</TITLE> + <TITLE>Developer Cries - MPlayer - The Movie Player for Linux</TITLE> <LINK REL="stylesheet" TYPE="text/css" HREF="default.css"> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> </HEAD> @@ -10,14 +10,14 @@ <BODY> -<H1>In medias res</H1> +<H1>Appendix F - Developer Cries</H1> <P>There are two major topics which always cause huge dispute and flame on the <A HREF="http://mplayerhq.hu/pipermail/mplayer-users/">mplayer-users</A> mailing list. Number one is the topic of the</P> -<H2><A NAME="gcc">GCC 2.96 series</A></H2> +<H2><A NAME="gcc">GCC 2.96</A></H2> <P><B>The background:</B> The GCC <B>2.95</B> series is an official GNU release and version 2.95.3 of GCC is the most bug-free in that series. @@ -74,7 +74,7 @@ use 3.1 instead of 2.96. If you do not want to or cannot use the binary packages, here is how you can compile GCC 3.1 from source:</P> -<UL> +<OL> <LI>Go to the <A HREF="http://gcc.gnu.org/mirrors.html">GCC mirrors page</A> page and download <CODE>gcc-core-3.1.tar.gz</CODE>. This includes the complete C compiler and is sufficient for <B>MPlayer</B>. If you also want @@ -94,10 +94,10 @@ <CODE>make bootstrap</CODE></LI> <LI>Now you can install GCC (as root) by typing<BR> <CODE>make install</CODE></LI> -</UL> +</OL> -<H2><A NAME="binary">Binary distribution of MPlayer</A></H2> +<H2><A NAME="binary">Binary distribution</A></H2> <P>This was the second big problem but has been solved as of version 0.90-pre1. <B>MPlayer</B> previously contained source from the OpenDivX project, diff --git a/DOCS/video.html b/DOCS/video.html index cfb6e9c91a..ab4852b50a 100644 --- a/DOCS/video.html +++ b/DOCS/video.html @@ -40,7 +40,7 @@ <CODE>01:00.0 VGA compatible controller: Matrox Graphics, Inc.: Unknown device 0525</CODE> <CODE>Memory at d8000000 (32-bit, prefetchable)</CODE> </P></LI> - <LI>from mga_vid kernel driver messages (use dmesg): + <LI>from mga_vid kernel driver messages (use <CODE>dmesg</CODE): <P><CODE>mga_mem_base = d8000000</CODE></P></LI> </UL> @@ -462,24 +462,29 @@ <P>SDL video output supports displaying subtitles under the movie, on the (if present) black bar.</P> -<P>Here are some notes about SDL out in <B>MPlayer</B>.</P> +<P><B>There are several command line switches for SDL:</B></P> +<DL> + <DT><CODE>-vo sdl:name</CODE></DT> + <DD>specifies sdl video driver to use (i.e.. aalib, dga, x11)</DD> -<TABLE BORDER=0> - <TR><TD COLSPAN=4><P><B>There are several command line switches for SDL:</B></P></TD></TR> - <TR><TD> </TD><TD><CODE>-vo sdl:name</CODE></TD><TD> </TD><TD> - specifies sdl video driver to use (i.e.. aalib, dga, x11)</TD></TR> - <TR><TD></TD><TD><CODE>-ao sdl:name</CODE></TD><TD></TD><TD>specifies sdl audio driver to use (i.e.. dsp, - esd, arts)</TD></TR> - <TR><TD></TD><TD><CODE>-noxv</CODE></TD><TD></TD><TD>disables XVideo hardware acceleration</TD></TR> - <TR><TD></TD><TD><CODE>-forcexv</CODE></TD><TD></TD><TD>tries to force XVideo acceleration</TD></TR> + <DT><CODE>-ao sdl:name</CODE></DT> + <DD>specifies sdl audio driver to use (i.e. dsp, esd, arts)</DD> + + <DT><CODE>-noxv</CODE></DT> + <DD>disables XVideo hardware acceleration</DD> + + <DT><CODE>-forcexv</CODE></DT> + <DD>tries to force XVideo acceleration</DD> +</DL> +<TABLE BORDER=0> <TR><TD COLSPAN=4><P><B>SDL Keys:</B></P></TD></TR> <TR><TD></TD><TD><CODE>F</CODE></TD><TD></TD><TD>toggles fullscreen/windowed mode</TD></TR> <TR><TD></TD><TD><CODE>C</CODE></TD><TD></TD><TD>cycles available fullscreen modes</TD></TR> <TR><TD></TD><TD><CODE>W/S</CODE></TD><TD></TD><TD>mappings for * and / (mixer control)</TD></TR> </TABLE> -<H4>KNOWN BUGS:</H4> +<H4>Known bugs:</H4> <UL> <LI>Keys pressed under sdl:aalib console driver repeat forever. (use -vo aa!) @@ -537,15 +542,21 @@ <P>The FBdev output takes some additional parameters above the others:</P> -<TABLE BORDER=0> - <TR><TD> </TD><TD><CODE>-fb</CODE></TD><TD> </TD><TD> - specify the framebuffer device to use (/dev/fb0)</TD></TR> - <TR><TD></TD><TD><CODE>-fbmode</CODE></TD><TD></TD><TD>mode name to use (according to /etc/fb.modes)</TD></TR> - <TR><TD></TD><TD><CODE>-fbmodeconfig</CODE></TD><TD></TD><TD> config file of modes (default /etc/fb.modes)</TD></TR> - <TR><TD></TD><TD><CODE>-monitor_hfreq</CODE></TD><TD></TD><TD ROWSPAN=3>IMPORTANT values, see example.conf</TD></TR> - <TR><TD></TD><TD><CODE>-monitor_vfreq</CODE></TD><TD></TD></TR> - <TR><TD></TD><TD><CODE>-monitor_dotclock</CODE></TD><TD></TD></TR> -</TABLE> +<DL> + <DT><CODE>-fb</CODE></DT> + <DD>specify the framebuffer device to use (/dev/fb0)</DD> + + <DT><CODE>-fbmode</CODE></DT> + <DD>mode name to use (according to /etc/fb.modes)</DD> + + <DT><CODE>-fbmodeconfig</CODE></DT> + <DD>config file of modes (default /etc/fb.modes)</DD> + + <DT><CODE>-monitor_hfreq</CODE></DT> + <DT><CODE>-monitor_vfreq</CODE></DT> + <DT><CODE>-monitor_dotclock</CODE></DT> + <DD><STRONG>Important</STRONG> values, see <CODE>example.conf</CODE></DD> +</DL> <P>If you want to change to a specific mode, then use</P> @@ -580,40 +591,31 @@ <P><B>WARNING</B>: on non-Linux systems, use <A HREF="#vidix">VIDIX</A> for mga_vid!</P> -<P>To use it, you first have to compile mga_vid.o:</P> - -<P><CODE> cd drivers<BR> - make</CODE></P> - -<P>Then create /dev/mga_vid device:</P> - -<P><CODE> mknod /dev/mga_vid c 178 0</CODE></P> - -<P>and load the driver with</P> - -<P><CODE> insmod mga_vid.o</CODE></P> - -<P>You should verify the memory size detection using the 'dmesg' command. If - it's bad, use the mga_ram_size option (rmmod mga_vid first), specify card's - memory size in MB:</P> - -<P><CODE> insmod mga_vid.o mga_ram_size=16</CODE></P> - -<P>To make it load/unload automatically when needed, first insert the following line - at the end of /etc/modules.conf:</P> - -<P><CODE> alias char-major-178 mga_vid</CODE></P> - -<P>Then copy the <CODE>mga_vid.o</CODE> module to the appropriate place under - <CODE>/lib/modules/<kernel version>/somewhere</CODE>.</P> - -<P>Then run</P> - -<P><CODE> depmod |