From 8613b3bb62f14d5eacece2c4793f744c3fefd876 Mon Sep 17 00:00:00 2001 From: gabucino Date: Tue, 4 Feb 2003 21:38:31 +0000 Subject: fixing others' 10/100liters git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9283 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/bugreports.html | 2 +- DOCS/codecs.html | 2 +- DOCS/encoding.html | 6 +++--- DOCS/mplayer.1 | 10 ++++----- DOCS/sound.html | 7 +++++-- DOCS/video.html | 57 ++++++++++++++++++++++++++-------------------------- 6 files changed, 43 insertions(+), 41 deletions(-) (limited to 'DOCS') diff --git a/DOCS/bugreports.html b/DOCS/bugreports.html index dc422aba75..b75ef9bd50 100644 --- a/DOCS/bugreports.html +++ b/DOCS/bugreports.html @@ -86,7 +86,7 @@ subscribe to actually receive your answer.

-

B.4 What to report

+

B.4 What to report

You may need to include log, configuration or sample files in your bug report. If some of them are quite big then it is better to upload them to our diff --git a/DOCS/codecs.html b/DOCS/codecs.html index 17b2793a58..27e064f157 100644 --- a/DOCS/codecs.html +++ b/DOCS/codecs.html @@ -198,7 +198,7 @@ have filenames like these: vid_cvid.xa, vid_h263.xa, vid_iv50.xa. -

XAnim is video codec family xanim, so you may want to use the -vfm xanim +

XAnim is video codec family xanim, so you may want to use the -vfm xanim option to tell MPlayer to use them if possible.

Tested codecs include: Indeo 3.2, 4.1, 5.0, CVID, diff --git a/DOCS/encoding.html b/DOCS/encoding.html index d6d9c7bb46..09167cb285 100644 --- a/DOCS/encoding.html +++ b/DOCS/encoding.html @@ -160,12 +160,12 @@

7.5.1 Appending multiple AVI files

-

As a side-effect of fixing broken AVI files, MEncoder can be used to fix the - result of appending 2 (or more) AVI files:

+

As a side-effect, the broken AVI fixer function enables MEncoder to append + 2 (or more) AVI files:

Command: cat 1.avi 2.avi | mencoder -noidx -ovc copy -oac copy -o output.avi -

-

Note: This expects 1.avi and 2.avi to use the same codecs, resolution, +

Note: This expects 1.avi and 2.avi to use the same codecs, resolution, stream rate etc, and at least 1.avi must not be broken. You may need to fix your input AVI files first, as described above.

diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index 6b1f1cf9ba..0cee9d4a26 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -452,7 +452,7 @@ empty channels are inserted (unless mixing from mono to stereo, then the mono channel is repeated in both output channels). If the number of output channels is smaller than the number of input channels, results depend on the audio decoder (\-afm). -Mplayer asks the decoder to decode the audio into as many channels as +MPlayer asks the decoder to decode the audio into as many channels as specified. Now it's up to the decoder to fulfill the requirement. If the decoder outputs more channels than requested, the exceeding channels @@ -556,7 +556,7 @@ Play/\:convert only first frames, then quit. .B \-hr\-mp3\-seek (.MP3 only) Hi\-res mp3 seeking. Default is: enabled when playing from external MP3 file, as we need to seek -to the very exact position to keep A/\:V sync.It can be slow especially when +to the very exact position to keep A/\:V sync. It can be slow especially when seeking backwards \- it has to rewind to the beginning to find the exact frame. .TP @@ -726,8 +726,7 @@ height of the output window .IPs fps= framerate at which to capture video (frames per second) .IPs buffersize= -maximum size of the capture buffer in megabytes (default: half of the -physical memory) +maximum size of the capture buffer in megabytes (default: dynamical) .IPs norm= available: PAL, SECAM, NTSC .IPs channel= @@ -740,7 +739,7 @@ Use _ for spaces in names (or play with quoting ;-). The channel names will then be written using OSD, and the commands tv_step_channel, tv_set_channel and tv_last_channel will then be usable using a remote (see lirc). Not compatible with frequency parameter. -Warning : The channel number will then be the position in the 'channels' list, +Warning: The channel number will then be the position in the 'channels' list, beginning with 1. Example: use tv://1, tv://2, tv_set_channel 1, tv_set_channel 2, etc. .IPs audiorate= @@ -866,7 +865,6 @@ fonts: ~/\:.mplayer/\:font/\:font.desc, default for FreeType fonts: With FreeType, this option determines path to the text font file. .br The \-subfont-* options are available only with FreeType support compiled in. -If FreeType support is enabled, the old font support can't be used. .I EXAMPLE: .PD 0 diff --git a/DOCS/sound.html b/DOCS/sound.html index c78c26d69f..3f361796d4 100644 --- a/DOCS/sound.html +++ b/DOCS/sound.html @@ -105,7 +105,7 @@ DRIVER Max kHz Max Channels - Max Opens + Max Opens[1] @@ -251,7 +251,7 @@ PC Speaker or DAC - OK (Use the SDL driver: -ao sdl) + OK none   Linux PC speaker OSS driver @@ -262,6 +262,9 @@ +

[1]: the number of applications that are able to use the + device at the same time.

+

Feedback to this document is welcome. Please tell us how MPlayer and your sound card(s) worked together.

diff --git a/DOCS/video.html b/DOCS/video.html index f64a69b1d3..69aaa1e7fa 100644 --- a/DOCS/video.html +++ b/DOCS/video.html @@ -220,13 +220,13 @@

2.3.1.2.2 DGA

-
PREAMBLE
+

PREAMBLE

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).

-
WHAT IS DGA
+

WHAT IS DGA

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. @@ -253,7 +253,7 @@ driver that controls this chip. So it does not work on every system.

-
INSTALLING DGA SUPPORT FOR MPLAYER
+

INSTALLING DGA SUPPORT FOR MPLAYER

First make sure X loads the DGA extension, see in /var/log/XFree86.0.log:

@@ -290,7 +290,7 @@ much faster.

-
RESOLUTION SWITCHING
+

RESOLUTION SWITCHING

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 @@ -322,7 +322,7 @@ -

DGA & MPLAYER
+

DGA & MPLAYER

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 @@ -330,7 +330,7 @@ driver for MPlayer works.

-
FEATURES
+

FEATURES

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 @@ -369,7 +369,7 @@ CPU time!) depending on the implementation of DGA for your hardware.

-
SPEED ISSUES
+

SPEED ISSUES

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. @@ -394,7 +394,7 @@ CPUs might work at 400 MHZ and above.

-
KNOWN BUGS
+

KNOWN BUGS

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 @@ -460,7 +460,7 @@ W/Smappings for * and / (mixer control) -

KNOWN BUGS
+

KNOWN BUGS

  • Keys pressed under sdl:aalib console driver repeat forever. (use -vo aa!) @@ -471,20 +471,20 @@

    2.3.1.2.4 SVGAlib

    -
    INSTALLATION
    +

    INSTALLATION

    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.

    -
    NOTES
    +

    NOTES

    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.

    -
    EGA (4BPP) SUPPORT
    +

    EGA (4BPP) SUPPORT

    SVGAlib incorporates EGAlib, and MPlayer has the possibility to display any movie in 16 colors, thus usable in the following sets:

    @@ -725,7 +725,7 @@ (I guess that TV-out frequently is standalone head or standalone output at least.)

    -
    ADVANTAGES
    +

    ADVANTAGES

    • You have the possibility to watch movies even if Linux doesn't know @@ -747,7 +747,7 @@ all your monitor options.
    -
    DISADVANTAGES
    +

    DISADVANTAGES

    • It works only on x86 systems.
      • @@ -757,7 +757,7 @@

      Don't use this driver with GCC 2.96! It won't work!

      -
      COMMAND LINE OPTIONS AVAILABLE FOR VESA
      +

      COMMAND LINE OPTIONS AVAILABLE FOR VESA

      -vo vesa:opts
      currently recognized: dga to force dga mode and nodga to @@ -766,7 +766,7 @@ autodetection of dga mode.
      -
      KNOWN PROBLEMS AND WORKAROUNDS
      +

      KNOWN PROBLEMS AND WORKAROUNDS

      • If you have installed NLS font on your Linux box and run VESA @@ -820,7 +820,7 @@

        2.3.1.2.12 VIDIX

        -
        PREAMBLE
        +

        PREAMBLE

        VIDIX is the abbreviation for VIDeo Interface for *niX. It was designed and introduced as an interface for fast user-space drivers @@ -835,7 +835,7 @@ team in graphics mode switching). I.e. main goal of this interface is to maximize the speed of video playback.

        -
        USAGE
        +

        USAGE

        • You can use standalone video output driver: -vo xvidix
          @@ -855,7 +855,7 @@ Indeed it doesn't matter which video output driver is used with VIDIX. -
          REQUIREMENTS
          +

          REQUIREMENTS

          • video card should be in graphics mode (I write should simply @@ -867,7 +867,7 @@ Indeed it doesn't matter which video output driver is used with VIDIX. able to tell to VIDIX subdevice some video characteristics of server.
          -
          USAGE METHODS
          +

          USAGE METHODS

          When VIDIX is used as subdevice (-vo vesa:vidix) then video mode configuration is performed by video output device @@ -905,11 +905,12 @@ Indeed it doesn't matter which video output driver is used with VIDIX.

          1. Download the development version - of svgalib (for example 1.9.17).
            2. -
          2. OR download a version made by Alex especially for usage with + of svgalib (for example 1.9.17),
            + OR
            + download a version made by Alex especially for usage with MPlayer (it doesn't need the svgalib source to compile) from - here. + here.
          3. Compile the module in the 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.
            4. @@ -1018,7 +1019,7 @@ Indeed it doesn't matter which video output driver is used with VIDIX.

            Then compile and install as usual.

            -
            USAGE
            +

            USAGE

            Hardware decoding (playing standard MPEG1/2 files) can be done with this command:

            @@ -1087,7 +1088,7 @@ for 3:4 TV: -vop lavc,expand=-1:576:-1:-1:1,scale=-1:0,dvbscale for 16:9 TV: -vop lavc,expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024 -
            FUTURE
            +

            FUTURE

            If you have questions or want to hear feature announcements and take part in discussions on this subject, join our @@ -1117,7 +1118,7 @@ for 16:9 TV: -vop lavc,expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024 Linux site. Configure should detect your card automatically, compilation should go without problems.

            -
            USAGE
            +

            USAGE

            -vo dxr3:prebuf:sync:norm=x:<device>
            overlay activates the overlay instead of TVOut. It requires @@ -1398,12 +1399,12 @@ for 16:9 TV: -vop lavc,expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024

            2.3.1.5.3 ATI cards

            -
            PREAMBLE
            +

            PREAMBLE

            Currently ATI doesn't want to support any of its TV-out chips under Linux, because of their licensed Macrovision technology.

            -
            ATI CARDS TV-OUT STATUS ON LINUX
            +

            ATI CARDS TV-OUT STATUS ON LINUX

            • ATI Mach64: Supported by -- cgit v1.2.3