Zr documentation updated plus some typos fixed.

Patch by rsnel@cube.dyndns.org.


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

2 files changed, 130 insertions, 28 deletions

diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index e9d2119161..01456f9220 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -81,7 +81,7 @@ and options given on the command line override either. The syntax of the config
 files is 'option=<value>', everything after a '#' is considered a comment.
 Options that work without values can be enabled by setting them to 'yes' or '1'
 and disabled by setting them to 'no' or '0'. Even suboptions can be specified
-this way.
+in this way.
 
 .I EXAMPLE:
 .br
@@ -384,7 +384,7 @@ codecs.conf.
     \-ac hwac3   enable hardware AC3 passthrough
                 (see documentation)
     \-ac vorbis  use libvorbis
-    \-ac ffmp3   use ffmpeg's MP3 decoder (SLOW)
+    \-ac ffmp3   use FFmpeg's MP3 decoder (SLOW)
 
 See \-ac help for a full list of available codecs.
 .TP
@@ -393,7 +393,7 @@ Force usage of a specific audio codec family, according to its driver name
 in codecs.conf and fall back to default if it failed.
 
 .I EXAMPLE:
-    \-afm ffmpeg     use ffmpeg's libavcodec (mp1/2/3)
+    \-afm ffmpeg     use FFmpeg's libavcodec (mp1/2/3)
     \-afm acm        use a matching Win32 codec
 
 See \-afm help for a full list of available drivers.
@@ -1084,9 +1084,60 @@ Specifies compression level for PNG output (-vo png)
     9  max compression
 .TP
 .B \-zr* (\-vo zr only)
-You can get a list and an explanation of available options executing
-.I mplayer \-zrhelp
+All the options that start with \-zr are specific to the zr video output
+driver.
 
+.TP
+.B \-zrxdoff <x display offset>, \-zrydoff <y display offset>
+If the movie is smaller than the TV screen, these options control the position
+of the movie relative to the upper left corner of the screen. The movie
+is centered by default.
+
+.TP
+.B \-zrvdec 1,2,4 , \-zrhdec 1,2,4
+Vertical/horizontal decimation: Ask the driver to send only every 2nd or 4th
+line/pixel of the input image to the MJPEG card and use the scaler of the
+MJPEG card to strech the image to its original size.
+
+.TP
+.B \-zrfd
+Force decimation: Decimation, as specified by -zrhdec and -zrvdec, only happens
+if the hardware scaler can stretch the image to its original size. Use this
+option to force decimation.
+
+.TP
+.B \-zrbw
+Display in black and white (for optimal performance, this option can be
+combined with the 'decode only in black and white' option for codecs
+belonging to the FFmpeg family).
+
+.TP
+.B \-zrquality <1\-20>
+A number from 1 to 20 representing the jpeg encoding quality. 1 gives the best
+quality and 20 gives very bad quality.
+
+.TP
+.B \-zrdev <device>
+Specify the device special file that belongs to your MJPEG card, by default
+this driver takes the first v4l device it can find.
+
+.TP
+.B \-zrnorm PAL|NTSC
+Specify norm PAL/NTSC, the default is 'no change'.
+
+.TP
+.B \-zrhelp
+Display a list of all -zr* options, their default values and an example of
+cinerama mode.
+
+.TP
+.B \-zrcrop <width>x<height>+<x offset>+<y offset>
+Select a part of the input image for display, multiple occurences of this
+option switch on cinerama mode. In cinerama mode the movie is distributed
+over more than one TV (or beamer) to create a larger screen. Options appearing
+after the n-th -zrcrop apply to the n-th MJPEG card, each card should at least
+have a -zrdev in addition to the -zrcrop. For examples, see the output of
+-zrhelp and the Zr section of the documentation.
 
 .SH "PLAYER OPTIONS (MPLAYER ONLY)"
 .TP
diff --git a/DOCS/video.html b/DOCS/video.html
index 004bfbf975..274a247fb4 100644
--- a/DOCS/video.html
+++ b/DOCS/video.html
@@ -993,34 +993,85 @@ recognize <CODE>:vidix</CODE> subdevice.
 
 <P>This is a display-driver (<CODE>-vo zr</CODE>) for a number of MJPEG
   capture/playback cards (tested for DC10+ and Buz, and it should work for the
-  LML33, the DC10). The driver works by encoding the frame to jpeg and then
-  sending it to the card. For the jpeg encoding <B>libavcodec</B> is
-  used, and required.</P>
+  LML33 and the original DC10). The driver works by encoding the frame to jpeg 
+  and then sending it to the card. For the jpeg encoding <B>libavcodec</B> is
+  used, and required. With the special <I>cinerama</I> mode, you can watch
+  movies in true wide screen provided that you have two beamers and two
+  MJPEG cards. Depending on resolution and quality settings, this driver
+  may require a lot of CPU power, remember to specify <CODE>-framedrop</CODE>
+  if your machine is too slow. Note: My AMD K6-2 350MHz is (with <CODE>
+  -framedrop</CODE>) quite adequate for watching VCD sized material and
+  downscaled movies.
 
 <P>This driver talks to the kernel driver available at
   <A HREF="http://mjpeg.sourceforge.net">http://mjpeg.sourceforge.net</A>, so
-  you must get it working first. Then recompile <B>MPlayer</B> with
-  <CODE>--enable-zr</CODE>.</P>
+  you must get it working first. The presence of an MJPEG card is autodetected
+  by the configure script, if autodetection fails, force detection with
 
-Some remarks:
-<UL>
-  <LI>don't start or stop XawTV on the playback device during playback, 
-    it will crash your computer. It is, however, fine to <B>FIRST</B> start 
-    XawTV, <B>THEN</B> start <B>MPlayer</B>, wait for <B>MPlayer</B> to finish 
-    and <B>THEN</B> stop XawTV.</LI>
-  <LI>this driver adds <CODE>-zr*</CODE> command line options. The explanation
-    of these options can be viewed with <CODE>-zrhelp</CODE>. It is possible to
-    crop the input frame (cut borders to make it fit or to enhance performance)
-    and to do other things.</LI>
-  <LI>the driver takes data in YV12 and YUY2 format, this means that some 
-    codecs won't work. Some old VfW (Video for Windows) codecs, for example,
-    are incompatible with this driver. The error message that you will see is: 
-    <CODE>Sorry, selected video_out device is incompatible with this codec.
-    </CODE></LI>
-  <LI>OSD is currently not supported, so you won't see
-    subtitles.</LI>
-</UL>
+<PRE>
+  ./configure --enable-zr
+</PRE>
+
+<P>The output can be controlled by several options, a long description of the
+  options can be found in the man page, a short list of options can be
+  viewed by running
+
+<PRE>
+  mplayer -zrhelp
+</PRE>
+
+<P>Things like scaling and the OSD (on screen display) are not handled by
+  this driver but can be done using the video filters. For example, 
+  suppose that you have a movie with a resolution of <CODE>512x272</CODE> and
+  you want to view it fullscreen on your DC10+. There are three main
+  possibilities, you may scale the movie to a width of <CODE>768</CODE>,
+  <CODE>384</CODE> or <CODE>192</CODE>. For performance and quality reasons,
+  I would choose to scale the movie to <CODE>384x204</CODE> using the fast
+  bilinear software scaler. The commandline is
+
+<PRE>
+  mplayer -vo zr -sws 0 -vop scale=384:204 movie.avi
+</PRE>
+
+<P>Cropping can be done by the <CODE>crop</CODE> filter and by
+  this driver itself. Suppose that a movie is too wide for display on your
+  Buz and that you want to use <CODE>-zrcrop</CODE> to make the movie less
+  wide, the you would issue the following command
+
+<PRE>
+  mplayer -vo zr -zrcrop 720x320+80+0 benhur.avi
+</PRE>
+
+  if you want to use the <CODE>crop</CODE> filter, you would do
+
+<PRE>
+  mplayer -vo zr -vop crop=720:320:80:0 benhur.avi
+</PRE>
+
+<P>Extra occurances of <CODE>-zrcrop</CODE> invoke <I>cinerama</I> mode, i.e.
+  you can distribute the movie over several TV's or beamers to create a larger
+  screen. Suppose you have two beamers. The left one is connected to your Buz
+  at <CODE>/dev/video1</CODE> and the right one is connected to your DC10+ at
+  <CODE>/dev/video0</CODE>. The movie has a resolution of <CODE>704x288</CODE>.
+  Suppose also that you want the right beamer in black and white and that
+  the right beamer should have jpeg frames at quality <CODE>10</CODE>,
+  then you would issue the following command
+
+<PRE>
+  mplayer -vo zr -zrdev /dev/video0 -zrcrop 352x288+352+0 -zrxdoff 0 -zrbw \
+          -zrcrop 352x288+0+0 -zrdev /dev/video1 -zrquality 10 movie.avi
+</PRE>
+
+<P>You see that the options appearing before the second <CODE>-zrcrop</CODE>
+  only apply to the DC10+ and that the options after the second 
+  <CODE>-zrcrop</CODE> apply to the Buz. The maximum number of MJPEG cards
+  participating in <I>cinerama</I> is four, so you can buid a <CODE>2x2</CODE>
+  vidiwall.</P>
 
+<P>Finally an important remark: Do not start or stop XawTV on the playback
+  device during playback, it will crash your computer. It is, however, fine to
+  <B>FIRST</B> start XawTV, <B>THEN</B> start <B>MPlayer</B>, wait for
+  <B>MPlayer</B> to finish and <B>THEN</B> stop XawTV.</P>
 
 <H4><A NAME="dvb">2.3.1.16 DVB</A></H4>