Update of /cvsroot/mplayer/main/DOCS/en In directory mail:/var/tmp.root/cvs-serv15126/en Modified Files: documentation.html encoding.html faq.html mplayer.1 video.html Log Message: vop -> vf change, small fixes. The Polish documentation should be checked for correctness. Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/en/documentation.html,v retrieving revision 1.396 retrieving revision 1.397 diff -u -r1.396 -r1.397 --- documentation.html 17 Mar 2003 22:11:42 -0000 1.396 +++ documentation.html 22 Mar 2003 12:02:13 -0000 1.397 @@ -714,7 +714,7 @@ <H4>Non-YUV cards</H4> <P>Fullscreen playing can be achieved by either enabling <B>software scaling</B> - (use the <CODE>-zoom</CODE> or <CODE>-vop scale</CODE> + (use the <CODE>-zoom</CODE> or <CODE>-vf scale</CODE> option, but I warn you: this is slow), or switching to a small resolution video mode, for example 352x288. If you don't have YUV acceleration, the latter method is recommended. Video mode switching can be enabled by @@ -1161,7 +1161,7 @@ during fast-motion scenes and the bitrate controller will be probably even unable to retain the specified bitrate as the interlacing artifacts produce high amount of detail and thus consume lot of bandwidth. You can enable - deinterlacing with <CODE>-vop pp=DEINT_TYPE</CODE>. Usually + deinterlacing with <CODE>-vf pp=DEINT_TYPE</CODE>. Usually <CODE>pp=lb</CODE> does a good job, but it can be matter of personal preference. See other deinterlacing algorithms in the manual and give it a try.</LI> @@ -1227,8 +1227,8 @@ on:driver=v4l:width=768:height=576 \<BR>     -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=900 \<BR>     -oac - mp3lame -lameopts cbr:br=64 \<BR>     -vop - pp=lb,crop=720:544:24:16 -o output.avi </CODE><BR> + mp3lame -lameopts cbr:br=64 \<BR>     -vf + crop=720:544:24:16,pp=lb -o output.avi </CODE><BR> <BR> This will additionally rescale the image to 384x288 and compresses @@ -1241,7 +1241,7 @@     mencoder -tv on:driver=v4l:width=768:height=576 \<BR>     -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=350:vhq:vqmax=31:keyint=300 \<BR>     -oac mp3lame -lameopts cbr:br=48 \<BR> -     -vop scale=384:288,pp=tn/lb,crop=720:540:24:18 -sws 1 -o output.avi +     -vf crop=720:540:24:18,pp=tn/lb,scale=384:288 -sws 1 -o output.avi </CODE><BR> It's also possible to specify smaller image dimensions in the Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/en/encoding.html,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- encoding.html 27 Feb 2003 14:01:18 -0000 1.88 +++ encoding.html 22 Mar 2003 12:02:13 -0000 1.89 @@ -115,14 +115,14 @@ aspect ratio</A> section.</P> <P>The scaling process is handled by the <I>'scale'</I> video filter: - <CODE>-vop scale=width:height</CODE>. Its quality can be set with the + <CODE>-vf scale=width:height</CODE>. Its quality can be set with the <CODE>-sws</CODE> option. If it's not specified, MEncoder will use 0: fast bilinear.</P> <H4>Usage:</H4> <P><CODE>    mencoder input.mpg -ovc lavc -lavcopts - vcodec=mpeg4 -vop scale=640:480 -oac copy -o + vcodec=mpeg4 -vf scale=640:480 -oac copy -o output.avi</CODE></P> @@ -314,7 +314,7 @@ <H4>Usage:</H4> <P><CODE>$ mencoder sample-svcd.mpg -ovc lavc -lavcopts - vcodec=mpeg4:aspect=16.0/9.0 -vop crop=714:548:0:14 -oac copy -o output.avi</CODE></P> + vcodec=mpeg4:aspect=16.0/9.0 -vf crop=714:548:0:14 -oac copy -o output.avi</CODE></P> </BODY> </HTML> Index: faq.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/en/faq.html,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- faq.html 27 Feb 2003 14:01:18 -0000 1.123 +++ faq.html 22 Mar 2003 12:02:13 -0000 1.124 @@ -353,7 +353,7 @@ <DT>Q: The onscreen display (OSD) is flickering!</DT> <DD>A: You use a vo driver with single buffering (x11,xv). With xv, - use the <CODE>-double</CODE> option. Also try <CODE>-vop expand</CODE></DD> + use the <CODE>-double</CODE> option. Also try <CODE>-vf expand</CODE></DD> <DD> </DD> <DT>Q: What exactly is this libavcodec thing?</DT> Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/en/mplayer.1,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- mplayer.1 22 Mar 2003 10:38:04 -0000 1.347 +++ mplayer.1 22 Mar 2003 12:02:13 -0000 1.348 @@ -38,7 +38,7 @@ .\" Title .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2003-01-11" +.TH MPlayer 1 "2003-03-22" . .SH NAME mplayer \- Movie Player for Linux @@ -186,12 +186,12 @@ Read data from stdin. The \-idx option does not work in conjunction with this. .TP -.B \-autoq <quality> (use with \-vop pp) +.B \-autoq <quality> (use with \-vf pp) Dynamically changes the level of postprocessing depending on available spare CPU time. The number you specify will be the maximum level used. Usually you can use some big number. -You have to use \-vop pp without parameters in order to use this. +You have to use \-vf pp without parameters in order to use this. .TP .B \-autosync <factor> Gradually adjusts the A/\:V sync based on audio delay measurements. @@ -523,7 +523,7 @@ .I NOTE: .br Sometimes deinterlacing is required for DVD playback, -see the \-vop pp=0x20000 option. +see the \-vf pp=0x20000 option. .TP .B \-dvd\-device <path\ to\ device> Override default DVD device name /dev/\:dvd. @@ -809,7 +809,7 @@ 176x120 NTSC .REss .IPs quality=<0-100> -choose the quality of the jpeg compression +choose the quality of the jpeg compression .br (quality < 60 recommended for full size) .RE @@ -831,7 +831,7 @@ .SH "OSD/SUB OPTIONS" .I NOTE: .br -See \-vop expand too. +See \-vf expand too. .TP .B \-dumpmicrodvdsub (MPLAYER only) Convert the given subtitle (specified with the \-sub option) to the @@ -1048,7 +1048,7 @@ Currently useless. Same as \-audiofile, but for subtitle streams (OggDS?). .TP -.B \-subpos <0\-100> (useful with \-vop expand) +.B \-subpos <0\-100> (useful with \-vf expand) Specify the position of subtitles on the screen. The value is the vertical position of the subtitle in % of the screen height. .TP @@ -1116,7 +1116,7 @@ .B \-abs <value> (OBSOLETE) Override audio driver/\:card buffer size detection, \-ao oss only .TP -.B \-af <plugin1,plugin2,plugin3[=options],...> +.B \-af <plugin1[=options],plugin2,...> Activate a comma separated list of audio filters and their options. .br Available filters are: @@ -1855,7 +1855,7 @@ .B \-nosound Do not play/\:encode sound. .TP -.B \-pp <quality> (see \-vop pp option too!) +.B \-pp <quality> (see \-vf pp option too!) Set postprocess level of the DLL. This option is NO LONGER USABLE with MPlayer's postprocess filter, but only with Win32 DirectShow DLLs which have internal postprocessing routine. @@ -1863,7 +1863,7 @@ The valid range of \-pp value vary on codecs, mostly 0\-6, where 0=disable 6=slowest/\:best. .TP -.B \-pphelp (see \-vop pp option too) +.B \-pphelp (see \-vf pp option too) Show a summary about the available postprocess filters and their usage. .TP .B \-ssf <mode> @@ -1872,7 +1872,7 @@ .I EXAMPLE .PD 0 .RSs -\-vop scale \-ssf lgb=3.0 +\-vf scale \-ssf lgb=3.0 .RE .PD 1 @@ -1909,7 +1909,7 @@ .PD 1 . .TP -.B \-sws <software\ scaler\ type> (see \-vop scale option too) +.B \-sws <software\ scaler\ type> (see \-vf scale option too) This option sets the quality (and speed, respectively) of the software scaler, with the \-zoom option. For example with x11 or other outputs which lack hardware acceleration. @@ -1918,7 +1918,7 @@ .I NOTE: .br For \-sws\ 2 and 7, the sharpness can be set with the scaling parameter (p) -of \-vop scale (0 (soft) \- 100 (sharp)), for \-sws 9, it specifies the filter +of \-vf scale (0 (soft) \- 100 (sharp)), for \-sws 9, it specifies the filter length (1 \- 10). .PD 0 @@ -1975,35 +1975,8 @@ .PD 1 . .TP -.B \-vfm <driver1,driver2,...> -Specify a priority list of video drivers to be used, according to their driver -name in codecs.conf. -It falls back to default if none is ok. - -.I NOTE: -.br -If libdivxdecore support was compiled in, then odivx and divx4 now contains -just the same DivX4 codec, but different APIs to reach it. -For difference between them and when to use which, check the DivX4 section in -the documentation. -.br -See \-vfm help for a full list of available drivers. - -.I EXAMPLE: -.PD 0 -.RSs -.IPs "\-vfm ffmpeg,dshow,vfw" -try the libavcodec, then Directshow, then VFW codecs and fallback to the -others, if still none is ok -.IPs "\-vfm xanim" -try XAnim codecs first -.RE -.PD 1 -. -.TP -.B \-vop <...,filter3[=options],filter2,filter1> -Activate a comma separated list of video filters and their options in reverse -order. +.B \-vf <filter1[=options],filter2,...> +Activate a comma separated list of video filters and their options. .I NOTE: .br @@ -2013,7 +1986,7 @@ Parameters w:h means width x height in pixels, x:y means x;y position counted from the upper left corner of the bigger image. .br -To get a full list of available plugins, see \-vop help. +To get a full list of available plugins, see \-vf help. .br Available filters are: . @@ -2092,22 +2065,22 @@ .RE .RSss .br -\-vop pp=hb/vb/dr/al/lb +\-vf pp=hb/vb/dr/al/lb .br -\-vop pp=hb/vb/dr/al +\-vf pp=hb/vb/dr/al .br Default filters without brightness/\:contrast correction: .br -\-vop pp=de/\-al +\-vf pp=de/\-al .br Enable default filters & temporal denoiser: .br -\-vop pp=de/tn:1:2:3 +\-vf pp=de/tn:1:2:3 .br Deblock horizontal only luminance and switch vertical deblocking on or off automatically depending on available CPU time: .br -\-vop pp=hb:y/vb:a \-autoq 6 +\-vf pp=hb:y/vb:a \-autoq 6 .REss .IPs lavc[=quality:fps] Realtime MPEG1 encoder for use with DVB/\:DXR3 (libavcodec) @@ -2153,7 +2126,7 @@ Alternative software equalizer that uses lookup tables (very slow), allowing gamma correction in addition to simple brightness, contrast and saturation adjustment. Note that it uses the same MMX -optimized code as -vop eq if all gamma values are 1.0! +optimized code as -vf eq if all gamma values are 1.0! The parameters are given as floating point values. Defaults are gamma=1.0, contrast=1.0, brightness=0.0 and saturation=1.0. Parameters rg, gg, bg are the independent gamma values for the Red, Green @@ -2243,7 +2216,7 @@ .IPs "telecine[=start]" Apply 3:2 "telecine" process to increase framerate by 20%. This most likely will not work correctly with mplayer, but it can be used -with 'mencoder -fps 29.97 -ofps 29.97 -vop telecine'. Both fps options are +with 'mencoder -fps 29.97 -ofps 29.97 -vf telecine'. Both fps options are essential! (A/V sync will break if they are wrong.) The optional start parameter tells the filter where in the telecine pattern to start (0-3). @@ -2302,7 +2275,7 @@ opaque: flag switching between alphablended (transparent) and opaque (fast) mode .br -fifo: path/filename for the FIFO (named pipe connecting mplayer -vop bmovl +fifo: path/filename for the FIFO (named pipe connecting mplayer -vf bmovl to the controlling application) .REss @@ -2370,6 +2343,32 @@ .RE . .TP +.B \-vfm <driver1,driver2,...> +Specify a priority list of video drivers to be used, according to their driver +name in codecs.conf. +It falls back to default if none is ok. + +.I NOTE: +.br +If libdivxdecore support was compiled in, then odivx and divx4 now contains +just the same DivX4 codec, but different APIs to reach it. +For difference between them and when to use which, check the DivX4 section in +the documentation. +.br +See \-vfm help for a full list of available drivers. + +.I EXAMPLE: +.PD 0 +.RSs +.IPs "\-vfm ffmpeg,dshow,vfw" +try the libavcodec, then Directshow, then VFW codecs and fallback to the +others, if still none is ok +.IPs "\-vfm xanim" +try XAnim codecs first +.RE +.PD 1 +. +.TP .B \-x <x> (MPLAYER only) Scale image to x width (if sw/\:hw scaling available). Disables aspect calculations. @@ -2404,11 +2403,11 @@ .TP .B \-zoom \ Allow software scaling, where available. -Could be used to force scaling with \-vop scale. +Could be used to force scaling with \-vf scale. .I NOTE: .br -\-vop scale will IGNORE options \-x / \-y / \-xy / \-fs / \-aspect without +\-vf scale will IGNORE options \-x / \-y / \-xy / \-fs / \-aspect without \-zoom. @@ -3174,7 +3173,7 @@ .TP .B \-oac <codec name> Encode with the given audio codec. -Use \-ovc help to get a list of available codecs. +Use \-oac help to get a list of available codecs. (no default set) .I EXAMPLE: @@ -3398,7 +3397,7 @@ .PP (The following keys are valid only when using a hardware accelerated video output (xv, (x)vidix, (x)mga, etc), or the software equalizer filter -(-vop eq or -vop eq2). +(-vf eq or -vf eq2). .IPs "1 and 2" adjust contrast @@ -3595,10 +3594,10 @@ mencoder \-dvd 2 \-chapter 10-15 \-o title2.avi \-oac copy \-ovc divx4 .TP .B Encoding DVD title #2, resizing to 640x480 -mencoder \-dvd 2 \-vop scale=640:480 \-o title2.avi \-oac copy \-ovc divx4 +mencoder \-dvd 2 \-vf scale=640:480 \-o title2.avi \-oac copy \-ovc divx4 .TP .B Encoding DVD title #2, resizing to 512xHHH (keep aspect ratio) -mencoder \-dvd 2 \-vop scale \-zoom \-xy 512 \-o title2.avi \-oac copy +mencoder \-dvd 2 \-vf scale \-zoom \-xy 512 \-o title2.avi \-oac copy \-ovc divx4 .TP .B The same, but with libavcodec family, MPEG4 (Divx5) compression Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/en/video.html,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- video.html 5 Mar 2003 09:26:32 -0000 1.138 +++ video.html 22 Mar 2003 12:02:13 -0000 1.139 @@ -497,15 +497,15 @@ <P>The bpp (bits per pixel) value must be set to 4 by hand:<BR>   <CODE>-bpp 4</CODE><BR> The movie probably must be scaled down to fit in EGA mode:<BR> -   <CODE>-vop scale=640:350</CODE> or<BR> -   <CODE>-vop scale=320:200</CODE><BR> +   <CODE>-vf scale=640:350</CODE> or<BR> +   <CODE>-vf scale=320:200</CODE><BR> For that we need fast but bad quality scaling routine:<BR>   <CODE>-sws 4</CODE><BR> Maybe automatic aspect correction has to be shut off:<BR>   <CODE>-noaspect</CODE></P> <P><B>NOTE:</B> according to my experience the best image quality on EGA - screens can be achieved by decreasing the brightness a bit: <CODE>-vop + screens can be achieved by decreasing the brightness a bit: <CODE>-vf eq=-20:0</CODE>. I also needed to lower the audio samplerate on my box, because the sound was broken on 44kHz: <CODE>-srate 22050</CODE>.</P> @@ -685,7 +685,7 @@ (using aalib on X), and it's least CPU intensive on standard, non-framebuffer console. Use SVGATextMode to set up a big textmode, then enjoy! (secondary head Hercules cards rock :)) (but imho you can use - <CODE>-vop 1bpp</CODE> option to get graphics on hgafb:)</P> + <CODE>-vf 1bpp</CODE> option to get graphics on hgafb:)</P> <P>Use the <CODE>-framedrop</CODE> option if your computer isn't fast enough to render all frames!</P> @@ -1034,19 +1034,19 @@ <PRE> mplayer -ao mpegpes -vo mpegpes yourfile.ext - mplayer -ao mpegpes -vo mpegpes -vop expand yourfile.ext + mplayer -ao mpegpes -vo mpegpes -vf expand yourfile.ext </PRE> <P>Note that DVB cards only support heights 288 and 576 for PAL or 240 and 480 for NTSC. You <B>must</B> rescale for other heights by adding <CODE>scale=width:height</CODE> with the width and height you want to the - <CODE>-vop</CODE> option. DVB cards accept various widths, like 720, 704, + <CODE>-vf</CODE> option. DVB cards accept various widths, like 720, 704, 640, 512, 480, 352 etc and do hardware scaling in horizontal direction, so you do not need to scale horizontally in most cases. For a 512x384 (aspect 4:3) DivX try:</P> <PRE> - mplayer -ao mpegpes -vo mpegpes -vop scale=512:576 + mplayer -ao mpegpes -vo mpegpes -vf scale=512:576 </PRE> <P>If you have a widescreen movie and you do not want to scale it to full height, @@ -1054,19 +1054,19 @@ 640x384 DivX, try:</P> <PRE> - mplayer -ao mpegpes -vo mpegpes -vop expand=640:576 file.avi + mplayer -ao mpegpes -vo mpegpes -vf expand=640:576 file.avi </PRE> <P>If your CPU is too slow for a full size 720x576 DivX, try downscaling:</P> <PRE> - mplayer -ao mpegpes -vo mpegpes -vop scale=352:576 file.avi + mplayer -ao mpegpes -vo mpegpes -vf scale=352:576 file.avi </PRE> <P>If speed does not improve, try vertical downscaling, too:</P> <PRE> - mplayer -ao mpegpes -vo mpegpes -vop scale=352:288 file.avi + mplayer -ao mpegpes -vo mpegpes -vf scale=352:288 file.avi </PRE> <P>For OSD and subtitles use the OSD feature of the expand filter. So, instead @@ -1085,8 +1085,8 @@ right aspect ratio), use the new dvbscale filter:</P> <PRE> -for 3:4 TV: -vop expand=-1:576:-1:-1:1,scale=-1:0,dvbscale -for 16:9 TV: -vop expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024 +for 3:4 TV: -vf dvbscale,scale=-1:0,expand=-1:576:-1:-1:1 +for 16:9 TV: -vf dvbscale=1024,scale=-1:0,expand=-1:576:-1:-1:1 </PRE> <H4>FUTURE</H4> @@ -1199,22 +1199,22 @@ 44100 / 2 = 22050, if it is 24000Hz use 48000Hz as 48000 / 2 = 24000 and so on. This does not work with digital audio output (<CODE>-ac hwac3</CODE>).</DD> - <DT><CODE>-vop lavc/fame</CODE></DT> + <DT><CODE>-vf lavc/fame</CODE></DT> <DD><B>(AUTO-INSERTED)</B> To watch non-MPEG content on the em8300 (i.e. DivX or RealVideo) you have to specify an MPEG1 video filter such as libavcodec (lavc) or libfame (fame). At the moment lavc is both faster and gives better image quality, it is suggested that you use that unless you have problems with it. See the man - page for further info about <CODE>-vop lavc/fame</CODE>.<BR> + page for further info about <CODE>-vf lavc/fame</CODE>.<BR> Using lavc is highly recommended. Currently there is no way of setting the fps of the em8300 which means that it is fixed to 29.97fps. Because of this - it is highly recommended that you use <CODE>-vop lavc=<quality>:25</CODE>, + it is highly recommended that you use <CODE>-vf lavc=<quality>:25</CODE>, especially if you are using prebuffering. Then why 25 and not 29.97? Well, the thing is that when you use 29.97 the picture becomes a bit jumpy. The reason for this is unknown to us. If you set it to somewhere between 25 and 27 the picture becomes stable. For now all we can do is accept this for a fact.</DD> - <DT><CODE>-vop expand=-1:-1:-1:-1:1</CODE></DT> + <DT><CODE>-vf expand=-1:-1:-1:-1:1</CODE></DT> <DD>Although the DXR3 driver can put some OSD onto the MPEG1/2/4 video, it has much lower quality than MPlayer's traditional OSD, and has several refresh problems as well. The command line above will firstly convert the @@ -1273,7 +1273,7 @@ bilinear software scaler. The commandline is</P> <PRE> - mplayer -vo zr -sws 0 -vop scale=384:204 movie.avi + mplayer -vo zr -sws 0 -vf scale=384:204 movie.avi </PRE> <P>Cropping can be done by the <CODE>crop</CODE> filter and by @@ -1288,7 +1288,7 @@ <P>if you want to use the <CODE>crop</CODE> filter, you would do</P> <PRE> - mplayer -vo zr -vop crop=720:320:80:0 benhur.avi + mplayer -vo zr -vf crop=720:320:80:0 benhur.avi </PRE> <P>Extra occurances of <CODE>-zrcrop</CODE> invoke <I>cinerama</I> mode, i.e.