diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /DOCS | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
| download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'DOCS')
65 files changed, 220 insertions, 4901 deletions
diff --git a/DOCS/man/cs/mplayer.1 b/DOCS/man/cs/mplayer.1 index f126adf89c..48acf6a9be 100644 --- a/DOCS/man/cs/mplayer.1 +++ b/DOCS/man/cs/mplayer.1 @@ -1,5 +1,5 @@ .\" Synced with r24573 -.\" MPlayer (C) 2000-2008 MPlayer Team +.\" MPlayer (C) 2000-2009 MPlayer Team .\" Tuto man stránku napsali/píší Gabucino, Diego Biurrun, Jonas Jermann .\" Překlad (translation): Jiří Heryán .\" Kódování (encoding): UTF-8 diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1 index 14b21feecc..bcc520412b 100644 --- a/DOCS/man/de/mplayer.1 +++ b/DOCS/man/de/mplayer.1 @@ -1,4 +1,4 @@ -.\" MPlayer (C) 2000-2008 MPlayer Team +.\" MPlayer (C) 2000-2009 MPlayer Team .\" Diese Man-Page wurde/wird von Moritz Bunkus, Sebastian Krmer, .\" Tobias Diedrich gepflegt. .\" Encoding: iso-8859-1 diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index bac5306e5e..d6fd64969a 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -1,5 +1,5 @@ .\" $Revision$ -.\" MPlayer (C) 2000-2008 MPlayer Team +.\" MPlayer (C) 2000-2009 MPlayer Team .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann . .\" -------------------------------------------------------------------------- @@ -31,7 +31,7 @@ .\" Title .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2008-01-01" "The MPlayer Project" "The Movie Player" +.TH MPlayer 1 "2009-01-05" "The MPlayer Project" "The Movie Player" . .SH NAME mplayer \- movie player @@ -595,6 +595,7 @@ alang=en profile-desc="profile for dvdnav:// streams" profile=protocol.dvd mouse-movements=yes +nocache=yes [extension.flv] profile-desc="profile for .flv files" @@ -1034,8 +1035,10 @@ Display the main menu at MPlayer startup. .TP .B \-mouse\-movements Permit MPlayer to receive pointer events reported by the video -output driver (currently only derivatives of X11 are supported). +output driver. Necessary to select the buttons in DVD menus. +Supported for X11 based VOs (x11, xv, xvmc, etc.) and the gl, gl2, direct3d and +macosx VOs. . .TP .B \-noar @@ -1163,6 +1166,16 @@ When playing an MPEG-TS stream, MPlayer/\:MEncoder will use the first program (if present) with the chosen audio stream. . .TP +.B \-ausid <ID> (also see \-alang) +Select audio substream channel. +Currently the valid range is 0x55..0x75 and applies only to MPEG-TS when handled +by the native demuxer (not by libavformat). +The format type may not be correctly identified because of how this information +(or lack thereof) is embedded in the stream, but it will demux correctly the +audio streams when multiple substreams are present. +MPlayer prints the available substream IDs when run with \-identify. +. +.TP .B \-alang <language code[,language code,...]> (also see \-aid) Specify a priority list of audio languages to use. Different container formats employ different language codes. @@ -2075,8 +2088,8 @@ external subtitles and Matroska tracks. You may also want to use \-embeddedfonts. .br .I NOTE: -When fontconfig is compiled-in, \-ass turns on \-fontconfig -unless explicitly turned off with \-nofontconfig. +Unlike normal OSD, libass uses fontconfig by default. To disable it, use +\-nofontconfig. . .TP .B \-ass\-border\-color <value> @@ -2260,8 +2273,9 @@ With fontconfig, this option determines the fontconfig font name. Enables the usage of fontconfig managed fonts. .br .I NOTE: -\-ass automatically turns this on unless explicitly overridden -with \-nofontconfig. +By default fontconfig is used for libass-rendered subtitles and not used for +OSD. With \-fontconfig it is used for both libass and OSD, with \-nofontconfig +it is not used at all. . .TP .B \-forcedsubsonly @@ -2754,6 +2768,9 @@ Useful if you want to have certain connections established automatically. .IPs (no)estimate Estimate the audio delay, supposed to make the video playback smoother (default: enabled). +.IPs (no)autostart (default: disabled) +Automatically start jackd if necessary. +Note that this seems unreliable and will spam stdout with server messages. .RE .PD 1 . @@ -3547,6 +3564,10 @@ Choose the display device to use in fullscreen. .IPs shared_buffer Write output to a shared memory buffer instead of displaying it and try to open an existing NSConnection for communication with a GUI. +.IPs buffer_name=<name> +Name of the shared buffer created with shm_open as well as the name of +the NSConnection MPlayer will try to open (default: "mplayerosx"). +Setting buffer_name implicitly enables shared_buffer. .RE .PD 1 . diff --git a/DOCS/man/es/mplayer.1 b/DOCS/man/es/mplayer.1 index 31229b82b5..ec46b308ee 100644 --- a/DOCS/man/es/mplayer.1 +++ b/DOCS/man/es/mplayer.1 @@ -1,6 +1,6 @@ .\" synced with 1.685 .\" Encoding: iso-8859-1 -.\" MPlayer (C) 2000-2004 El equipo de MPlayer +.\" MPlayer (C) 2000-2009 El equipo de MPlayer .\" Esta pgina de manual ha sido escrita por Gabucino, Diego Biurrun, .\" Jonas Jermann y traducida al espaol por Juan Martn Lpez. .\" diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 21e3624540..cab727dd17 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1,6 +1,6 @@ .\" synced with r28126 .\" Encoding: iso-8859-1 -.\" MPlayer (C) 2000-2008 MPlayer Team +.\" MPlayer (C) 2000-2009 MPlayer Team .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann .\" Traduction: Guillaume POIRIER < poirierg AT gmail POINT com >, . @@ -7847,7 +7847,7 @@ O <codec> peut tre: lavc, xvidenc, lame, toolame, twolame, nuv, xvfw, faac, x264enc, mpeg, lavf. . . -.SS lame (\-lameopts) +.SS mp3lame (\-lameopts) . .TP .B "help\ \ \ " diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1 index 2d76734f79..4a986fe97e 100644 --- a/DOCS/man/hu/mplayer.1 +++ b/DOCS/man/hu/mplayer.1 @@ -1,5 +1,5 @@ -.\" Synced with r28126 -.\" MPlayer (C) 2000-2008 MPlayer Team +.\" Synced with r28279 +.\" MPlayer (C) 2000-2009 MPlayer Team .\" Ezt a man oldalt Gabucino, Diego Biurrun s Jonas Jermann kszti/ksztette .\" Karbantart: Gabrov .\" Encoding/kdols: iso-8859-2 @@ -33,7 +33,7 @@ .\" Nv .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2008. 12. 17." "MPlayer Project" "A film lejtsz" +.TH MPlayer 1 "2009. 01. 10." "MPlayer Project" "A film lejtsz" . .SH NV mplayer \- film lejtsz @@ -592,6 +592,7 @@ alang=en profile-desc="profil dvdnav:// folyamokhoz" profile=protocol.dvd mouse-movements=yes +nocache=yes [extension.flv] profile-desc="profil .flv fjlokhoz" @@ -1034,9 +1035,10 @@ A fmen megjelentse az MPlayer indtsakor. .TP .B \-mouse\-movements Engedlyezi az MPlayernek a pozcionl eszkz esemnyeinek fogadst, -melyeket a vide kimeneti eszkz kld (jelenleg csak az X11 leszrmazottak -tmogatottak). +melyeket a vide kimeneti eszkz kld. Szksges a dvd menkben a gombok kivlasztshoz. +Az X11 alap VO-kban (x11, xv, xvmc, stb.), a gl, a gl2, a direct3d s a +macosx VO-kban tmogatott. . .TP .B \-noar @@ -1167,6 +1169,16 @@ fut. Ha egy MPEG-TS folyamot jtszol le, az MPlayer/\:MEncoder az els programot (ha van) fogja hasznlni a kivlaszott audi folyammal. . .TP +.B \-ausid <ID> (lsd mg \-alang) +Kivlasztja az audi alfolyam csatornjt. +Jelenleg az rvnyes tartomny 0x55..0x75 s csak az MPEG-TS-re vonatkozik, +amennyiben azt a natv demuxer kezeli (nem a libavformat). +A formtum tpus lehet, hogy rosszul lesz megllaptva, attl fggen, hogy +ez az informci (vagy annak hinya) hogyan van az adatfolyamban, de jl +demux-lja az audi folyamokat, ha tbb alfolyam tallhat. +Az MPlayer kirja az elrhet alfolyam ID-ket a \-identify kapcsolval. +. +.TP .B \-alang <nyelv kd[,nyelv kd,...]> (lsd mg \-aid) A hasznlni kvnt nyelvek priorts listja. A klnbz kontner formtumok klnbz nyelv kdokat alkalmaznak. @@ -2085,8 +2097,8 @@ kls feliratokhoz s Matroska svokhoz. Ajnlott mg a \-embeddedfonts engedlyezse is. .br .I MGEJEGYZS: -Ha a fontconfig be van fordtva, a \-ass bekapcsolja a \-fontconfig -kapcsolt, kivve, ha explicit le van tiltva a \-nofontconfig-gal. +A normlis OSD-vel ellenttben a libass a fontconfig-ot hasznlja alaprtelmezsknt. +A letiltshoz hasznld a \-nofontconfig kapcsolt. . .TP .B \-ass\-border\-color <rtk> @@ -2270,8 +2282,9 @@ A fontconfig-gal ez az opci a fontconfig bettpus nevt hatrozza meg. A fontconfig-gal karbantartott bettpusok hasznlatnak engedlyezse. .br .I MEGJEGYZS: -A \-ass automatikusan bekapcsolja ezt, kivve, ha explicit fell van -brlva a \-nofontconfig kapcsolval. +Alaprtelmezsben a fontconfig a libass ltal renderelt feliratoknl hasznlatos, +az OSD-nl nem. A \-fontconfig kapcsolval hasznlhat libass-hoz s OSD-hez, a +\-nofontconfig kapcsolval egyltaln nem lesz felhasznlva. . .TP .B \-forcedsubsonly @@ -2768,6 +2781,9 @@ Hasznos, ha bizonyos kapcsolatokat automatikusan akarsz felpteni. .IPs (no)estimate Megbecsli az audi ksleltetst, a szndkok szerint folyamatosabb teszi a vide lejtszst (alaprtelmezett: engedlyezve). +.IPs (no)autostart (alaprtelmezett: letiltva) +Automatikusan elindtja a jackd-t, ha szksges. +Emlkezz r, hogy ez nem megbzhat s a szerver zenetek bepiszktjk az stdout-ot. .RE .PD 1 . @@ -3560,6 +3576,13 @@ Mac OS X CoreVideo kimeneti vide vezrl .RSs .IPs device_id=<szm> Teljes kpernys lejtszsnl a hasznlni kvnt kperny eszkz. +.IPs shared_buffer +A kimenetet egy osztott memria bufferbe rja a megjelentse helyett s +megprbl megnyitni egy ltez NSConnection-t a GUI-val trtn kommunikcihoz. +.IPs buffer_name=<nv> +Az osztott buffer neve, mely az shm_open-nel jn ltre, valamint az +NSConnection neve, amit az MPlayer megprbl megnyitni (alaprtelmezett: "mplayerosx"). +A buffer_name megadsa implicit engedlyezi a shared_buffer-t. .RE .PD 1 . diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1 index f22aa15445..3519da9da8 100644 --- a/DOCS/man/it/mplayer.1 +++ b/DOCS/man/it/mplayer.1 @@ -1,6 +1,6 @@ .\" synced with r27454 .\" Encoding: iso-8859-1 -.\" MPlayer (C) 2000-2008 MPlayer Team +.\" MPlayer (C) 2000-2009 MPlayer Team .\" Questa pagina di manuale stata fatta da Gabucino, Diego Biurrun, .\" Jonas Jermann .\" Traduzione in italiano di Daniele Forghieri, aggiornamenti PaulTT @@ -2930,7 +2930,7 @@ dispositivi disponibili. .PD 1 . .TP -.B dxr2 (vedi anche \-dxr2) (solo DXR2 only) +.B dxr2 (vedi anche \-dxr2) (solo DXR2) Driver di uscita audio specifico per la scheda Creative DXR2 . .TP diff --git a/DOCS/man/pl/mplayer.1 b/DOCS/man/pl/mplayer.1 index f21290e19c..f4dc1eed24 100644 --- a/DOCS/man/pl/mplayer.1 +++ b/DOCS/man/pl/mplayer.1 @@ -1,6 +1,6 @@ .\" synced with 1.1114 .\" Encoding: iso-8859-2 -.\" MPlayer (C) 2000-2008 MPlayer Team +.\" MPlayer (C) 2000-2009 MPlayer Team .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann .\" Tumaczenie: Wacaw "Torinthiel" Schiller (torinthiel@wp.pl) .\" i Maciej "Paszczi" Paszta (paszczi@go2.pl) diff --git a/DOCS/man/ru/mplayer.1 b/DOCS/man/ru/mplayer.1 index 5450a54677..a23b25eac5 100644 --- a/DOCS/man/ru/mplayer.1 +++ b/DOCS/man/ru/mplayer.1 @@ -1,4 +1,4 @@ -.\" MPlayer (C) 2000-2008 MPlayer Team +.\" MPlayer (C) 2000-2009 MPlayer Team .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann .\" Translated by Vladimir Voroshilov <voroshil@gmail.com> .\" Encoding: koi8-r diff --git a/DOCS/man/zh/mplayer.1 b/DOCS/man/zh/mplayer.1 index 8c91fcace0..a18f1f1ba0 100644 --- a/DOCS/man/zh/mplayer.1 +++ b/DOCS/man/zh/mplayer.1 @@ -6,7 +6,7 @@ .\" encoding audio rate; alphamap; upsampling; sweep; .\" aligned buffers; instancenumber; .\" -.\" MPlayer (C) 2000-2008 MPlayer 团队 +.\" MPlayer (C) 2000-2009 MPlayer 团队 .\" 本(英文)手册页由 Gabucino, Diego Biurrun, Jonas Jermann 编写 .\" 视频滤镜、通用编解码器选项、特定编解码器专用选项三个章节由 .\" JRaSH <jrash06 AT 163.com>重新翻译 diff --git a/DOCS/tech/libmpcodecs.txt b/DOCS/tech/libmpcodecs.txt index dcd70dc38b..5015f5dcc0 100644 --- a/DOCS/tech/libmpcodecs.txt +++ b/DOCS/tech/libmpcodecs.txt @@ -12,11 +12,11 @@ The VIDEO path: [MPlayer core] | (1) - _____V______ (2) /~~~~~~~~~~\ (3,4) |~~~~~~| - | | -----> | vd_XXX.c | -------> | vd.c | - | decvideo | \__________/ <-(3a)-- |______| - | | -----, ,.............(3a,4a).....: - ~~~~~~~~~~~~ (6) V V + ______V______ (2) /~~~~~~~~~~\ (3,4) |~~~~~~| + | | -----> | vd_XXX.c | -------> | vd.c | + | dec_video | \__________/ <-(3a)-- |______| + | | -----, ,.............(3a,4a).....: + ~~~~~~~~~~~~~ (6) V V /~~~~~~~~\ /~~~~~~~~\ (8) | vf_X.c | --> | vf_Y.c | ----> vf_vo.c / ve_XXX.c \________/ \________/ @@ -27,54 +27,56 @@ The VIDEO path: Short description of video path: 1. MPlayer/MEncoder core requests the decoding of a compressed video frame: - calls decvideo.c::decode_video() + calls dec_video.c::decode_video(). -2. decode_video() calls the previously ( init_video() ) selected video codec +2. decode_video() calls the video codec previously selected in init_video(). (vd_XXX.c file, where XXX == vfm name, see the 'driver' line of codecs.conf) 3. The codec should initialize the output device before decoding the first - frame, it may happen in init() or at the middle of the first decode(), see + frame. It may happen in init() or at the middle of the first decode(), see 3a. It means calling vd.c::mpcodecs_config_vo() with the image dimensions, - and the _preferred_ (mean: internal, native, best) colorspace. - NOTE: This colorspace may not be equal to the actually used colorspace, it's - just a _hint_ for the csp matching algorithm, and mainly used _only_ when - csp conversion is required, as input format of the converter. + and the _preferred_ (meaning: internal, native, best) colorspace. + NOTE: This colorspace may not be equal to the colorspace that is actually + used. It's just a _hint_ for the colorspace matching algorithm and mainly + used as input format of the converter, but _only_ when colorspace + conversion is required, 3a. Selecting the best output colorspace: The vd.c::mpcodecs_config_vo() function will go through the outfmt list - defined by codecs.conf's 'out' lines, and query both vd (codec) and vo - (output device/filter/encoder) if it's supported or not. + defined by the 'out' lines in codecs.conf and query both vd (codec) and + vo (output device/filter/encoder) if the format is supported or not. For the vo, it calls the query_format() function of vf_XXX.c or ve_XXX.c. It should return a set of feature flags, the most important ones for this - stage are: VFCAP_CSP_SUPPORTED (csp supported directly or by conversion) - and VFCAP_CSP_SUPPORTED_BY_HW (csp supported WITHOUT any conversion). + stage are: VFCAP_CSP_SUPPORTED (colorspace supported directly or by + conversion) and VFCAP_CSP_SUPPORTED_BY_HW (colorspace supported + WITHOUT any conversion). For the vd (codec), control() with VDCTRL_QUERY_FORMAT will be called. - If it doesn't implement VDCTRL_QUERY_FORMAT, (i.e. answers CONTROL_UNKNOWN - or CONTROL_NA), it will be assumed to be CONTROL_TRUE (csp supported)! + If it does not implement VDCTRL_QUERY_FORMAT, (i.e. answers CONTROL_UNKNOWN + or CONTROL_NA), it is assumed to be CONTROL_TRUE (colorspace supported)! - So, by default, if the list of supported colorspaces is constant, doesn't - depend on the actual file's/stream's header, it's enough to list them - in codecs.conf ('out' field), and don't implement VDCTRL_QUERY_FORMAT. + So, by default, if the list of supported colorspaces is constant and does + not depend on the actual file/stream header, then it is enough to list the + formats in codecs.conf ('out' field) and not implement VDCTRL_QUERY_FORMAT. This is the case for most codecs. - If the supported csp list depends on the file being decoded, list the - possible out formats (colorspaces) in codecs.conf, and implement the - VDCTRL_QUERY_FORMAT to test the availability of the given csp for the - given video file/stream. + If the supported colorspace list depends on the file being decoded, list + the possible out formats (colorspaces) in codecs.conf and implement the + VDCTRL_QUERY_FORMAT to test the availability of the given colorspace for + the given video file/stream. The vd.c core will find the best matching colorspace, depending on the - VFCAP_CSP_SUPPORTED_BY_HW flag (see vfcap.h). If no match at all, it - will try again with the 'scale' filter inserted between vd and vo. - If still no match, it will fail :( + VFCAP_CSP_SUPPORTED_BY_HW flag (see vfcap.h). If no match can be found, + it will try again with the 'scale' filter inserted between vd and vo. + If this is unsuccessful, it will fail :( 4. Requesting buffer for the decoded frame: The codec has to call mpcodecs_get_image() with proper imgtype & imgflag. It will find the optimal buffering setup (preferred stride, alignment etc) and return a pointer to the allocated and filled up mpi (mp_image_t*) struct. - The 'imgtype' controls the buffering setup, i.e. STATIC (just one buffer, - it 'remembers' its contents between frames), TEMP (write-only, full update), + The 'imgtype' controls the buffering setup, i.e. STATIC (just one buffer that + 'remembers' its content between frames), TEMP (write-only, full update), EXPORT (memory allocation is done by the codec, not recommended) and so on. The 'imgflags' set up the limits for the buffer, i.e. stride limitations, readability, remembering content etc. See mp_image.h for the short @@ -88,11 +90,11 @@ Short description of video path: Also take care of other imgflags, like MP_IMGFLAG_PRESERVE and MP_IMGFLAG_READABLE, MP_IMGFLAG_ |