Mercurial > mplayer.hg

--- a/DOCS/man/en/mplayer.1	Fri Apr 16 20:15:41 2004 +0000
+++ b/DOCS/man/en/mplayer.1	Sat Apr 17 03:59:00 2004 +0000
@@ -151,10 +151,10 @@
 .PP
 Another great feature of MPlayer is the wide range of supported output
 drivers.
-It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, Quartz,
-but you can also use GGI, SDL (and all their drivers), VESA (on every VESA
-compatible card, even without X11), some low level card-specific drivers (for
-Matrox, 3Dfx and ATI) and some hardware MPEG decoder boards, such as the
+It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, libcaca, DirectFB,
+Quartz, but you can also use GGI, SDL (and all their drivers), VESA (on every
+VESA compatible card, even without X11), some low level card-specific drivers
+(for Matrox, 3Dfx and ATI) and some hardware MPEG decoder boards, such as the
 Siemens DVB, DXR2 and DXR3/\:Hollywood+.
 Most of them support software or hardware scaling, so you can enjoy movies in
 fullscreen.
@@ -1868,6 +1868,21 @@
 If you use an output driver which can't know the resolution of the screen
 (fbdev/\:x11 and/\:or TVout) this is where you can specify the horizontal and
 vertical resolution.
+.PP
+.B \-screenh <pixels>
+.br
+.B \-screenw <pixels>
+.TP
+If you use an output driver which can't know the resolution of the screen
+(fbdev/\:x11 and/\:or TVout) this is where you can specify the horizontal and
+vertical resolution.
+.TP
+.B \-screenh <pixels>
+.B \-screenw <pixels>
+.br
+If you use an output driver which can't know the resolution of the screen
+(fbdev/\:x11 and/\:or TVout) this is where you can specify the horizontal and
+vertical resolution.
 .TP
 .B \-stop-xscreensaver
 Turns off xscreensaver at startup and turns it on again on exit.
@@ -3608,6 +3623,9 @@
 .B aa\ \ \ \ \
 ASCII art output driver that works on a text console.
 .TP
+.B caca\ \ \
+Colour AsCii Art output driver that works on a text console.
+.TP
 .B bl\ \ \ \ \
 Video playback using the Blinkenlights UDP protocol.
 This driver is highly hardware specific.
--- a/DOCS/tech/libvo2.txt	Fri Apr 16 20:15:41 2004 +0000
+++ b/DOCS/tech/libvo2.txt	Sat Apr 17 03:59:00 2004 +0000
@@ -182,7 +182,7 @@

 > Maybe we should allow video driver to change the libin driver ?
 forget libin. most input stuff is handled by libvo drivers.
-think of all X stuff (x11,xv,dga,xmga,gl), SDL, aalib, svgalib.
+think of all X stuff (x11,xv,dga,xmga,gl), SDL, aalib, libcaca, svgalib.
 only a few transparent drivers (fbdev, mga, tdfxfb, vesa) has not, but all
 of them are running on console (and maybe on second head) at fullscreen, so
 they may not need mouse events. console keyboard events are already catched
--- a/DOCS/xml/en/documentation.xml	Fri Apr 16 20:15:41 2004 +0000
+++ b/DOCS/xml/en/documentation.xml	Sat Apr 17 03:59:00 2004 +0000
@@ -63,8 +63,8 @@
 <emphasis role="bold">DivX</emphasis> movies too (and you don't need the avifile
 library at all!). Another big feature of mplayer is the wide range of
 supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib,
-fbdev, AAlib, DirectFB, but you can use GGI and SDL (and this way all their
-drivers) and some lowlevel card-specific drivers (for Matrox, 3Dfx and
+fbdev, AAlib, libcaca, DirectFB, but you can use GGI and SDL (and this way all
+their drivers) and some lowlevel card-specific drivers (for Matrox, 3Dfx and
 Radeon, Mach64, Permedia3) too! Most of them supports software or hardware
 scaling, so you can enjoy movies in fullscreen.
 <application>MPlayer</application> supports displaying through some
--- a/DOCS/xml/en/video.xml	Fri Apr 16 20:15:41 2004 +0000
+++ b/DOCS/xml/en/video.xml	Sat Apr 17 03:59:00 2004 +0000
@@ -1115,6 +1115,99 @@
 </sect4>


+<sect4 id="caca">
+<title><systemitem class="library">libcaca</systemitem> - Colour AsCii Art library</title>
+
+<para>
+The <ulink url="http://sam.zoy.org/projects/libcaca/"><systemitem class="library">libcaca</systemitem></ulink>
+library is a graphics library that outputs text instead of pixels, so that it
+can work on older video cards or text terminals. It is not unlike the famous
+<systemitem class="library">AAlib</systemitem> library.
+<systemitem class="library">libcaca</systemitem> needs a terminal to work, thus
+it should work on all Unix systems (including Mac OS X) using either the
+<systemitem class="library">slang</systemitem> library or the
+<systemitem class="library">ncurses</systemitem> library, on DOS using the
+<systemitem class="library">conio.h</systemitem> library, and on Windows systems
+using either <systemitem class="library">slang</systemitem> or
+<systemitem class="library">ncurses</systemitem> (through Cygwin emulation) or
+<systemitem class="library">conio.h</systemitem>. If
+<filename>./configure</filename>
+detects <systemitem class="library">libcaca</systemitem>, the caca libvo driver
+will be built.
+</para>
+
+<itemizedlist>
+<title>The differences with <systemitem class="library">AAlib</systemitem> are
+  the following:</title>
+<listitem><simpara>
+   16 available colours for character output (256 colour pairs)
+  </simpara></listitem>
+<listitem><simpara>
+   color image dithering
+  </simpara></listitem>
+</itemizedlist>
+
+<itemizedlist>
+<title>But <systemitem class="library">libcaca</systemitem> also has the
+  following limitations:</title>
+<listitem><simpara>
+   no support for brightness, contrast, gamma
+  </simpara></listitem>
+</itemizedlist>
+
+<para>
+You can use some keys in the caca window to change rendering options:
+</para>
+
+<informaltable>
+<tgroup cols="2">
+<thead>
+  <row><entry>Key</entry><entry>Action</entry></row>
+</thead>
+<tbody>
+<row><entry><keycap>d</keycap></entry><entry>
+  Toggle <systemitem class="library">libcaca</systemitem> dithering methods.
+  </entry></row>
+<row><entry><keycap>a</keycap></entry><entry>
+  Toggle <systemitem class="library">libcaca</systemitem> antialiasing.
+  </entry></row>
+<row><entry><keycap>b</keycap></entry><entry>
+  Toggle <systemitem class="library">libcaca</systemitem> background.
+  </entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<variablelist>
+<title><systemitem class="library">libcaca</systemitem> will also look for certain environment variables:</title>
+<varlistentry>
+  <term><option>CACA_DRIVER</option></term>
+  <listitem><simpara>
+    Set recommended caca driver. e.g. ncurses, slang, x11.
+    </simpara></listitem>
+</varlistentry>
+<varlistentry>
+  <term><option>CACA_GEOMETRY (X11 only)</option></term>
+  <listitem><simpara>
+    Specifies the number of rows and columns. e.g. 128x50.
+    </simpara></listitem>
+</varlistentry>
+<varlistentry>
+  <term><option>CACA_FONT (X11 only)</option></term>
+  <listitem><simpara>
+    Specifies the font to use. e.g. fixed, nexus.
+    </simpara></listitem>
+</varlistentry>
+</variablelist>
+
+<para>
+Use the <option>-framedrop</option> option if your computer is not fast
+enough to render all frames.
+</para>
+
+</sect4>
+
+
 <sect4 id="vesa">
 <title>VESA - output to VESA BIOS</title>