# HG changeset patch # User alex # Date 1044297701 0 # Node ID c82e31b3119492e75240ade1492f3b3147da7f89 # Parent a35bf9da25db55365c8e0fc8e4e33edbf6a5490a my patches sent to dev-eng (i feel me brave) Diego, fix my wording bugs, and dont be angry. diff -r a35bf9da25db -r c82e31b31194 DOCS/documentation.html --- a/DOCS/documentation.html Mon Feb 03 17:06:47 2003 +0000 +++ b/DOCS/documentation.html Mon Feb 03 18:41:41 2003 +0000 @@ -944,7 +944,7 @@
MPlayer introduces a new subtitle format called MPsub. It was - designed by me (Gabucino). Basically its main feature is being + designed by Gabucino. Basically its main feature is being dynamically time-based (although it has frame-based mode too). Example (from DOCS/tech/mpsub.sub):
diff -r a35bf9da25db -r c82e31b31194 DOCS/video.html --- a/DOCS/video.html Mon Feb 03 17:06:47 2003 +0000 +++ b/DOCS/video.html Mon Feb 03 18:41:41 2003 +0000 @@ -182,7 +182,7 @@This document tries to explain in some words what DGA is in general and what - the DGA video output driver for MPlayer can do (and what it - can't).
+This section tries to explain in some words what DGA is in general and what + the DGA video output driver for MPlayer can do (and what it can't).
-DGA is short for Direct Graphics Access and is a means for a program to bypass the X-Server and directly modifying the framebuffer memory. @@ -251,10 +250,10 @@
However DGA has some drawbacks. It seems it is somewhat dependent on the graphics chip you use and on the implementation of the X server's video - driver that controls this chip. So it does not work on every system ...
+ driver that controls this chip. So it does not work on every system. -First make sure X loads the DGA extension, see in /var/log/XFree86.0.log:
@@ -291,7 +290,7 @@ much faster. -The DGA driver allows for switching the resolution of the output signal.
This avoids the need for doing (slow) software scaling and at the same time
@@ -306,10 +305,10 @@
be found at:
/var/log/XFree86.0.log
.
See appendix A for some sample modeline definitions.
+See some working modeline definitions here.
-DGA is used in two places with MPlayer: The SDL driver can be made to make use of it (-vo sdl:dga) and within the DGA driver (-vo dga). The above @@ -317,7 +316,7 @@ driver for MPlayer works.
-The DGA driver is invoked by specifying -vo dga at the command line. The default behavior is to switch to a resolution matching the original @@ -356,7 +355,7 @@ CPU time!) depending on the implementation of DGA for your hardware.
-Generally spoken, DGA framebuffer access should be at least as fast as using the X11 driver with the additional benefit of getting a fullscreen image. @@ -364,7 +363,7 @@ with some care, as for example, with the X11 driver they do not include the time used by the X-Server needed for the actual drawing. Hook a terminal to a serial line of your box and start top to see what is really going on in your - box...
+ box.Generally spoken, the speedup done by using DGA against 'normal' use of X11 highly depends on your graphics card and how well the X-Server module for it @@ -381,7 +380,7 @@ CPUs might work at 400 MHZ and above.
-Well, according to some developers of XFree, DGA is quite a beast. They tell you better not to use it. Its implementation is not always flawless @@ -397,14 +396,14 @@
Section "Modes" @@ -419,24 +418,10 @@ EndSection-
These entries work fine with my Riva128 chip, using nv.o X server driver +
These entries work fine with authors (Acki) Riva128 chip, using nv.o X server driver module.
-If you experience troubles with the DGA driver please feel free to file - a bug report to me (e-mail address below). Please start MPlayer with - the -v option and include all lines in the bug report that start with - vo_dga:
- -Please do also include the version of X11 you are using, the graphics card - and your CPU type. The X11 driver module (defined in XF86-Config) might - also help. Thanks!
- -Acki (acki@acki-netz.de, www.acki-netz.de)
- -SDL (Simple Directmedia Layer) is basically a unified video/audio @@ -480,7 +465,7 @@
W/S
You'll have to install svgalib and its development package in order for MPlayer build its SVGAlib driver (autodetected, but can be forced), and don't forget to edit /etc/vga/libvga.config to suit your card & monitor.
-Be sure not to use the -fs option, since it toggles the usage of the software
scaler, and it's slow. If you really need it, use the -sws 4
option which will produce bad quality, but is somewhat faster.
SVGAlib incorporates EGAlib, and MPlayer has the possibility to display any movie in 16 colors, thus usable in the following sets:
@@ -589,7 +574,7 @@This section is about the Matrox G200/G400/G450/G550 BES (Back-End Scaler) - support, the mga_vid kernel driver. It's active developed by me (A'rpi), and + support, the mga_vid kernel driver. It's active developed by A'rpi, and it has hardware VSYNC support with triple buffering. It works on both framebuffer console and under X.
@@ -745,7 +730,7 @@ (I guess that TV-out frequently is standalone head or standalone output at least.) -monitor_hfreq
,
monitor_vfreq
, monitor_dotclock
somewhere (config
@@ -767,7 +752,7 @@
all your monitor options.Don't use this driver with GCC 2.96! It won't work!
-Command line options available for VESA:
+-vo vesa:opts
VIDIX is the abbreviation for VIDeo Interface for
- *niX.
- VIDIX was designed and introduced as an interface for fast user-space drivers
- providing such video performance as mga_vid does for Matrox cards. It's
- also very portable.
VIDIX is the abbreviation for VIDeo Interface for *niX. + It was designed and introduced as an interface for fast user-space drivers + providing such video performance as mga_vid does for Matrox cards. It's also + very portable.
This interface was designed as an attempt to fit existing video acceleration interfaces (known as mga_vid, rage128_vid, radeon_vid, pm3_vid) into a fixed scheme. It @@ -854,7 +840,7 @@ team in graphics mode switching). I.e. main goal of this interface is to maximize the speed of video playback.
--vo xvidix
When VIDIX is used as subdevice (-vo vesa:vidix
) then
video mode configuration is performed by video output device
(vo_server in short). Therefore you can pass into command line of
MPlayer the same keys as for vo_server. In addition it understands
-double
key as globally visible parameter. (I recommend using
- this key with VIDIX at least for ATI's card).
+ this key with VIDIX at least for ATI cards).
As for -vo xvidix
: currently it recognizes the following
options: -fs -zoom -x -y -double
.
VIDIX is very new technology and it's extremely possible that on your system - (OS=abc CPU=xyz) it won't work. In this case the only solution for you is - porting (mainly libdha) it. But there is a hope, that it will work on those - systems where X11 does.
+VIDIX is a new technology and it's extremely possible that on your system + it won't work. In this case the only solution for you is porting (mainly + libdha) it. But there is a hope, that it will work on those systems where X11 + does.
Since VIDIX requires direct hardware access you can either run it as root or
set the SUID bit on the MPlayer binary (Warning: This is a security
@@ -926,10 +912,18 @@
svgalib-1.9.17/kernel/svgalib_helper
directory to
+ svgalib_helper
directory (it can
+ be found inside the svgalib-1.9.17/kernel/
directory if you've
+ downloaded the source from the svgalib site) and insmod it.svgalib_helper
directory to
mplayer/main/libdha/svgalib_helper
. svgalib_helper
directory and
- insmod it.libdha/Makefile
.
Then compile and install as usual.
-Hardware decoding (playing standard MPEG1/2 files) can be done with this command:
@@ -1099,7 +1093,7 @@ for 16:9 TV: -vop lavc,expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024 -If you have questions or want to hear feature announcements and take part in discussions on this subject, join our @@ -1129,7 +1123,7 @@ Linux site. Configure should detect your card automatically, compilation should go without problems.
--vo dxr3:prebuf:sync:norm=x:<device>
overlay
activates the overlay instead of TVOut. It requires