updates

nvidia tv-out section
etc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8261 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 100 insertions, 26 deletions

diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index a1f783e0e0..c8ad86b83c 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -174,6 +174,7 @@
                   <LI><A HREF="video.html#tv-out_matrox_g450">2.3.1.5.2 Matrox G450/G550 cards</A></LI>
                   <LI><A HREF="video.html#tv-out_ati">2.3.1.5.3 ATI cards</A></LI>
                   <LI><A HREF="video.html#tv-out_voodoo">2.3.1.5.4 Voodoo 3</A></LI>
+                  <LI><A HREF="video.html#tv-out_nvidia">2.3.1.5.5 nVidia</A></LI>
                 </UL>
               </LI>
             </UL>
@@ -205,6 +206,7 @@
           <LI><A HREF="encoding.html#libavcodec">2.4.5 Encoding with the libavcodec codec family</A></LI>
           <LI><A HREF="encoding.html#image_files">2.4.6 Encoding from multiple input image files (JPEGs or PNGs)</A></LI>
           <LI><A HREF="encoding.html#vobsub">2.4.7 Extracting DVD subtitles to a Vobsub file</A></LI>
+          <LI><A HREF="encoding.html#aspect">2.4.8 Preserving aspect ratio</A></LI>
         </UL>
       </LI>
       <LI><A HREF="#tv">2.5 TV input</A>
@@ -620,13 +622,15 @@
     have problems with YV12 display, see <A HREF="video.html#xv_s3">S3 Xv
     section</A> for details. Older, Trio cards have no, or slow hardware
     support.</LI>
-  <LI><B>nVidia cards</B>: very bad choice for video playing (nVidia
-    <A HREF="users_against_developers.html#nvidia">does not think so</A>). 
-    nVidia's cards have very cheap and bad quality chips. Moreover, <B>the
-    built-in nVidia driver in XFree86 does not support hardware YUV
+  <LI><B>nVidia cards</B>: may or may not be good choice for video playing.
+    If you do not have a GeForce2 (or newer) card, it's not likely to work
+    without bugs.
+    <B>The built-in nVidia driver in XFree86 does not support hardware YUV
     acceleration on all nVidia cards.</B> You have to download nVidia's
-    closed-source drivers from nVidia.com. See the <A
-    HREF="video.html#xv_nvidia">nVidia Xv driver</A> section for details.</LI>
+    closed-source drivers from nVidia.com. See the
+    <A HREF="video.html#xv_nvidia">nVidia Xv driver</A> section for
+    details. Please also check the <A HREF="video.html#tv-out_nvidia">nVidia
+    TV-out section</A> if you wish to use a TV.</LI>
   <LI><B>3DLabs GLINT R3 and Permedia3</B>: a VIDIX driver is provided
     (pm3_vid). Please see the <A HREF="video.html#vidix">VIDIX</A> section for
     details.</LI>
@@ -721,6 +725,8 @@
   <LI>If you have a V4L compatible <B>TV tuner</B> card, and wish to watch/grab
     and encode movies with MPlayer, read the <A HREF="#tv">TV input</A>
     section.</LI>
+  <LI>There is a neat <B>OSD Menu</B> support ready to be used. Check the
+    <A HREF="#menu">OSD Menu</A> section.</LI>
 </UL>
 
 <P>Then build MPlayer:</P>
@@ -952,19 +958,27 @@
 
 <H3><A NAME="menu">1.4.3 OSD menu</A></H3>
 
-<P>MPlayer has an OSD Menu interface, which is not only completely user
-  defined, but is displayed as OSD, on the currently played video!</P>
+<P>MPlayer has a completely user definiable OSD Menu interface.</P>
 
 <H4>Installation</H4>
 
 <OL>
+  <LI>compile MPlayer by passing the <CODE>--enable-new-conf
+    --enable-menu</CODE> parameters to <CODE>./configure</CODE></LI>
+  <LI>make sure you have an OSD font installed</LI>
   <LI>copy <CODE>etc/menu.conf</CODE> to your <CODE>.mplayer</CODE>
     directory</LI>
   <LI>copy <CODE>etc/input.conf</CODE> to your <CODE>.mplayer</CODE>
     directory, or to the system-wide MPlayer config dir (default:
-    <CODE>/usr/local/share/mplayer</CODE>)</LI>
+    <CODE>/usr/local/etc/mplayer</CODE>)</LI>
+  <LI>check and edit <CODE>input.conf</CODE> to enable menu movement
+    keys (it is described there).</LI>
+  <LI>start MPlayer by the following example:<BR>
+    <CODE>$ mplayer -menu file.avi</CODE></LI>
+  <LI>push any menu key you defined</LI>
 </OL>
 
+<P>
 
 
 <H2><A NAME="rtc">1.5 RTC</A></H2>
diff --git a/DOCS/encoding.html b/DOCS/encoding.html
index 17621ddfda..3008ee3ede 100644
--- a/DOCS/encoding.html
+++ b/DOCS/encoding.html
@@ -102,24 +102,22 @@
 
 <H3><A NAME="rescaling">2.4.2 Rescaling movies</A></H3>
 
-<P>Often the need to resize movie images' size emerges. Its reasons can be many,
-  examples are decreasing output file size, encoding SVCDs to DivX. Ripped DVDs
-  are mostly rescaled, for example a 4:3 DVD should be 640x480, especially
-  when you want it to fit to 1 CD, and have good quality at the same time.
-  SVCDs have 480x480 size, and their header contains the aspect ratio the
-  player should use (Ex.: 480x480 + 4:3 = 640x480). However when encoding to
-  AVI (DivX) files, you have be aware that AVI headers don't store this
-  value. Thus, the only solution is rescaling.</P>
+<P>Often the need to resize movie images' size emerges. Its reasons can be
+  many: decreasing file size, network bandwidth, etc. Most people
+  even do rescaling when converting DVDs or SVCDs to DivX AVI. <B>This is bad.</B>
+  Instead of even you doing so, read the <A HREF="#aspect">Preserving
+  aspect ratio</A> section.</P>
 
 <P>The scaling process is handled by the <I>'scale'</I> video filter:
-  <CODE>-vop scale=X:Y</CODE>. Its quality can be set with the
+  <CODE>-vop scale=widht:height</CODE>. Its quality can be set with the
   <CODE>-sws</CODE> option. If it's not specified, MEncoder will use 0:
   fast bilinear.</P>
 
-<P>Usage:<BR>
-  <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder sample-svcd.mpg -ovc lavc -lavcopts
-    vcodec=mpeg4:more_options -vop scale=640:480 -oac copy -o
-    output.avi</CODE></P>
+<H5>Usage:</H5>
+
+<P><CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder input.mpg -ovc lavc -lavcopts
+  vcodec=mpeg4:more_options -vop scale=640:480 -oac copy -o
+  output.avi</CODE></P>
 
 
 <H3><A NAME="copying">2.4.3 Stream copying</A></H3>
@@ -268,5 +266,33 @@ Explanation of the process:
     -vobsuboutindex 0 -vobsuboutid fr -sid 1</CODE></P>
 
 
+<H3><A NAME="aspect">2.4.8 Preserving aspect ratio</A></H3>
+
+<P>DVDs and SVCDs (i.e. MPEG1/2) files contain an aspect ratio value,
+  which describes how should the player scale the video stream, so humans
+  won't have egg heads (ex.: 480x480 + 4:3 = 640x480). However when encoding
+  to AVI (DivX) files, you have be aware that AVI headers don't store this
+  value. Rescaling the movie is disgusting and time consuming, there
+  must be a better feature!</P>
+
+<P>There is.</P>
+
+<P>MPEG4 has an unique feature: the video stream can contain
+  its needed aspect ratio. Yes, just like MPEG1/2 files (DVD, SVCD).
+  Regretfully, there are <U>no</U> video players outside which support this
+  attribute. Except MPlayer.</P>
+
+<P>This feature can be used only with <B>libavcodec</B>'s <CODE>mpeg4</CODE>
+  codec. Keep in mind: although MPlayer will correctly play the created file,
+  other players will use the wrong aspect ratio.</P>
+
+<P>You seriously should crop the black bands over and below the movie image.
+  See TODO.</P>
+
+<H5>Usage:</H5>
+
+<P><CODE>$ mencoder sample-svcd.mpg -ovc lavc -lavcopts
+  vcodec=mpeg4:aspect=16.0/9.0 -vop crop=714:548:0:14 -oac copy -o output.avi</CODE></P>
+
 </BODY>
 </HTML>
diff --git a/DOCS/sound.html b/DOCS/sound.html
index 828aa959fa..8fb383fa4b 100644
--- a/DOCS/sound.html
+++ b/DOCS/sound.html
@@ -20,7 +20,7 @@
 <TABLE BORDER=0>
   <TR><TD COLSPAN=4><P><B>General:</B></P></TD></TR>
   <TR><TD>&nbsp;&nbsp;</TD><TD VALIGN=top>oss</TD><TD>&nbsp;&nbsp;</TD><TD>OSS (ioctl) driver (supports hardware AC3 passthrough)</TD></TR>
-  <TR><TD></TD><TD VALIGN=top>sdl</TD><TD></TD><TD>SDL driver (supports up/downsampling, <B>ESD</B>, <B>ARTS</B> etc)</TD></TR>
+  <TR><TD></TD><TD VALIGN=top>sdl</TD><TD></TD><TD>SDL driver (supports <B>ESD</B>, <B>ARTS</B> etc)</TD></TR>
   <TR><TD></TD><TD VALIGN=top>nas</TD><TD></TD><TD>NAS (Network Audio System) driver</TD></TR>
   <TR><TD></TD><TD VALIGN=top>alsa5</TD><TD></TD><TD>native ALSA 0.5 driver</TD></TR>
   <TR><TD></TD><TD VALIGN=top>alsa9</TD><TD></TD><TD>native ALSA 0.9 driver (supports hardware AC3 passthrough)</TD></TR>
@@ -52,7 +52,7 @@
     default). If you experience glitches, halts or anything out of the
     ordinary, try <CODE>-ao sdl</CODE> (NOTE: you need to have SDL libraries
     and header files installed). The SDL audio driver helps in a lot of cases
-    and also supports ESD, ARTS, and up/downsampling. (ESD is the sound daemon
+    and also supports ESD, ARTS. (ESD is the sound daemon
     from GNOME, ARTS is from KDE.)</LI>
   <LI>If you have ALSA version 0.5, then you almost always have to use
     <CODE>-ao alsa5</CODE> , since ALSA 0.5 has buggy OSS emulation code, and
@@ -183,8 +183,8 @@
 <P>MPlayer fully supports up/downsampling of the sound. This plugin can
   be used if you have a fixed frequency sound card or if you are
   stuck with an old sound card that is only capable of max 44.1kHz.
-  Limitations in your hardware are not auto detected, so you have to specify
-  the sample frequency explicitly. This plugin has one switch:
+  Whether is usage of this plugin is neccessary or not, is <B>autodetected</B>.
+  This plugin has one switch:
   <CODE>fout</CODE> which is used for setting the desired output sample
   frequency. It defaults to 48kHz, and is given in
   &lt;Hz&gt;.</P>
diff --git a/DOCS/video.html b/DOCS/video.html
index c34559738e..b05a896628 100644
--- a/DOCS/video.html
+++ b/DOCS/video.html
@@ -1438,5 +1438,39 @@ for 16:9 TV:  -vop lavc,expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024
 
 <P>Check <A HREF="http://www.iki.fi/too/tvout-voodoo3-3000-xfree">this URL</A>.</P>
 
+
+<H4><A NAME="tv-out_nvidia">2.3.1.5.5 nVidia</A></H4>
+
+<P>First, you MUST download the closed-source drivers from
+  <A HREF="http://nvidia.com">http://nvidia.com</A>. I will not describe the
+  installation and configuration process because it does not cover the
+  scope of this documentation.</P>
+
+<P>After XFree86, XVideo, and 3D acceleration is properly working,
+  edit your card's Device section in the <CODE>XF86Config</CODE> file,
+  according to the following example (adapt for your card/TV):</P>
+
+<PRE>
+Section "Device"
+        Identifier      "GeForce"
+        VendorName      "ASUS"   
+        BoardName       "nVidia GeForce2/MX 400"
+        Driver          "nvidia"
+        #Option         "NvAGP" "1"
+        Option          "NoLogo"   
+        Option          "CursorShadow"  "on"
+
+        Option          "TwinView"
+        Option          "TwinViewOrientation" "Clone"
+        Option          "MetaModes" "1024x768,640x480"
+        Option          "ConnectedMonitor" "CRT, TV"  
+        Option          "TVStandard" "PAL-B"
+        Option          "TVOutFormat" "Composite"
+
+EndSection
+</PRE>
+
+<P>Of course the important thing is the TwinView part.</P>
+
 </BODY>
 </HTML>