diff options
| -rw-r--r-- | DOCS/bugreports.html | 4 | ||||
| -rw-r--r-- | DOCS/cd-dvd.html | 2 | ||||
| -rw-r--r-- | DOCS/codecs.html | 57 | ||||
| -rw-r--r-- | DOCS/documentation.html | 23 | ||||
| -rw-r--r-- | DOCS/encoding.html | 42 | ||||
| -rw-r--r-- | DOCS/video.html | 42 |
6 files changed, 72 insertions, 98 deletions
diff --git a/DOCS/bugreports.html b/DOCS/bugreports.html index d351793bc5..68aeed309c 100644 --- a/DOCS/bugreports.html +++ b/DOCS/bugreports.html @@ -227,7 +227,7 @@ Recompile <B>MPlayer</B> with debugging code enabled: and then run <B>MPlayer</B> within gdb using: -<P><CODE> gdb mplayer</CODE></P> +<P><CODE> gdb ./mplayer</CODE></P> You are now within gdb. Type: @@ -245,7 +245,7 @@ and send the complete output to us. <H3>General note</H3> <P>If something is quite big (logs for instance) then it is better to upload - it to the FTP server in a compressed format (gzip and bzip preferred) and + it to the FTP server in a compressed format (gzip and bzip2 preferred) and include only the path and filename in your bug report.</P> diff --git a/DOCS/cd-dvd.html b/DOCS/cd-dvd.html index 560584ae83..77f40a0ba5 100644 --- a/DOCS/cd-dvd.html +++ b/DOCS/cd-dvd.html @@ -57,7 +57,7 @@ <P><B>MPlayer</B> uses <CODE>libdvdread</CODE> and <CODE>libdvdcss</CODE> for DVD decryption and playback. These two libraries are contained in the - <CODE>libmpdvdkit/</CODE> subdirectory of the <B>MPlayer</B> source tree, you + <CODE>libmpdvdkit2/</CODE> subdirectory of the <B>MPlayer</B> source tree, you do not have to install them separately. We opted for this solution because we had to fix a libdvdread bug, and apply a patch which adds <B>cracked CSS keys caching support</B> to libdvdcss. This results in a large diff --git a/DOCS/codecs.html b/DOCS/codecs.html index 627488e49a..fff5e23e52 100644 --- a/DOCS/codecs.html +++ b/DOCS/codecs.html @@ -31,8 +31,8 @@ <LI>MJPEG, AVID, VCR2, ASV2 and other hardware formats</LI> <LI>VIVO 1.0, 2.0, I263 and other h263(+) variants</LI> <LI>FLI/FLC</LI> - <LI>RealVideo 1.0 codec from libavcodec, and RealVideo 2.0, 3.0 codecs using - RealPlayer libraries</LI> + <LI>RealVideo 1.0 codec from libavcodec, and RealVideo 2.0, 3.0 and 4.0 + codecs using RealPlayer libraries</LI> <LI>native decoder for HuffYUV</LI> <LI>various old simple RLE-like formats</LI> </UL> @@ -122,7 +122,7 @@ <LI>Compile. Configure should detect problems before compilation.</LI> </OL> -<P><B>Note:</B> MPlayer from CVS does contain a libavcodec +<P><B>Note:</B> <B>MPlayer</B> from CVS does contain a libavcodec subdirectory, but it does <B>not</B> contain the source for libavcodec! You must follow the steps above to obtain the source for this library.</P> @@ -167,13 +167,10 @@ <P><B>MPlayer</B> can play Vivo (1.0 and 2.0) videos. The most suitable codec for 1.0 files is FFmpeg's H263 decoder, you can use it with the <CODE>-vc - ffh263</CODE> option (default) (requires up-to-date libavcodec). For 2.0 - files, use the + ffh263</CODE> option (default). For 2.0 files, use the <A HREF="http://www.mplayerhq.hu/MPlayer/samples/drivers32/ivvideo.dll">ivvideo.dll</A> Win32 DLL file, and install it under <CODE>/usr/lib/win32</CODE> or wherever you store the - Win32 codecs. This latter codec does not support YV12 nor YUY2 only BGR - modes, restricting it to the X11 and OpenGL outputs. Hopefully ffh263 will - support VIVO 2.0 files in the future.</P> + Win32 codecs.</P> <H4><A NAME="mpeg">2.2.1.5 MPEG 1/2 video</A></H4> @@ -210,8 +207,8 @@ </UL> <P>It is recommended to download and install RealPlayer8 or RealONE, because - <B>MPlayer</B> can use their libraries to decode files with RealVideo 2.0 or - RealVideo 3.0 video. The <B>MPlayer</B> configure script should detect the + <B>MPlayer</B> can use their libraries to decode files with RealVideo 2.0 - + 4.0 video. The <B>MPlayer</B> configure script should detect the RealPlayer libraries in the standard locations of a full installation. If it does not, tell configure where to look with the <CODE>--with-reallibdir</CODE> switch.</P> @@ -300,7 +297,7 @@ <LI>Voxware audio (using DirectShow DLL)</LI> <LI>alaw, msgsm, pcm and other simple old audio formats</LI> <LI>VIVO audio (g723, Vivo Siren)</LI> - <LI>RealAudio: DNET (low bitrate AC3), Cook</LI> + <LI>RealAudio: DNET (low bitrate AC3), Cook, Sipro</LI> </UL> @@ -357,7 +354,7 @@ VIVO/2.0 file. VIVO/1.0 files have <B>g.723</B> audio, and VIVO/2.0 files have <B>Vivo Siren</B> audio. Both are supported. You can grab the <A HREF="http://www.mplayerhq.hu/MPlayer/samples/drivers32/vivog723.acm">g.723/Siren</A> - Win32 DLL from the MPlayer site, + Win32 DLL from the <B>MPlayer</B> site, then copy it into the <CODE>/usr/lib/win32</CODE> directory.</P> @@ -375,10 +372,10 @@ <A HREF="formats.html#real">RealMedia file format</A> section.</P> -<H3><A NAME="importing">2.2.3 Win32 codec importing HOWTO</A></H3> +<H3><A NAME="importing">2.2.3 Win32 codec importing HOWTO</A></H3> -<H4><A NAME="importing_vfw">2.2.3.1 VFW codecs</A></H4> +<H4><A NAME="importing_vfw">2.2.3.1 VFW codecs</A></H4> <P>VFW (Video for Windows) is the old Video API for Windows. Its codecs have the .DLL or (rarely) .DRV extension. @@ -409,49 +406,49 @@ <P><B>Note:</B> On Windows NT/2000/XP search for this info in the registry, e.g. search for "VIDC.HFYU". To find out how to do this, look at the old DirectShow method below.</P> -<H4><A NAME="importing_directshow">2.2.3.2 DirectShow codecs</A></H4> +<H4><A NAME="importing_directshow">2.2.3.2 DirectShow codecs</A></H4> <P>DirectShow is the newer Video API, which is even worse than its predecessor. Things are harder with DirectShow, since</P> <UL> <LI><CODE>system.ini</CODE> does not contain the needed information, instead it - is stored in the registry and - <LI>we need the GUID of the codec. + is stored in the registry and</LI> + <LI>we need the GUID of the codec.</LI> </UL> <P><B>New Method:</B> Using Microsoft GraphEdit (fast)</P> <OL> - <LI>Get GraphEdit from either DirecX SDK or <A HREF="http://doom9.org">Doom9</A> - <LI>Start <CODE>graphedit.exe</CODE> - <LI>From the menue select Graph -> Insert Filters - <LI>Expand item <CODE>DirectShow Filters</CODE> - <LI>Select the right codec name and expand item + <LI>Get GraphEdit from either DirectX SDK or <A HREF="http://doom9.org">Doom9</A></LI> + <LI>Start <CODE>graphedit.exe</CODE></LI> + <LI>From the menue select Graph -> Insert Filters</LI> + <LI>Expand item <CODE>DirectShow Filters</CODE></LI> + <LI>Select the right codec name and expand item</LI> <LI>In the entry <CODE>DisplayName</CODE> look at the text in winged brackets - after the backslash and write it down (five dash-delimited blocks, the GUID) - <LI>The codec binary is the file specified in the <CODE>Filename</CODE> entry + after the backslash and write it down (five dash-delimited blocks, the GUID)</LI> + <LI>The codec binary is the file specified in the <CODE>Filename</CODE> entry</LI> </OL> <P><B>Note:</B> If there is no <CODE>Filename</CODE> entry and <CODE>DisplayName</CODE> contains something like <CODE>device:dmo</CODE>, then it is a DMO-Codec, which are - currently not supported by MPlayer.</P> + currently not supported by <B>MPlayer</B>.</P> <P><B>Old Method:</B> Take a deep breath and start searching the registry...</P> <OL> - <LI>Start <CODE>regedit</CODE>. + <LI>Start <CODE>regedit</CODE>.</LI> <LI>Press <CODE>Ctrl-f</CODE>, disable the first two checkboxes, and enable - the third. Type in the fourcc of the codec (e.g. TM20). + the third. Type in the fourcc of the codec (e.g. TM20).</LI> <LI>You should see a field which contains the path and the filename - (e.g. <CODE>C:\WINDOWS\SYSTEM\TM20DEC.AX</CODE>). + (e.g. <CODE>C:\WINDOWS\SYSTEM\TM20DEC.AX</CODE>).</LI> <LI>Now that you have the file, we need the GUID. Try searching again, but now search for the codec's name, not the fourcc. Its name can be acquired when Media Player is playing the file, by checking File -> Properties -> Advanced. - If not, you are out of luck. Try guessing (e.g. search for TrueMotion). + If not, you are out of luck. Try guessing (e.g. search for TrueMotion).</LI> <LI>If the GUID is found you should see a FriendlyName and a CLSID - field. Write down the 16 byte CLSID, this is the GUID we need. + field. Write down the 16 byte CLSID, this is the GUID we need.</LI> </OL> <P><B>Note:</B> If searching fails, try enabling all the checkboxes. You may have diff --git a/DOCS/documentation.html b/DOCS/documentation.html index 654ecd205d..720ee4e626 100644 --- a/DOCS/documentation.html +++ b/DOCS/documentation.html @@ -506,7 +506,7 @@ <A HREF="http://ogg.org/ogg/vorbis/download/vorbis_nightly_cvs.tgz">source</A> (this is a nightly updated tarball of Vorbis CVS).</LI> <LI><B>MPlayer</B> can use the libraries of RealPlayer 8 or RealONE to play - files with <B>RealVideo 2.0 and 3.0</B> video, and Sipro/Cook audio. See + files with <B>RealVideo 2.0 - 4.0</B> video, and Sipro/Cook audio. See <A HREF="formats.html#real">RealMedia file format</A> section for installation instructions and more information.</LI> </UL> @@ -606,14 +606,15 @@ series. <UL> <LI>XFree86 3: works in 8/16bpp modes. However, the driver is - dramatically slow and buggy in 800x600@16bpp + dramatically slow and buggy in 800x600@16bpp. <B>Recommended: 640x480@16bpp</B></LI> <LI>XFree86 4: the Xserver freezes soon after start unless acceleration is disabled, but then the whole thing gets slower than XFree86 3. No XVideo.</LI> - <LI>FBdev: the card is only VBE 1.2 capable, so VESA framebuffer - can't be used. When tried to workaround with UniVBE, the - framebuffer was unusably full of debris.</LI> + <LI>FBdev: framebuffer can be turned on with the <CODE>clgenfb</CODE> + driver in the kernel, though for me it worked only in 8bpp, thus + unusable. The clgenfb source had to be extended with the 7548 ID + before compilation.</LI> <LI>VESA: the card is only VBE 1.2 capable, so VESA output can't be used. Can't be workarounded with UniVBE.</LI> <LI>SVGAlib: detects an older Cirrus chip. Usable but slow with @@ -689,10 +690,10 @@ <A HREF="#subtitles_osd">Subtitles and OSD</A> section for details.</P> <PRE> - mkdir ~/.mplayer/font - cd ~/.mplayer/font + mkdir ~/.mplayer + cd ~/.mplayer unzip mp-arial-iso-8859-1.zip - ln -s ~/.mplayer/font/arial-24 font + ln -s ~/.mplayer/arial-24 font </PRE> @@ -711,12 +712,6 @@ <P>Currently you can't use the <CODE>-gui</CODE> option on the command line, due to technical reasons.</P> -<BLOCKQUOTE> - <B>Hint</B><BR> - Press the middle button (on 2 button mice press left and right - simultaneously) to open a GTK menu with a DVD playing option. -</BLOCKQUOTE> - <P>As <B>MPlayer</B> doesn't have a skin included, you have to download them if you want to use the GUI. See the <A HREF="http://www.mplayerhq.hu/homepage/dload.html">download page</A>. diff --git a/DOCS/encoding.html b/DOCS/encoding.html index 80dc1758ef..292b7fa85f 100644 --- a/DOCS/encoding.html +++ b/DOCS/encoding.html @@ -14,7 +14,7 @@ <P><B>MEncoder</B> (<B>MPlayer</B>'s Movie Encoder) is a simple movie encoder, designed to encode MPlayer-playable movies - (<B>AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET</B>) to other + (<B>AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</B>) to other MPlayer-playable formats (see below). It can encode with various codecs, like <B>DivX4</B> (1 or 2 passes), libavcodec, <B>PCM</B>/<B>MP3</B>/<B>VBR MP3</B> audio. Also has powerful plugin system @@ -104,10 +104,10 @@ <CODE> rm frameno.avi</CODE> - remove this file, which can come from a previous 3-pass encoding (it interferes with current one)<BR> - <CODE> mencoder -dvd 2 -lavcopts - -vcodec=mpeg4:more_options -o movie.avi -pass 1<BR> - mencoder -dvd 2 -lavcopts vcodec=mpeg4:more_options - -o movie.avi -pass 2</CODE></P> + <CODE> mencoder -dvd 2 -ovc lavc -lavcopts + vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 1<BR> + mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:more_options + -oac copy -o movie.avi -pass 2</CODE></P> <P><U><B>3-pass encoding:</B></U> this is an extension of 2-pass encoding, where the audio encoding takes place in a separate pass. This method enables @@ -118,7 +118,7 @@ <LI>Remove conflicting temporary file: <P><CODE>rm frameno.avi</CODE></P></LI> <LI>First pass: - <P><CODE>mencoder <file/DVD> -ovc frameno -o frameno.avi</CODE></P> + <P><CODE>mencoder <file/DVD> -ovc frameno -oac mp3lame -lameopts vbr=3:more_options -o frameno.avi</CODE></P> <P>An audio-only avi file will be created, containing <B>only</B> the requested audio stream. Don't forget <CODE>-lameopts</CODE>, if you need to set it. If you were encoding a long movie, <B>MEncoder</B> @@ -126,13 +126,13 @@ destination sizes, after this pass finishes.</P></LI> <LI>Second pass: <P><CODE>mencoder <file/DVD> -oac copy -pass 1 - -ovc divx4 -divx4opts br=<bitrate></CODE></P> + -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=<bitrate></CODE></P> <P>Alias the first pass of DivX4 video encoding. Optionally specify the video bitrate <B>MEncoder</B> printed at the end of the previous pass.</P></LI> <LI>Third pass: <P><CODE>mencoder <file/DVD> -oac copy -pass 2 - -ovc divx4 -divx4opts br=<bitrate></CODE></P> + -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=<bitrate></CODE></P> <P>Alias the second pass of DivX4 video encoding. Optionally specify the video bitrate <B>MEncoder</B> printed at the end of the previous pass. In this pass, audio from <CODE>frameno.avi</CODE> will @@ -145,10 +145,10 @@ which can come from a previous 3-pass encoding (it interferes with current one)<BR> <CODE> mencoder -dvd 2 -ovc frameno - -o frameno.avi<BR> - mencoder -dvd 2 + -o frameno.avi -oac mp3lame -lameopts vbr=3:more_options<BR> + mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 1<BR> - mencoder -dvd 2 + mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 2</CODE></P> <P><U><B>2 or 3-pass encoding using internal libavcodec controller:</B></U> @@ -190,8 +190,8 @@ fast bilinear.</P> <P>Usage:<BR> - <CODE> mencoder sample-svcd.mpg -lavcopts - vcodec=mpeg4:more_options -vop scale=640:480 -sws 2 -o + <CODE> mencoder sample-svcd.mpg -ovc lavc -lavcopts + vcodec=mpeg4:more_options -vop scale=640:480 -oac copy -o output.avi</CODE></P> @@ -249,7 +249,7 @@ <P>An example, with MJPEG compression:<BR> <CODE> mencoder -dvd 2 -o title2.avi -ovc lavc - -lavcopts vcodec=mjpeg</CODE></P> + -lavcopts vcodec=mjpeg -oac copy</CODE></P> <H4><A NAME="image_files">2.4.2.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)</A></H4> @@ -276,27 +276,27 @@ Explanation of the process: global <A HREF="#options">Options</A> section and in the man page.</P> <P><I>Creating a DivX4 file from all the JPEG files in the current dir:</I><BR> - <CODE>mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -o + <CODE>mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -oac copy -o output.avi</CODE></P> <P><I>Creating a DivX4 file from some JPEG files in the current dir:</I><BR> - <CODE>mencoder frame001.jpg,frame002.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -o + <CODE>mencoder frame001.jpg,frame002.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -oac copy -o output.avi</CODE></P> <P><I>Creating a Motion JPEG (MJPEG) file from all the JPEG files in the current dir:</I><BR> <CODE>mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc copy - -o output.avi</CODE></P> + -oac copy -o output.avi</CODE></P> <P><I>Creating an uncompressed file from all the PNG files in the current dir:</I><BR> - <CODE>mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc raw -o + <CODE>mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc raw -oac copy -o output.avi</CODE></P> <P><I>Creating a Motion PNG (MPNG) file from all the PNG files in the current dir:</I><BR> - <CODE>mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc copy + <CODE>mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc copy -oac copy -o output.avi</CODE></P> <P><I>Creating a Motion TGA (MTGA) file from all the TGA files in the current dir:</I><BR> - <CODE>mencoder \*.tga -mf on:w=800:h=600:fps=25:type=tga -ovc copy + <CODE>mencoder \*.tga -mf on:w=800:h=600:fps=25:type=tga -ovc copy -oac copy -o output.avi</CODE></P> @@ -330,7 +330,7 @@ Explanation of the process: <P><I>Copying two subtitles from a DVD while doing 3-pass encoding</I><BR> <CODE>rm subtitles.idx subtitles.sub</CODE><BR> <CODE>mencoder -dvd 1 -vobsubout subtitles -vobsuboutindex 0 - -sid 2 -o frameno.avi -ovc frameno</CODE><BR> + -sid 2 -o frameno.avi -ovc frameno -oac mp3lame -lameopts vbr=3</CODE><BR> <CODE>mencoder -dvd 1 -oac copy -ovc divx4 -pass 1</CODE><BR> <CODE>mencoder -dvd 1 -oac copy -ovc divx4 -pass 2 -vobsubout subtitles -vobsuboutindex 1 -sid 5</CODE></P> diff --git a/DOCS/video.html b/DOCS/video.html index 318bd5dfca..d28195d9ce 100644 --- a/DOCS/video.html +++ b/DOCS/video.html @@ -149,12 +149,9 @@ or greater (in case of image problems, try 16bpp). As for S3 Virge.. there is xv support, but the card itself is very slow, so you better sell it.</P> -<P><B>NOTE</B>: Savage cards have a slow YV12 image displaying capability (it - needs to do YV12 to YUY2 conversion, because the Savage hardware can't display - YV12). So when this documentation says at some point "this has YV12 output - use this, it's faster", it's not sure. Try - <A HREF="http://www.mplayerhq.hu/MPlayer/contrib/Savage-driver/savage_drv.o.mmx2.bz2">this - driver</A>, it uses MMX2 for this task and is faster than the native X +<P><B>NOTE</B>: it's currently unclear which Savage models lack YV12 support, + and convert by driver (slow). If you suspect your card, get a newer driver, + or ask politely on the mplayer-users mailing list for an MMX/3DNow enabled driver.</P> @@ -207,10 +204,9 @@ <H5><A NAME="xv_trident">2.3.1.2.6 Trident cards</A></H5> -<P>If you want to use xv with a trident card, provided that it doesn't - work with 4.1.0, try the latest CVS of XFree or wait for XFree 4.2.0. - The latest CVS adds support for fullscreen xv support with the - Cyberblade XP card.</P> +<P>If you want to use xv with a trident card, provided that it doesn't work + with 4.1.0, install XFree 4.2.0. 4.2.0 adds support for fullscreen xv + support with the Cyberblade XP card.</P> <H4><A NAME="dga">2.3.1.3 DGA</A></H4> @@ -489,6 +485,7 @@ <UL> <LI>Keys pressed under sdl:aalib console driver repeat forever. (use -vo aa!) It's bug in SDL, I can't change it (tested with SDL 1.2.1).</LI> + <LI>DO NOT USE SDL with GUI! It won't work as it should.</LI> </UL> @@ -772,23 +769,7 @@ <DT><CODE>-vo vesa:opts</CODE></DT> <DD>currently recognized: <B>dga</B> to force dga mode and <B>nodga</B> to disable dga mode. Note: you may omit these parameters to enable <B>autodetect</B> - of dga mode. (In the future also will specify mode parameters such as refresh - rate, interlacing, doublescan and so on. Samples: i43, 85, d100)</DD> - - <DT><CODE>-screenw, -screenh, -bpp</CODE></DT> - <DD>force userdefined mode</DD> - - <DT><CODE>-x, -y</CODE></DT> - <DD>set userdefined prescaling</DD> - - <DT><CODE>-zoom</CODE></DT> - <DD>enables userdefined prescaling</DD> - - <DT><CODE>-fs</CODE></DT> - <DD>scales image to fullscreen</DD> - - <DT><CODE>-fs -zoom</CODE></DT> - <DD>scales userdefined prescaling to fullscreen</DD> + of dga mode.</DD> <DT><CODE>-double</CODE></DT> <DD>enables double buffering mode. (Available only in DGA mode). Should be @@ -1227,9 +1208,10 @@ for 16:9 TV: -vop lavc,expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024 <DT><CODE>-ac hwac3</CODE></DT> <DD>The em8300 supports playing back AC3 audio (surround sound) through the - digital audio output of the card. Read - <A HREF="codecs.html#hardware_ac3">hardware AC3</A> section for further - information on AC3.</DD> + digital audio output of the card. See the <CODE>-ao oss</CODE> option + above, it must be used to specify the DXR3's output instead of + a soundcard. Also read <A HREF="codecs.html#hardware_ac3">hardware AC3</A> + section for further information on AC3.</DD> </DL> <H4>Overlay</H4> |