January 2003 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/DOCS encoding.html,1.79,1.80
by Nico 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv9553/main/DOCS Modified Files: encoding.html Log Message: renumbered sections according to TOC Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- encoding.html 28 Jan 2003 17:11:56 -0000 1.79 +++ encoding.html 29 Jan 2003 21:56:07 -0000 1.80 @@ -87,7 +87,7 @@ -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P> -<H2><A NAME="mpeg">7.1 Encoding to MPEG format</A></H2> +<H2><A NAME="mpeg">7.2 Encoding to MPEG format</A></H2> <P>MEncoder can create MPEG (MPEG-PS) format output files. It's probably useful only with libavcodec's <I>mpeg1video</I> codec, because players @@ -106,7 +106,7 @@ -oac copy <other options> media.avi -o output.mpg</CODE></P> -<H2><A NAME="rescaling">7.2 Rescaling movies</A></H2> +<H2><A NAME="rescaling">7.3 Rescaling movies</A></H2> <P>Often the need to resize movie images' size emerges. Its reasons can be many: decreasing file size, network bandwidth, etc. Most people @@ -126,7 +126,7 @@ output.avi</CODE></P> -<H2><A NAME="copying">7.3 Stream copying</A></H2> +<H2><A NAME="copying">7.4 Stream copying</A></H2> <P>MEncoder can handle input streams in two ways: <B>encode</B> or <B>copy</B> them. This section is about <B>copying</B>.</P> @@ -147,7 +147,7 @@ </UL> -<H2><A NAME="fixing">7.4 Fixing AVIs with broken index or interleaving</A></H2> +<H2><A NAME="fixing">7.5 Fixing AVIs with broken index or interleaving</A></H2> <P>Easiest thing. We simply copy the video and audio streams, and MEncoder generates the index. Of course this cannot fix possible bugs @@ -158,7 +158,7 @@ <P>Command: <CODE>mencoder -idx input.avi -ovc copy -oac copy -o output.avi</CODE></P> -<H2><A NAME="libavcodec">7.5 Encoding with the libavcodec codec family</A></H2> +<H2><A NAME="libavcodec">7.6 Encoding with the libavcodec codec family</A></H2> <P><A HREF="codecs.html#libavcodec">libavcodec</A> provides simple encoding to a lot of interesting video and audio formats (currently its audio codecs are @@ -185,7 +185,7 @@ -lavcopts vcodec=mjpeg -oac copy</CODE></P> -<H2><A NAME="image_files">7.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)</A></H2> +<H2><A NAME="image_files">7.7 Encoding from multiple input image files (JPEGs, PNGs or TGAs)</A></H2> <P>MEncoder is capable of creating movies from one or more JPEG, PNG or TGA files. With simple framecopy it can create MJPEG (Motion JPEG), MPNG @@ -231,7 +231,7 @@ -o output.avi \*.tga</CODE></P> -<H2><A NAME="vobsub">7.7 Extracting DVD subtitles to a Vobsub file</A></H2> +<H2><A NAME="vobsub">7.8 Extracting DVD subtitles to a Vobsub file</A></H2> <P>MEncoder is capable of extracting subtitles from a DVD into Vobsub fomat files. They consist of a pair of files ending in @@ -272,7 +272,7 @@ -vobsuboutindex 0 -vobsuboutid fr -sid 1</CODE></P> -<H2><A NAME="aspect">7.8 Preserving aspect ratio</A></H2> +<H2><A NAME="aspect">7.9 Preserving aspect ratio</A></H2> <P>DVDs and SVCDs (i.e. MPEG1/2) files contain an aspect ratio value, which describes how should the player scale the video stream, so humans

1 0

CVS: main/libmpdemux demux_ogg.c,1.25,1.26
by Arpi of Ize 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv1445 Modified Files: demux_ogg.c Log Message: 100l... ogg-in-avi (type 0xFFFE) fix sizeof(WAVEFORMATEX) is 18, since i've fixed struct align, so 2*sizeof(WAVEFORMATEX) is !=40 any more. Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- demux_ogg.c 5 Jan 2003 13:48:13 -0000 1.25 +++ demux_ogg.c 29 Jan 2003 21:53:56 -0000 1.26 @@ -837,15 +837,16 @@ int plen; /// Check that the cbSize is enouth big for the following reads - if(sh_audio->wf->cbSize < 3*sizeof(uint32_t)) { + if(sh_audio->wf->cbSize < 22+3*sizeof(uint32_t)) { mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI OGG : Initial audio header is too small !!!!!\n"); goto fallback; } /// Get the size of the 3 header packet - memcpy(hdrsizes, ((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX), 3*sizeof(uint32_t)); + memcpy(hdrsizes, ((unsigned char*)sh_audio->wf)+22+sizeof(WAVEFORMATEX), 3*sizeof(uint32_t)); +// printf("\n!!!!!! hdr sizes: %d %d %d \n",hdrsizes[0],hdrsizes[1],hdrsizes[2]); /// Check the size - if(sh_audio->wf->cbSize < 3*sizeof(uint32_t) + sizeof(uint32_t)+hdrsizes[0]+hdrsizes[1] + hdrsizes[2]) { + if(sh_audio->wf->cbSize < 22+3*sizeof(uint32_t)+hdrsizes[0]+hdrsizes[1] + hdrsizes[2]) { mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI OGG : Audio header is too small !!!!!\n"); goto fallback; } @@ -885,15 +886,15 @@ /// Add the header packets in the ogg demuxer audio stream // Initial header dp = new_demux_packet(hdrsizes[0]); - memcpy(dp->buffer,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t),hdrsizes[0]); + memcpy(dp->buffer,((unsigned char*)sh_audio->wf)+22+sizeof(WAVEFORMATEX)+3*sizeof(uint32_t),hdrsizes[0]); ds_add_packet(od->audio,dp); /// Comments dp = new_demux_packet(hdrsizes[1]); - memcpy(dp->buffer,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0],hdrsizes[1]); + memcpy(dp->buffer,((unsigned char*)sh_audio->wf)+22+sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0],hdrsizes[1]); ds_add_packet(od->audio,dp); /// Code book dp = new_demux_packet(hdrsizes[2]); - memcpy(dp->buffer,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0]+hdrsizes[1],hdrsizes[2]); + memcpy(dp->buffer,((unsigned char*)sh_audio->wf)+22+sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0]+hdrsizes[1],hdrsizes[2]); ds_add_packet(od->audio,dp); // Finish setting up the ogg demuxer

1 0

CVS: main/DOCS mplayer.1,1.322,1.323
by Jonas Jermann CVS 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv17355 Modified Files: mplayer.1 Log Message: 10l Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- mplayer.1 28 Jan 2003 17:14:06 -0000 1.322 +++ mplayer.1 29 Jan 2003 21:47:04 -0000 1.323 @@ -898,7 +898,7 @@ volume + seek (default) .IPs 2 volume + seek + timer + percentage -.IPs 4 +.IPs 3 volume + seek + timer + percentage + total time .RE .PD 1

1 0

CVS: main/libvo vo_xv.c,1.134,1.135
by Arpi of Ize 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv30694 Modified Files: vo_xv.c Log Message: -fixed-vo vs. panscan vs. 'f' vs. -fs fix patch by Jindrich Makovicka <makovick(a)kmlinux.fjfi.cvut.cz> Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- vo_xv.c 19 Jan 2003 16:52:00 -0000 1.134 +++ vo_xv.c 29 Jan 2003 20:25:01 -0000 1.135 @@ -385,10 +385,17 @@ #ifdef HAVE_XINERAMA vo_x11_xinerama_move(mDisplay,vo_window); #endif - } else - if ( !(flags&1) ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height ); - - vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); + vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); + } else { + // vo_fs set means we were already at fullscreen + vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); + if ( !vo_fs ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height ); + if ( flags&1 && !vo_fs ) vo_x11_fullscreen(); // handle -fs on non-first file + } + +// vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); + + printf("\n!!!!!! %d;%d %dx%d \n",hint.x,hint.y,hint.width,hint.height); if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc ); vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); @@ -434,7 +441,7 @@ #endif aspect(&vo_dwidth,&vo_dheight,A_NOZOOM); - if ( ( flags&1 )&&( WinID <= 0 ) ) + if ( (( flags&1 )&&( WinID <= 0 )) || vo_fs ) { aspect(&vo_dwidth,&vo_dheight,A_ZOOM); drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2; @@ -445,6 +452,19 @@ } panscan_calc(); + XClearWindow(mDisplay, vo_window); +#ifdef HAVE_SHM + if ( Shmem_Flag ) + { + XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); + XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight), False); + } + else +#endif + { + XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1); + XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight)); + } mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );

1 0

CVS: main/DOCS/Polish mplayer.1,1.14,1.15
by Winner of tha face compo 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/DOCS/Polish In directory mail:/var/tmp.root/cvs-serv26593/Polish Modified Files: mplayer.1 Log Message: Here is updated manual (24.01.2003). - by imoteph Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Polish/mplayer.1,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mplayer.1 12 Jan 2003 14:32:33 -0000 1.14 +++ mplayer.1 29 Jan 2003 17:23:23 -0000 1.15 @@ -39,7 +39,7 @@ .\" Tytu³ .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2002-10-19" +.TH MPlayer 1 "2003-01-11" . .SH "NAZWA" mplayer \- Movie Player dla Linuksa @@ -120,7 +120,7 @@ .PP MPlayer ma "wy¶wietlanie na ekranie" (OSD) w celu pokazania informacji, ³adne [...1221 lines suppressed...] .IPs l\ \ \ \ wczytaj plik .IPs c\ \ \ \ @@ -2774,7 +3272,8 @@ Prze³±cz tryb osd, lub ustaw jego poziom, kiedy poziom jest > 0. .IPs "volume <dir>" Zwiêkszenie/\:zmniejszenie g³o¶no¶ci -.IPs "[contrast|brightness|hue|saturation] <\-100 \- 100> [abs=<wart¶æ>]".br +.IPs "[contrast|brightness|hue|saturation] <\-100\- 100> [abs=<wart¶æ>]" +.br Ustaw/modyfikuj parametry wideo. .IPs "frame_drop [type=<warto¶æ>]" Prze³±cz/\:Ustaw tryb porzucania klatek. @@ -2954,5 +3453,5 @@ Je¶li zauwa¿ysz jaki¶ b³±d, popraw go i prze¶lij do autorów manuala (oryginalnego, b±dŒ t³umaczenia). T³umaczenie oparte na oryginalnym pliku do³±czonym do wersji 0.90-pre4, poprawiane -sukcesywnie, do wersji CVS z dnia 27-12-2002. +sukcesywnie, do wersji CVS z dnia 24-01-2003. .\" end of file

1 0

CVS: main/TOOLS menc2pass,1.2,1.3
by Atmosfear 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var/tmp.root/cvs-serv910/TOOLS Modified Files: menc2pass Log Message: 0.0357l Index: menc2pass =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/menc2pass,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- menc2pass 29 Jan 2003 15:10:42 -0000 1.2 +++ menc2pass 29 Jan 2003 16:48:36 -0000 1.3 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Helper script to ease MEncoder two pass encoding # Copyleft 2001 by Felix Buenemann <atmosfear(a)users.sourceforge.net> -# This files comes under GPL, see http://www.gnu.org/copyleft/gpl.html for more +# This file comes under GPL, see http://www.gnu.org/copyleft/gpl.html for more # information on it's licensing. use strict; my $mencoder="mencoder"; # Path to MEncoder (including binary name)

1 0

CVS: main/TOOLS menc2pass,1.1,1.2
by Atmosfear 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var/tmp.root/cvs-serv22800/TOOLS Modified Files: menc2pass Log Message: 100l, fix by pfred1 <pfred1 at bellatlantic.net> anyways I should update the script for lavc etc Index: menc2pass =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/menc2pass,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- menc2pass 20 Nov 2001 13:02:56 -0000 1.1 +++ menc2pass 29 Jan 2003 15:10:42 -0000 1.2 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Helper script to ease MEncoder two pass encoding # Copyleft 2001 by Felix Buenemann <atmosfear(a)users.sourceforge.net> -# This files comes udner GPL, see http://www.gnu.org/copyleft/gpl.html for more +# This files comes under GPL, see http://www.gnu.org/copyleft/gpl.html for more # information on it's licensing. use strict; my $mencoder="mencoder"; # Path to MEncoder (including binary name)

3 2

CVS: main/DOCS codecs.html,1.101,1.102 documentation.html,1.377,1.378 encoding.html,1.78,1.79 faq.html,1.118,1.119 formats.html,1.52,1.53 sound.html,1.66,1.67 video.html,1.126,1.127
by Winner of tha face compo 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv776 Modified Files: codecs.html documentation.html encoding.html faq.html formats.html sound.html video.html Log Message: changing "switch" -> "option" (unwritten DOCS rule) other important fixes, updates Index: codecs.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/codecs.html,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- codecs.html 20 Jan 2003 02:56:14 -0000 1.101 +++ codecs.html 28 Jan 2003 17:11:56 -0000 1.102 @@ -243,7 +243,7 @@ 4.0 video. The MPlayer 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> + <CODE>--with-reallibdir</CODE> option.</P> <P><B>Note:</B> RealPlayer libraries currently <B>only work with Linux, FreeBSD, NetBSD and Cygwin on the x86 and Alpha platforms.</B></P> Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- documentation.html 28 Jan 2003 01:46:53 -0000 1.377 +++ documentation.html 28 Jan 2003 17:11:56 -0000 1.378 @@ -278,39 +278,18 @@ <LI><A HREF="encoding.html">7. Encoding with MEncoder</A> <UL> <LI><A HREF="encoding.html#2pass">7.1 Encoding 2 or 3-pass MPEG-4 ("DIVX")</A></LI> - <LI><A HREF="encoding.html#rescaling">7.2 Rescaling movies</A></LI> - <LI><A HREF="encoding.html#copying">7.3 Stream copying</A></LI> - <LI><A HREF="encoding.html#fixing">7.4 Fixing AVIs with broken index</A></LI> - <LI><A HREF="encoding.html#libavcodec">7.5 Encoding with the libavcodec codec family</A></LI> - <LI><A HREF="encoding.html#image_files">7.6 Encoding from multiple input image files (JPEGs or PNGs)</A></LI> - <LI><A HREF="encoding.html#vobsub">7.7 Extracting DVD subtitles to a Vobsub file</A></LI> - <LI><A HREF="encoding.html#aspect">7.8 Preserving aspect ratio</A></LI> + <LI><A HREF="encoding.html#mpeg">7.2 Encoding to MPEG format</A></LI> + <LI><A HREF="encoding.html#rescaling">7.3 Rescaling movies</A></LI> + <LI><A HREF="encoding.html#copying">7.4 Stream copying</A></LI> + <LI><A HREF="encoding.html#fixing">7.5 Fixing AVIs with broken index</A></LI> + <LI><A HREF="encoding.html#libavcodec">7.6 Encoding with the libavcodec codec family</A></LI> + <LI><A HREF="encoding.html#image_files">7.7 Encoding from multiple input image files (JPEGs or PNGs)</A></LI> + <LI><A HREF="encoding.html#vobsub">7.8 Extracting DVD subtitles to a Vobsub file</A></LI> + <LI><A HREF="encoding.html#aspect">7.9 Preserving aspect ratio</A></LI> </UL> </LI> <LI><A HREF="#mailing_lists">Appendix A - Mailing lists</A></LI> - <LI><A HREF="bugreports.html">Appendix B - How to report bugs</A> - <UL> - <LI><A HREF="bugreports.html#fix">B.1 How to fix bugs</A></LI> - <LI><A HREF="bugreports.html#report">B.2 How to report bugs</A></LI> - <LI><A HREF="bugreports.html#where">B.3 Where to report bugs</A></LI> - <LI><A HREF="bugreports.html#what">B.4 What to report</A> - <UL> - <LI><A HREF="bugreports.html#system">B.4.1 System information</A></LI> - <LI><A HREF="bugreports.html#hardware">B.4.2 Hardware and Drivers</A></LI> - <LI><A HREF="bugreports.html#compilation">B.4.3 Compilation problems</A></LI> - <LI><A HREF="bugreports.html#configure">B.4.4 Configure problems</A></LI> - <LI><A HREF="bugreports.html#playback">B.4.5 Playback problems</A></LI> - <LI><A HREF="bugreports.html#crash">B.4.6 Crashes</A> - <UL> - <LI><A HREF="bugreports.html#debug">B.4.6.1 How to conserve information about a reproducible crash</A></LI> - <LI><A HREF="bugreports.html#core">B.4.6.2 How to extract meaningful information from a core dump</A></LI> - </UL> - </LI> - </UL> - </LI> - <LI><A HREF="bugreports.html#advusers">B.5 I know what I am doing...</A></LI> - </UL> - </LI> + <LI><A HREF="bugreports.html">Appendix B - How to report bugs</A></LI> <LI><A HREF="#known_bugs">Appendix C - Known bugs</A></LI> <LI><A HREF="skin.html">Appendix D - MPlayer skin format</A> <UL> @@ -1104,7 +1083,7 @@ The power management functions of some notebook BIOSes with speedstep CPUs interact badly with RTC. Audio and video may get out of sync. Plugging the external power connector in before you power up your notebook seems to help. - You can always turn off RTC support with the <CODE>-nortc</CODE> switch. + You can always turn off RTC support with the <CODE>-nortc</CODE> option. In some hardware combinations (confirmed during usage of non-DMA DVD drive on an ALi1541 board) usage of the RTC timer causes skippy playback. It's recommended to use the third method in these cases.</LI> @@ -1360,7 +1339,7 @@ using a simple config file. The syntax consist of a key name followed by a command. The default config file location is <CODE>$HOME/.mplayer/input.conf</CODE> but it can be overridden using the - <CODE>-input</CODE> conf switch (relative path are relative to + <CODE>-input</CODE> conf option (relative path are relative to <CODE>$HOME/.mplayer</CODE>). <P>Example:</P> @@ -1548,13 +1527,13 @@ </PRE> <P>If you don't like the standard location for the lirc-config file (~/.lircrc) - use the -lircconf <filename> switch to specify another file.</P> + use the -lircconf <filename> option to specify another file.</P> <H3><A NAME="slave">3.2.3 Slave mode</A></H3> <P>The slave mode allow you to build simple frontend to MPlayer. When - enabled (with the <CODE>-slave</CODE> switch) MPlayer will read + enabled (with the <CODE>-slave</CODE> option) MPlayer will read commands separated by new line (\n) from stdin.</P> Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- encoding.html 25 Jan 2003 10:03:23 -0000 1.78 +++ encoding.html 28 Jan 2003 17:11:56 -0000 1.79 @@ -87,6 +87,25 @@ -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P> +<H2><A NAME="mpeg">7.1 Encoding to MPEG format</A></H2> + +<P>MEncoder can create MPEG (MPEG-PS) format output files. It's probably + useful only with libavcodec's <I>mpeg1video</I> codec, because players + - except MPlayer - expect MPEG1 video, and MPEG1 layer 2 (MP2) audio streams + in MPEG files.</P> + +<P>This feature is not very useful right now, aside that it probably has + many bugs, but the more importantly because MEncoder currently cannot encode + MPEG1 layer 2 (MP2) audio, which all other players expect in MPEG files.</P> + +<P>To change MEncoder's output file format, use the <CODE>-of mpeg</CODE> + option.</P> + +<P>Example:<BR> +   <CODE>mencoder -of mpeg -ovc lavc -lavcopts vcodec=mpeg1video + -oac copy <other options> media.avi -o output.mpg</CODE></P> + + <H2><A NAME="rescaling">7.2 Rescaling movies</A></H2> <P>Often the need to resize movie images' size emerges. Its reasons can be @@ -185,7 +204,7 @@ <H4>Examples</H4> <P>The explanation of the <CODE>-mf</CODE> option can be found below in the - global <A HREF="#options">Options</A> section and in the man page.</P> + man page.</P> <P><I>Creating a DivX4 file from all the JPEG files in the current dir:</I><BR>   <CODE>mencoder -mf on:w=800:h=600:fps=25 -ovc divx4 Index: faq.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/faq.html,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- faq.html 12 Jan 2003 21:24:19 -0000 1.118 +++ faq.html 28 Jan 2003 17:11:56 -0000 1.119 @@ -257,7 +257,7 @@ <DD>A: It does, but you have to explicitly specify software scaling (very slow) with the <CODE>-zoom</CODE> option. You better use XF86VidMode support: You must specify the <CODE>-vm</CODE> and the <CODE>-fs</CODE> - switch, and you're done. Make sure you have the right modelines in your + option, and you're done. Make sure you have the right modelines in your XF86Config file, and try to make the <A HREF="video.html#dga">DGA driver</A> and <A HREF="video.html#sdl">SDL's DGA driver</A> work for you. It's much faster. If SDL's DGA works, use that, it'll be even faster.</DD> @@ -431,7 +431,7 @@ <DD> </DD> <DT>Q: My computer plays M$ DivX AVIs with resolutions ~ 640x300 and stereo - mp3 sound too slow. When I use -nosound switch, everything is OK (but + mp3 sound too slow. When I use -nosound option, everything is OK (but quiet).</DT> <DD>A: Your machine is too slow or your soundcard driver is broken. Consult the documentation to see if you can improve performance.</DD> @@ -539,7 +539,7 @@ my notebook. It works normal when i run it as a user.</DT> <DD>A: This is again a power management effect (see above). Plug the external power connector in <B>before</B> you power on your notebook or use the - <CODE>-nortc</CODE> switch.</DD> + <CODE>-nortc</CODE> option.</DD> </DL> @@ -560,7 +560,7 @@ </DT> <DD>A: Are you running KDE or GNOME with the ARTS or ESD sound daemon? Try disabling the sound daemon or use the <CODE>-ao arts</CODE> or - <CODE>-ao esd</CODE> switch to make MPlayer use ARTS or ESD.</DD> + <CODE>-ao esd</CODE> option to make MPlayer use ARTS or ESD.</DD> <DD> </DD> <DT>Q: What about the DGA driver? I can't find it!</DT> Index: formats.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/formats.html,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- formats.html 28 Jan 2003 01:33:58 -0000 1.52 +++ formats.html 28 Jan 2003 17:11:57 -0000 1.53 @@ -314,7 +314,7 @@ <CODE>./configure --enable-xmms</CODE>. If that does not work, you might need to set the XMMS plugin and library path explicitly by way of the <CODE>--with-xmmsplugindir</CODE> and <CODE>--withxmmslibdir</CODE> - switches.</P> + options.</P> </BODY> </HTML> Index: sound.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/sound.html,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sound.html 25 Jan 2003 01:22:26 -0000 1.66 +++ sound.html 28 Jan 2003 17:11:57 -0000 1.67 @@ -237,7 +237,7 @@ is normally automated but can be overridden. The filters are activated when the properties of the audio data differ from those required by the sound card and deactivated if unnecessary. The <CODE>-af filter1,filter2,...</CODE> - switch is used to override the automatic activation of filters or to insert + option is used to override the automatic activation of filters or to insert filters that are not automatically inserted. The filters will be executed as they appear in the comma separated list.</P> @@ -247,10 +247,10 @@ <P>would run the sound through the resampling filter followed by the pan filter. Observe that the list must not contain any spaces, else it will fail.</P> -<P>The filters often have switches that change their behavior. These switches +<P>The filters often have options that change their behavior. These options are explained in detail in the sections below. A filter will execute using - default settings if its switches are omitted. Here is an example of how to use - filters in combination with filter specific switches:</P> + default settings if its options are omitted. Here is an example of how to use + filters in combination with filter specific options:</P> <P>  <CODE>mplayer -af resample=11025,pan=1:0.5:0.5 -channels 1 -srate 11025 media.avi</CODE></P> @@ -259,7 +259,7 @@ the audio to 1 channel using the pan filter.</P> <P>The overall execution of the filter layer is controlled using the - <CODE>-af-adv</CODE> switch. This switch has two suboptions:</P> + <CODE>-af-adv</CODE> option. This option has two suboptions:</P> <DL> <DT><CODE>force</CODE><DT> @@ -296,28 +296,30 @@ </DD> <DT><CODE>list</CODE></DT> - <DD>is an alias for the -af switch.</DD> + <DD>is an alias for the -af option.</DD> </DL> -<P>The filter layer is also affected by the following generic switches: +<P>The filter layer is also affected by the following generic options: <DL> <DT><CODE>-v</CODE></DT> <DD>Increases the verbosity level and makes most filters print out extra status messages.</DD> <DT><CODE>-channels</CODE></DT> - <DD>This option sets the number of output channels your sound card is using. + <DD>This option sets the number of output channels you would like your + sound card to use. It also affects the number of channels that are being decoded from the media. If the media contains less channels than requested the channels filter (see below) will automatically be inserted. The routing will be the default routing for the channels filter.</DD> <DT><CODE>-srate</CODE></DT> - <DD>This option selects the sample rate of your sound card. If the sample + <DD>This option selects the sample rate you would like your sound card to + use (of course the cards have limits on this). If the sample frequency of your sound card is different from that of the current media, the resample filter (see below) will be inserted into the audio filter layer to compensate for the difference.</DD> <DT><CODE>-format</CODE><DT> - <DD>This option sets the sample format of the audio filter layer and the sound + <DD>This option sets the sample format between the audio filter layer and the sound card. If the requested sample format of your sound card is different from that of the current media, a format filter (see below) will be inserted to rectify the difference.</DD> @@ -331,7 +333,7 @@ have a fixed frequency sound card or if you are stuck with an old sound card that is only capable of max 44.1kHz. This filter is automatically enabled if it is necessary, but it can also be explicitly enabled on the command line. It - has three switches:</P> + has three options:</P> <DL> <DT><CODE>srate <8000-192000></CODE></DT> @@ -344,7 +346,7 @@ <DT><CODE>sloppy</CODE></DT> <DD>is an optional binary parameter that allows the output frequency to differ - slightly from the frequency given by <CODE>srate</CODE>. This switch can be + slightly from the frequency given by <CODE>srate</CODE>. This option can be used if the startup of the playback is extremely slow. It is enabled by default.</DD> @@ -373,12 +375,12 @@ channels, it can also be used for routing or copying channels. It is automatically enabled when the output from the audio filter layer differs from the input layer or when it is requested by another filter. This filter unloads - itself if not needed. The number of switches is dynamic:</P> + itself if not needed. The number of options is dynamic:</P> <DL> <DT><CODE>nch <1-6></CODE></DT> <DD>is an integer between <CODE>1</CODE> and <CODE>6</CODE> that is used for - setting the number of output channels. This switch is required, leaving it + setting the number of output channels. This option is required, leaving it empty results in a runtime error.</DD> <DT><CODE>nr <1-6></CODE></DT> @@ -421,7 +423,7 @@ <DL> <DT><CODE>bps <number></CODE></DT> <DD>can be <CODE>1</CODE>, <CODE>2</CODE> or <CODE>4</CODE> and denotes the - number of bytes per sample. This switch is required, leaving it empty + number of bytes per sample. This option is required, leaving it empty results in a runtime error.</DD> <DT><CODE>f <format></CODE></DT> @@ -429,7 +431,7 @@ concatenated mix of: <CODE>alaw</CODE>, <CODE>mulaw</CODE> or <CODE>imaadpcm</CODE>, <CODE>float</CODE> or <CODE>int</CODE>, <CODE>unsigned</CODE> or <CODE>signed</CODE>, <CODE>le</CODE> or - <CODE>be</CODE> (little or big endian). This switch is required, leaving it + <CODE>be</CODE> (little or big endian). This option is required, leaving it empty results in a runtime error.</DD> </DL> @@ -485,7 +487,7 @@ If there is an external amplifier connected to the computer (this is almost always the case), the noise level can be minimized by adjusting the master level and the volume knob on the amplifier until the hissing noise in the - background is gone. This filter has two switches:</P> + background is gone. This filter has two options:</P> <DL> <DT><CODE>v <-200 - +60></CODE></DT> @@ -495,7 +497,7 @@ <DT><CODE>c</CODE></DT> <DD>is a binary control that turns soft clipping on and off. Soft-clipping can make the sound more smooth if very high volume levels are used. Enable this - switch if the dynamic range of the loudspeakers is very low. Be aware that + option if the dynamic range of the loudspeakers is very low. Be aware that this feature creates distortion and should be considered a last resort.</DD> </DL> @@ -554,11 +556,11 @@ canceling it almost completely around 1kHz.</P> -<H5><A NAME="af_panning">2.3.2.3.7 Panning filter </A></H5> +<H5><A NAME="af_panning">2.3.2.3.7 Panning filter</A></H5> <P>Use the <CODE>pan</CODE> filter to mix channels arbitrarily. It is basically a combination of the volume control and the channels filter. There are two - major uses for this filter: </P> + major uses for this filter:</P> <OL> <LI>Down-mixing many channels to only a few, stereo to mono for example.</LI> @@ -566,13 +568,13 @@ </OL> <P>This filter is hard to use, and will require some tinkering before the - desired result is obtained. The number of switches for this filter depends on + desired result is obtained. The number of options for this filter depends on the number of output channels:</P> <DL> <DT><CODE>nch <1-6></CODE></DT> <DD>is an integer between <CODE>1</CODE> and <CODE>6</CODE> and is used for - setting the number of output channels. This switch is required, leaving it + setting the number of output channels. This option is required, leaving it empty results in a runtime error.</DD> <DT><CODE>l00:l01:l02:..l10:l11:l12:...ln0:ln1:ln2:...</CODE></DT> @@ -653,16 +655,14 @@ speakers.</P> - +<H4><A NAME="plugins">2.3.2.4 Audio plugins (deprecated)</A></H4> <H2><STRONG>Note: Audio plugins have been deprecated by audio filters and will be removed soon.</STRONG></H2> -<H4><A NAME="plugins">2.3.2.4 Audio plugins (deprecated)</A></H4> - <P>MPlayer has support for audio plugins. Audio plugins can be used to change the properties of the audio data before it reaches the sound - card. They are enabled using the <CODE>-aop</CODE> switch which takes a + card. They are enabled using the <CODE>-aop</CODE> option which takes a <CODE>list=plugin1,plugin2,...</CODE> argument. The <CODE>list</CODE> argument is required and determines which plugins should be used and in which order they should be executed. Example:</P> @@ -672,10 +672,10 @@ <P>would run the sound through the resampling plugin followed by the format plugin.</P> -<P>The plugins can also have switches that change their behavior. These - switches are explained in detail in the sections below. A plugin will execute - using default settings if its switches are omitted. Here is an example of how - to use plugins in combination with plugin specific switches:</P> +<P>The plugins can also have options that change their behavior. These + options are explained in detail in the sections below. A plugin will execute + using default settings if its options are omitted. Here is an example of how + to use plugins in combination with plugin specific options:</P> <P>  <CODE>mplayer media.avi -aop list=resample,format:fout=44100:format=0x8</CODE></P> @@ -692,7 +692,7 @@ be used if you have a fixed frequency sound card or if you are stuck with an old sound card that is only capable of max 44.1kHz. MPlayer <EM>autodetects</EM> whether or not usage of this plugin is necessary. - This plugin has one switch, <CODE>fout</CODE>, which is used for setting the + This plugin has one option, <CODE>fout</CODE>, which is used for setting the desired output sample frequency. The value is given in Hz, and defaults to 48kHz.</P> @@ -721,7 +721,7 @@ <P>If your sound card driver does not support signed 16bit <CODE>int</CODE> data type, this plugin can be used to change the format to one which your sound card can understand. It - has one switch, <CODE>format</CODE>, which can be set to one of the numbers + has one option, <CODE>format</CODE>, which can be set to one of the numbers found in <CODE>libao2/afmt.h</CODE>. This plugin is hardly ever needed and is intended for advanced users. Keep in mind that this plugin only changes the sample format and not the sample frequency or the number of channels.</P> @@ -749,7 +749,7 @@ can be used on machines with a broken mixer device. It can also be used if one wants to change the output volume of MPlayer without changing the PCM volume setting in the mixer. It has one - switch <CODE>volume</CODE> that is used for setting the initial + option <CODE>volume</CODE> that is used for setting the initial sound level. The initial sound level can be set to values between 0 and 255 and defaults to 101 which equals 0dB amplification. Use this plugin with caution since it can reduce the signal to noise ratio of Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/video.html,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- video.html 25 Jan 2003 09:31:16 -0000 1.126 +++ video.html 28 Jan 2003 17:11:57 -0000 1.127 @@ -258,7 +258,7 @@ --enable-dga.</P> <P>If the driver couldn't switch to a smaller resolution, experiment with - switches -vm (only with X 3.3.x), -fs, -bpp, -zoom to find a video mode that + options -vm (only with X 3.3.x), -fs, -bpp, -zoom to find a video mode that the movie fits in. There is no converter right now :(</P> <P>Become root. DGA needs root access to be able to write directly to video @@ -315,7 +315,7 @@ <P>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 resolution of the video as close as possible. It deliberately ignores the - -vm and -fs switches (enabling of video mode switching and fullscreen) - + -vm and -fs options (enabling of video mode switching and fullscreen) - it always tries to cover as much area of your screen as possible by switching the video mode, thus refraining to use a single additional cycle of your CPU to scale the image. @@ -459,7 +459,7 @@ <P>SDL video output supports displaying subtitles under the movie, on the (if present) black bar.</P> -<P><B>There are several command line switches for SDL:</B></P> +<P><B>There are several command line options for SDL:</B></P> <DL> <DT><CODE>-vo sdl:name</CODE></DT> <DD>specifies sdl video driver to use (i.e.. aalib, dga, x11)</DD> @@ -501,7 +501,7 @@ <H4>Notes</H4> -<P>Be sure not to use the -fs switch, since it toggles the usage of the software +<P>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 <CODE>-sws 4</CODE> option which will produce bad quality, but is somewhat faster.</P> @@ -705,8 +705,8 @@ <P>NOTE: the rendering is very CPU intensive, especially when using AA-on-X (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 :)) (anyone can enhance - fbdev to do conversion/dithering to hgafb? Would be neat :)</P> + then enjoy! (secondary head Hercules cards rock :)) (but imho you can use + <CODE>-vop 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> @@ -1041,7 +1041,7 @@ <CODE>expand=w:h:x:y:1</CODE> (the 5th parameter <CODE>:1</CODE> at the end will enable OSD rendering). You may want to move the image up a bit to get a bigger black zone for subtitles. You may also want to move subtitles up, if - they are outside your TV screen, use the <CODE>-subpos <0-100></CODE> switch + they are outside your TV screen, use the <CODE>-subpos <0-100></CODE> option to adjust this (<CODE>-subpos 80</CODE> is a good choice).</P> <P>In order to play non-25fps movies on a PAL TV or with a slow CPU, add the

3 4

CVS: main/DOCS sound.html,1.65,1.66
by Diego Biurrun CVS 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv10847 Modified Files: sound.html Log Message: Some updates and rewordings as well as a much better table design by Nilmoni Deb, Daniel Carter and Philip Jägenstedt. Index: sound.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/sound.html,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sound.html 20 Jan 2003 10:46:32 -0000 1.65 +++ sound.html 25 Jan 2003 01:22:26 -0000 1.66 @@ -22,7 +22,7 @@ <DD>OSS (ioctl) driver (supports hardware AC3 passthrough)</DD> <DT>sdl</DT> - <DD>SDL driver (supports <B>ESD</B>, <B>ARTS</B> etc)</DD> + <DD>SDL driver (supports sound daemons like <B>ESD</B> and <B>ARTS</B>)</DD> <DT>nas</DT> <DD>NAS (Network Audio System) driver</DD> @@ -43,18 +43,21 @@ <DD>native ESD driver (mostly for GNOME users)</DD> </DL> -<P>Fact is, Linux sound card drivers have compatibility problems. The cause - is that MPlayer uses a feature that well coded audio drivers implement to - maintain audio/video sync. Regrettably, some driver authors do not care about - this function, it is not needed for playing MP3s or for sound effects.</P> - -<P>Other media players like aviplay or xine possibly work out-of-the-box with - these drivers because they use "simple" methods with internal timing. A note: - time showed their methods aren't AS efficient as MPlayer's.</P> - -<P>With a correctly written audio driver MPlayer will never create audio related - A/V desynchronisation, unless your file is badly broken. Some options to work - around these problems are described in the man page).</P> +<P>Linux sound card drivers have compatibility problems. This is because MPlayer + relies on an in-built feature of <EM>properly</EM> coded sound drivers that + enable them to maintain correct audio/video sync. Regrettably, some driver + authors don't take the care to code this feature since it is not needed for + playing MP3s or sound effects. </P> + +<P>Other media players like <A HREF="http://avifile.sourceforge.net">aviplay</A> + or <A HREF="http://xine.sourceforge.net">xine</A> possibly work + out-of-the-box with these drivers because they use "simple" methods with + internal timing. Measuring showed that their methods are not as efficient + as MPlayer's. </P> + +<P>Using MPlayer with a properly written audio driver will never result + in A/V desyncs related to the audio, except only with very badly created + files (check the man page for workarounds).</P> <P>If you happen to have a bad audio driver, try the <CODE>-autosync</CODE> option, it should sort out your problems. See the man page for detailed @@ -67,94 +70,160 @@ default). If you experience glitches, halts or anything out of the ordinary, try <CODE>-ao sdl</CODE> (NOTE: You need to have SDL libraries and header files installed). The SDL audio driver helps in a lot of cases - and also supports ESD and ARTS. (ESD is the sound daemon - from GNOME, ARTS is from KDE.)</LI> + and also supports ESD (GNOME) and ARTS (KDE).</LI> <LI>If you have ALSA version 0.5, then you almost always have to use <CODE>-ao alsa5</CODE> , since ALSA 0.5 has buggy OSS emulation code, and will <B>crash MPlayer</B> with a message like this:<BR> <CODE>DEMUXER: Too many (945 in 8390980 bytes) video packets in the buffer!</CODE></LI> -</UL> - -<P>On <B>Solaris</B>, use the SUN audio driver with the - <CODE>-ao sun</CODE> option, otherwise neither video nor audio will work.</P> + <LI>On Solaris, use the SUN audio driver with the <CODE>-ao sun</CODE> option, + otherwise neither video nor audio will work.</LI> + <LI>If the sound clicks when playing from CD-ROM, turn on IRQ unmasking, e.g. + <CODE>hdparm -u1 /dev/cdrom</CODE> (<CODE>man hdparm</CODE>). This is + generally beneficial and described in more detail in the + <A HREF="cd-dvd.html#drives">CD-ROM section</A>.</LI> + </UL> <H4><A NAME="experiences">2.3.2.2 Sound Card experiences, recommendations</A></H4> -<TABLE BORDER="0" WIDTH="100%"> - <TR><TD COLSPAN=3><B>VIA onboard chipset (via82cxxx) 48kHz only</B></TD></TR> - <TR><TD></TD><TD>Driver:</TD><TD> from the - <A HREF="http://sourceforge.net/project/showfiles.php?group_id=3242&release_id=5…">gkernel project</A></TD></TR> - - <TR><TD COLSPAN=3><B>Aureal Vortex 2</B></TD></TR> - <TR><TD>    </TD><TD>OSS:</TD><TD>no driver</TD></TR> - <TR><TD></TD><TD>OSS/Pro:</TD><TD>OK</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>no driver</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>48</TD></TR> - <TR><TD></TD><TD>Driver:</TD><TD><A HREF="http://aureal.sourceforge.net">aureal.sourceforge.net</A></TD></TR> - <TR><TD></TD><TD>Driver2:</TD><TD> from <A HREF="http://makacs.poliod.hu/~pontscho/aureal/au88xx-1.1.3.tar.bz2">Pontscho's page</A> - (<I>buffer size increased to 32k</I>)</TD></TR> - - <TR><TD COLSPAN=3><B>GUS PnP</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>no driver</TD></TR> - <TR><TD></TD><TD>OSS/Pro:</TD><TD>OK</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>OK</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>48</TD></TR> - - <TR><TD COLSPAN=3><B>SB Live!</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>Analog OK, SP/DIF not working</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>Both OK</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>192</TD></TR> - - <TR><TD COLSPAN=3><B>SB AWE 64</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>max 44kHz</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>48kHz sounds bad</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>48</TD></TR> - - <TR><TD COLSPAN=3><B>Gravis UltraSound ACE</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>not OK</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>OK</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>44</TD></TR> - - <TR><TD COLSPAN=3><B>Gravis UltraSound MAX</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>OK</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>OK (?)</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>48</TD></TR> - - <TR><TD COLSPAN=3><B>ESS 688</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>OK</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>OK (?)</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>48</TD></TR> - - <TR><TD COLSPAN=3><B>C-Media cards (which ones?)</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>not OK (hissing) (?)</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>OK (?)</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>?</TD></TR> - - <TR><TD COLSPAN=3><B>Yamaha cards (*ymf*)</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>not OK (?) (maybe <CODE>-ao sdl</CODE>)</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>OK only with ALSA 0.5 with OSS emulation <B>AND</B> <CODE>-ao sdl</CODE> (!) (?)</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>?</TD></TR> - - <TR><TD COLSPAN=3><B>Cards with envy24 chips (like Terratec EWS88MT)</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>?</TD></TR> - <TR><TD></TD><TD>OSS/Pro:</TD><TD>OK</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>?</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>?</TD></TR> - - <TR><TD COLSPAN=3><B>PC Speaker or DAC</B></TD></TR> - <TR><TD></TD><TD>OSS:</TD><TD>OK (Use the SDL driver: <CODE>-ao sdl</CODE>)</TD></TR> - <TR><TD></TD><TD>ALSA:</TD><TD>no driver</TD></TR> - <TR><TD></TD><TD>Max kHz:</TD><TD>The driver emulates 44.1, maybe more.</TD></TR> - <TR><TD></TD><TD>Driver:</TD><TD><A HREF="ftp://ftp.infradead.org/pub/pcsp">ftp://ftp.infradead.org/pub/pcsp</A></TD></TR> -</TABLE> - <P>On Linux, a 2.4.x kernel is highly recommended. Kernel 2.2 is not tested.</P> -<P>If the sound clicks when playing from CD-ROM, turn on IRQ unmasking, e.g. - <CODE>hdparm -u1 /dev/cdrom</CODE> (<CODE>man hdparm</CODE>). This is - generally beneficial and described in more detail in the - <A HREF="cd-dvd.html#drives">CD-ROM section</A>.</P> +<P>Linux sound drivers are primarily provided by the free version of OSS. These + drivers have been superceded by <A HREF="http://www.alsa-project.org">ALSA</A> + (Advanced Linux Sound Architecture) in the 2.5 development series. If your + distribution does not already use ALSA you may wish to try their drivers if + you experience sound problems. ALSA drivers are generally superior to OSS in + compatibility, performance and features. But some sound cards are only + supported by the commercial OSS drivers from + <A HREF="http://www.opensound.com/">4Front Technologies</A>. They also support + several non-Linux systems.</P> + +<TABLE BORDER="1" WIDTH="100%"> + + <TR> + <TD ROWSPAN="2"><B>SOUND CARD</B></TD> + <TD COLSPAN="4"><B>DRIVER</B></TD> + <TD ROWSPAN="2"><B>Max kHz</B></TD> + </TR> + + <TR> + <TD><B>OSS/Free</B></TD> + <TD><B>ALSA</B></TD> + <TD><B>OSS/Pro</B></TD> + <TD><B>other</B></TD> + </TR> + + <TR> + <TD><B>VIA onboard (686/A/B, 8233, 8235)</B></TD> + <TD><A HREF="http://sourceforge.net/project/showfiles.php?group_id=3242&release_id=5…">via82cxxx_audio</A></TD> + <TD>snd-via82xx</TD> + <TD> </TD> + <TD> </TD> + <TD>4-48 kHz or 48 kHz only, depending on the chipset</TD> + </TR> + + <TR> + <TD><B>Aureal Vortex 2</B></TD> + <TD>none</TD> + <TD>none</TD> + <TD>OK</TD> + <TD><A HREF="http://aureal.sourceforge.net">Linux Aureal Drivers</A><BR> + <A HREF="http://makacs.poliod.hu/~pontscho/aureal/au88xx-1.1.3.tar.bz2">buffer size increased to 32k</A></TD> + <TD>48</TD> + </TR> + + <TR> + <TD><B>GUS PnP</B></TD> + <TD>none</TD> + <TD>OK</TD> + <TD>OK</TD> + <TD> </TD> + <TD>48</TD> + </TR> + + <TR> + <TD><B>SB Live!</B></TD> + <TD>Analog OK, SP/DIF not working</TD> + <TD>Both OK</TD> + <TD> </TD> + <TD> </TD> + <TD>192</TD> + </TR> + + <TR> + <TD><B>SB AWE 64</B></TD> + <TD>max 44kHz</TD> + <TD>48kHz sounds bad</TD> + <TD> </TD> + <TD> </TD> + <TD>48</TD> + </TR> + + <TR> + <TD><B>Gravis UltraSound ACE</B></TD> + <TD>not OK</TD> + <TD>OK</TD> + <TD> </TD> + <TD> </TD> + <TD>44</TD> + </TR> + + <TR> + <TD><B>Gravis UltraSound MAX</B></TD> + <TD>OK</TD> + <TD>OK (?)</TD> + <TD> </TD> + <TD> </TD> + <TD>48</TD> + </TR> + + <TR> + <TD><B>ESS 688</B></TD> + <TD>OK</TD> + <TD>OK (?)</TD> + <TD> </TD> + <TD> </TD> + <TD>48</TD> + </TR> + + <TR> + <TD><B>C-Media cards (which ones?)</B></TD> + <TD>not OK (hissing) (?)</TD> + <TD>OK (?)</TD> + <TD> </TD> + <TD> </TD> + <TD>?</TD> + </TR> + + <TR> + <TD><B>Yamaha cards (*ymf*)</B></TD> + <TD>not OK (?) (maybe <CODE>-ao sdl</CODE>)</TD> + <TD>OK only with ALSA 0.5 with OSS emulation <B>AND</B> + <CODE>-ao sdl</CODE> (!) (?)</TD> + <TD> </TD> + <TD> </TD> + <TD>?</TD> + </TR> + + <TR> + <TD><B>Cards with envy24 chips (like Terratec EWS88MT)</B></TD> + <TD>?</TD> + <TD>?</TD> + <TD>OK</TD> + <TD> </TD> + <TD>?</TD> + </TR> + + <TR> + <TD><B>PC Speaker or DAC</B></TD> + <TD>OK (Use the SDL driver: <CODE>-ao sdl</CODE>)</TD> + <TD>none</TD> + <TD> </TD> + <TD><A HREF="http://www.geocities.com/stssppnn/pcsp.html">Linux PC speaker OSS driver</a></TD> + <TD>The driver emulates 44.1, maybe more.</TD> + </TR> + +</TABLE> <P>Feedback to this document is welcome. Please tell us how MPlayer and your sound card(s) worked together.</P> @@ -474,7 +543,7 @@ <DL> <DT><CODE>g1:g2:g3...g10</CODE></DT> - <DD>are floating point numbers between <CODE>-12<CODE> and <CODE>+12</CODE> + <DD>are floating point numbers between <CODE>-12</CODE> and <CODE>+12</CODE> representing the gain in dB for each frequency band.</DD> </DL> @@ -591,8 +660,8 @@ <H4><A NAME="plugins">2.3.2.4 Audio plugins (deprecated)</A></H4> -<P>MPlayer has support for audio plugins. Audio plugins can be used for - changing the properties of the audio data before the sound reaches the sound +<P>MPlayer has support for audio plugins. Audio plugins can be used to + change the properties of the audio data before it reaches the sound card. They are enabled using the <CODE>-aop</CODE> switch which takes a <CODE>list=plugin1,plugin2,...</CODE> argument. The <CODE>list</CODE> argument is required and determines which plugins should be used and in which order they @@ -614,7 +683,7 @@ <P>would set the output frequency of the resample plugin to 44100Hz and the output format of the format plugin to AFMT_U8.</P> -<P>Currently audio plugins can not be used in MEncoder.</P> +<P>Currently audio plugins cannot be used in MEncoder.</P> <H5><A NAME="resample">2.3.2.4.1 Up/Downsampling</A></H5> @@ -622,11 +691,10 @@ <P>MPlayer fully supports up/downsampling of the sound. This plugin can be used if you have a fixed frequency sound card or if you are stuck with an old sound card that is only capable of max 44.1kHz. - Whether is usage of this plugin is necessary or not, is <B>autodetected</B>. - This plugin has one switch: - <CODE>fout</CODE> which is used for setting the desired output sample - frequency. It defaults to 48kHz, and is given in - <Hz>.</P> + MPlayer <EM>autodetects</EM> whether or not usage of this plugin is necessary. + This plugin has one switch, <CODE>fout</CODE>, which is used for setting the + desired output sample frequency. The value is given in Hz, and defaults to + 48kHz.</P> <P>Usage:<BR>   <CODE>mplayer media.avi -aop list=resample:fout=<required @@ -634,7 +702,7 @@ <P>Note that the output frequency should not be scaled up from the default value. Scaling up will cause the audio and video streams to be played in slow motion - in addition to audio distortion.</P> + and cause audio distortion.</P> <H5><A NAME="surround_decoding">2.3.2.4.2 Surround Sound decoding</A></H5> @@ -669,6 +737,10 @@ new plugins. It can not be used for anything useful from a users perspective and is mentioned here for the sake of completeness only. Do not use this plugin unless you are a developer.</P> + +<P>If you have a file with a consistent A/V sync fault, use the <CODE>+/-</CODE> + keys to adjust timings on-the-fly instead. Usage of the OSD is recommended + to make this easier.</P> <H5><A NAME="volume">2.3.2.4.5 Software volume control</A></H5>

3 5

CVS: main/DOCS/Hungarian documentation.html,1.186,1.187 encoding.html,1.45,1.46 formats.html,1.31,1.32 sound.html,1.41,1.42
by Winner of tha face compo 29 Jan '03

29 Jan '03

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mail:/var/tmp.root/cvs-serv14742 Modified Files: documentation.html encoding.html formats.html sound.html Log Message: sync Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/documentation.html,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- documentation.html 28 Jan 2003 23:10:51 -0000 1.186 +++ documentation.html 29 Jan 2003 13:53:39 -0000 1.187 @@ -63,6 +63,7 @@ <LI><A HREF="formats.html#ogg">2.1.1.12 OGG/OGM file-ok</A></LI> <LI><A HREF="formats.html#sdp">2.1.1.13 SDP file-ok</A></LI> <LI><A HREF="formats.html#pva">2.1.1.14 PVA file-ok</A></LI> + <LI><A HREF="formats.html#gif">2.1.1.15 GIF file-ok</A></LI> </UL> <LI><A HREF="formats.html#audio_formats">2.1.2 Audio</A></LI> <UL> @@ -1199,13 +1200,55 @@ <H2><A NAME="edl">2.6 Edit Decision Lists (EDL)</A></H2> -<P>TODO</P> +<P>Az edit decision list (EDL) rendszer segítségével lehetõvé válik a film + megadott idõintervallumainak automatikus átugrása, vagy a hang + kikapcsolása.</P> +<P>Ennek hasznossága akkor mutatkozik meg amikor egy filmet "családbarát" + módban akarsz megtekinteni: kivágható az erõszak, az illetlen beszéd, + Jar-Jar Binks, stb. Valamint reklámok átugrására is használható.</P> -<H3><A NAME="edl_using">2.6.1 Using an EDL file</A></H3> +<P>Az EDL fileformátum eléggé puritán. Amint az EDL rendszer megérik, + valószínûleg egy XML-féle formátum lesz implementálva (a régi formátummal + kompatibilisen).</P> + +<P>Jelenleg maximum 1000 bejegyzést lehet használni, ha ez nem elég, az + <CODE>edl.h</CODE> file-ban a <CODE>#define MAX_EDL_ENTRIES</CODE> értékét + kell megnövelni.</P> -<H3><A NAME="edl_making">2.6.2 Making an EDL file</A></H3> +<H3><A NAME="edl_using">2.6.1 Egy EDL file használata</A></H3> + +<P>Az MPlayer indításakor add meg az <CODE>-edl <filenév></CODE> + parancsot, a filmhez használandó EDL file nevét behelyettesítve.</P> + + +<H3><A NAME="edl_making">2.6.2 Egy EDL file elkészítése</A></H3> + +<P>A jelenlegi EDL formátum így épül fel:</P> + +<CODE>[kezdõ másodperc] [vége másodperc] [cselekmény]</CODE> + +<P>A másodpercek helyére lebegõpontos számokat kell írni, a cselekmény pedig + vagy <CODE>0</CODE> az átugráshoz, vagy <CODE>1</CODE> a hang elnémításához. + Például:</P> + +<PRE> +5.3 7.1 0 +15 16.7 1 +420 422 0 +</PRE> + +<P>Ez a video 5.3-adik másodpercénél átugrik a 7.1-ikre, aztán 15 másodpercnél + kikapcsolja a hangot egészen a 16.7-ig, 420 másodpercnél pedig 2 másodpercet + ugrik. Ezek a cselekmények akkor hajtódnak végre ha a timer a megadott + idõhöz ért.</P> + +<P>Egy EDL file elkészítéséhez használd az <CODE>-edlout <filenév></CODE> + parancsot, és lejátszás közben mikor azt akarod hogy az elõzõ két + másodperc legyen átugorva, nyomd meg az <CODE>i</CODE> billentyût. Egy ennek + megfelelõ parancs íródik a megadott nevû EDL file-ba. Kilépés után + tetszõlegesen finomhangolható a file.</P> <H1><A NAME=usage>3. Használat</A></H1> Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/encoding.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- encoding.html 28 Jan 2003 17:16:23 -0000 1.45 +++ encoding.html 29 Jan 2003 13:53:40 -0000 1.46 @@ -215,7 +215,7 @@ -o kimenet.avi \*.jpg</CODE></P> <P><I>Tömörítetlen film létrehozása az aktuális könyvtárban található összes PNG fileból:</I><BR> -   <CODE>mencoder -mf on:w=800:h=600:fps=25:type=png -ovc raw -o +   <CODE>mencoder -mf on:w=800:h=600:fps=25:type=png -ovc rawrgb -o kimenet.avi \*.png</CODE></P> <P><I>MPNG (Motion PNG) film létrehozása az aktuális könyvtárban található összes PNG fileból:</I><BR> Index: formats.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/formats.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- formats.html 18 Jan 2003 16:49:43 -0000 1.31 +++ formats.html 29 Jan 2003 13:53:40 -0000 1.32 @@ -233,6 +233,35 @@ <A HREF="http://www.technotrend.de/download/av_format_v1.pdf">http://www.technotrend.de/download/av_format_v1.pdf</A></P> +<H4><A NAME=gif>2.1.1.15. GIF file-ok</A></H4> + +<P>A <B>GIF</B> egy, a weben elterjedt képformátum, melynek két verziója ismert, + a GIF87a, és a GIF89a. A legfõbb eltérés a kettõ között, hogy a GIF89a + engedélyezi az animációt is. Az MPlayer mindkét formátumot támogatja a + libungif, vagy egyéb libgif-kompatibilis könyvtár segítségével. A nem + animált GIF-ek ugyanúgy jelenítõdnek meg mint az egy képkockát tartalmazó + videók, azaz megtekintésükhöz szükség van a <CODE>-fixed-vo</CODE> és + <CODE>-loop 0</CODE> opciók megadására.</P> + +<P>Az MPlayer jelenleg nem támogatja a GIF file-okban történõ tekerést. A + GIF file-ok nem szükségszerûen fix képméretûek, hanem több, egymástól + független képbõl állnak, melyeket egy fix méretû mezõn kell elhelyezni. + A framerátát az egyes képkockák elõtti opcionális blokk vezérli, mely + megadja a késleltetést a következõ képkockáig.</P> + +<P>A szabvány GIF file-ok 24bit-es RGB képkockákból állnak melyekhez egy + maximum 8bpp-s paletta tartozik. Ezek a képkockák általában LZW + algoritmussal tömörítettek, de néhány GIF készítõ program tömörítetlen + GIF-et hoz létre, hogy elkerülje az LZW licenszével történõ ütközést.</P> + +<P>Bár a legtöbb disztribúció tartalmazza a libungif-et, ha akarok letöltheted + a következõ címrõl is: + <A HREF="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml">http://prt+r-13.ucsc.edu/~badger/software/libungif/index.shtml</A></P> + +<P>A GIF specifikáció a következõ címen lelhetõ fel: + <A HREF="http://www.w3.org/Graphics/GIF/spec-gif89a.txt">http://www.w3.org/Graphic+s/GIF/spec-gif89a.txt</A></P> + + <H3><A NAME=audio_formats>2.1.2. Audio formátumok</A></H3> <P>Az <B>MPlayer</B> egy <B>Movie</B> (film) és nem Index: sound.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/sound.html,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sound.html 28 Jan 2003 17:16:23 -0000 1.41 +++ sound.html 29 Jan 2003 13:53:40 -0000 1.42 @@ -645,7 +645,7 @@ ami 0 és 255 közötti értékeket vehet fel (az alapértelmezett érték a 101 - ez 0dB-nyi erõsítést jelent). Óvatosan használd ezt a plugint. A legtöbb esetben sokkal célravezetõbb a - hardveres mixeren a PCM csatorna maximálisra állítása, ezen plugin + hardveres mixeren a MASTER csatorna maximálisra állítása, ezen plugin kihagyása, és a hangerõ "mester" csatornával történõ állítása. Ha külsõ erõsítõ is rá van kapcsolva a hangkártyádra, a zajszint minimálisra csökkentése érdekében érdemes a "mester" csatornával és az erõsítõ

1 0