[Mplayer-cvslog] CVS: main/DOCS codecs.html,1.47,1.48 documentation.html,1.181,1.182 formats.html,1.10,1.11 mencoder.1,1.23,1.24 video.html,1.57,1.58

Winner of tha face compo gabucino at mplayer.dev.hu
Thu Jan 24 18:14:11 CET 2002


Update of /cvsroot/mplayer/main/DOCS
In directory mplayer:/var/tmp.root/cvs-serv24001

Modified Files:
	codecs.html documentation.html formats.html mencoder.1 
	video.html 
Log Message:
entudjam?


Index: codecs.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/codecs.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- codecs.html	16 Jan 2002 17:12:59 -0000	1.47
+++ codecs.html	24 Jan 2002 17:14:08 -0000	1.48
@@ -268,9 +268,10 @@
 <P><B><A NAME=2.2.2.2>2.2.2.2.  Hardware AC3 decoding</A></B></P>
 
 <P>You'll need an AC3 capable soundcard, with digital out (SP/DIF). The
-card's driver must support the AFMT_AC3 format (like SB Live! does).
+card's driver must support the AFMT_AC3 format (like SB Live! or C-Media does).
 Connect your AC3 decoder to the SP/DIF output, and use the '-ac hwac3'
-option. It may or may not work (experimental). (probably won't...)</P>
+option. It may or may not work (experimental). (probably will only work
+with C-Media cards currently, feel free to fix it with SB Live)</P>
 
 
 <P><B><A NAME=2.2.2.3>2.2.2.3.  libmad support</A></B></P>

Index: documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- documentation.html	16 Jan 2002 17:12:19 -0000	1.181
+++ documentation.html	24 Jan 2002 17:14:08 -0000	1.182
@@ -44,6 +44,7 @@
         <LI><A HREF="formats.html#2.1.1.7">2.1.1.7 RealMedia files</A></LI>
         <LI><A HREF="formats.html#2.1.1.8">2.1.1.8 NuppelVideo files</A></LI>
         <LI><A HREF="formats.html#2.1.1.9">2.1.1.9 yuv4mpeg files</A></LI>
+        <LI><A HREF="formats.html#2.1.1.10">2.1.1.10 FILM files</A></LI>
       </UL>
       <LI><A HREF="formats.html#2.1.2">2.1.2 Audio</A></LI>
     </UL>
@@ -114,6 +115,7 @@
 	<LI><A HREF="video.html#2.3.1.13">2.3.1.13 X11</A></LI>
 	<LI><A HREF="video.html#2.3.1.14">2.3.1.14 Rage128 / Radeon video overlay</A></LI>
 	<LI><A HREF="video.html#2.3.1.15">2.3.1.15 Vidix</A></LI>
+	<LI><A HREF="video.html#2.3.1.16">2.3.1.16 Zr (for some MJPEG capture/playback boards)</A></LI>
 	<LI><A HREF="video.html#2.3.1.A">2.3.1.A TVout</A></LI>
 	<UL>
 	  <LI><A HREF="video.html#2.3.1.A.1">2.3.1.A.1 Matrox</A></LI>
@@ -238,7 +240,7 @@
 
 <P><B>MPlayer</B> is a movie player for LINUX (runs on many other Unices, and
 <B>non-x86</B> CPUs, see <A HREF="#6">section 6</A>). It plays most MPEG, VOB,
-AVI, VIVO, ASF/WMV, QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg files, supported by many native, XAnim, and
+AVI, VIVO, ASF/WMV, QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM files, supported by many native, XAnim, and
 Win32 DLL codecs. You can watch <B>VideoCD</B>, <B>SVCD</B>, <B>DVD</B>,
 <B>3ivx</B>, and even <B>DivX</B> movies too (and you don't need the avifile
 library at all!). The another big feature of mplayer is the wide range of
@@ -498,6 +500,10 @@
 channels AC3 decoding instead of 2. Read the
 <A HREF="codecs.html#2.2.2.1">Software AC3 decoding</A> section.</LI>
 
+<LI><B>C-Media with SP/DIF out</B> : hardware AC3 passthrough is possible
+  with these cards, see
+  <A HREF="codecs.html#2.2.2.2">Hardware AC3 decoding</A> section.</LI>
+
 <LI><B>other cards'</B> features aren't supported by <B>MPlayer</B>.
   <U>It's very recommended to read the <A HREF="sound.html#2.3.2">soundcards
   section</A> !</U>
@@ -1465,6 +1471,11 @@
   <LI>surround sound</LI>
 </UL></LI>
 
+<LI><B><A HREF="mailto:rsnel at cube.dyndns.org">Rik Snel</A></B>
+<UL>
+  <LI><CODE>zr</CODE> video output driver</LI>
+</UL></LI>
+
 </UL></P>
 
 <P>Main testers:</P>
@@ -1612,6 +1623,7 @@
   <LI><B>vo_x11.c</B> - Pontscho
   <LI><B>vo_xmga.c</B> - Pontscho
   <LI><B>vo_xv.c</B> - Pontscho
+  <LI><B>vo_zr.c</B> - <A HREF="mailto:rsnel at cube.dyndns.org">Rik Snel</A>
 </UL></P>
 <P>libao2 drivers:
 <UL>

Index: formats.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/formats.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- formats.html	15 Jan 2002 17:04:00 -0000	1.10
+++ formats.html	24 Jan 2002 17:14:08 -0000	1.11
@@ -20,6 +20,7 @@
 <LI> <A HREF="#2.1.1.7">RealMedia</A> format (.rm files)
 <LI> <A HREF="#2.1.1.8">NuppelVideo</A> format (.nuv files)
 <LI> <A HREF="#2.1.1.9">yuv4mpeg</A> format
+<LI> <A HREF="#2.1.1.10">FILM</A> format
 <LI> supports <A HREF="documentation.html#3.3">reading from stdin</A>, or network via HTTP
 </UL></P>
 
@@ -191,6 +192,11 @@
 <P><A HREF="http://mjpeg.sourceforge.net">yuv4mpeg / yuv4mpeg2</A> is
 also a fileformat for TV grabbing, or so :) I know only one thing about it:
 we support it.</P>
+
+
+<P><B><A NAME=2.1.1.10>2.1.1.10. FILM files</A></B></P>
+
+<P>This format is used on old Sega Saturn CD-ROM games.</P>
 
 
 <P><B><A NAME=2.1.2>2.1.2. Audio formats</A></B></P>

Index: mencoder.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/mencoder.1,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mencoder.1	2 Jan 2002 19:07:40 -0000	1.23
+++ mencoder.1	24 Jan 2002 17:14:08 -0000	1.24
@@ -174,6 +174,7 @@
   keyint=XXX     interval between keyframes
                  (specify in frames)
   vhq            very high quality
+  vme=XXX        motion estimation method
 .TP
 .B \-lameopts
 If encoding to MP3 with libmp3lame, you can specify its parameters here, like:
@@ -230,7 +231,7 @@
 .B \-y <rescale height>
 Rescale output movie to given pixels tall.
 .TP
-.B \-sws (0-2>
+.B \-sws <0-2>
 Type of scaling method
 
     0            fast bilinear (default)

Index: video.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/video.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- video.html	17 Jan 2002 20:51:51 -0000	1.57
+++ video.html	24 Jan 2002 17:14:08 -0000	1.58
@@ -85,6 +85,10 @@
   size=2><A HREF=#2.3.1.9>tdfxfb</A></TD><TD></TD><TD><FONT face="Verdana, Arial,
   Helvetica, sans-serif" size=2>Voodoo3/Banshee hardware YUV support on tdfx
   framebuffer (works!)</TD><TR>
+<TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif"
+  size=2><A HREF=#2.3.1.16>zr</A></TD><TD></TD><TD><FONT face="Verdana, Arial,
+  Helvetica, sans-serif" size=2>Displaying on some hardware MJPEG capture/playback
+  boards (DC10, DC10+, LML33)</TD><TR>
 
 <TD COLSPAN=4><P><B><FONT face="Verdana, Arial, Helvetica, sans-serif"
   size=2>Special:</B></P></TD><TR>
@@ -890,6 +894,7 @@
 to improve something then simply send me your patches.
 </P>
 
+
 <P><B><A NAME=2.3.1.15>2.3.1.15. VIDIX</A></B></P>
 
 <P><B><I>WHAT IS VIDIX</I></B></P>
@@ -976,7 +981,9 @@
   <BR>
   But it's dangerous, and you shouldn't do that. In this case given driver will
   be forced and result is unpredictable (it may <b>freeze</b> your
-  computer). The Right Way is to use VIDIX without arguments to enable driver
+  computer). You should do that ONLY if you are absolutely sure it will work,
+  and <B>MPlayer</B> doesn't do it automatically. Please tell about it to the
+  developers. The Right Way is to use VIDIX without arguments to enable driver
   autodetection.
 </P>
 
@@ -990,6 +997,33 @@
 <P>And the last <b>WARNING</b>: (un)fortunately you <b>MUST</b> have
   <b>ROOT</b> privileges to use VIDIX due to direct hardware access. At least
   set the <b>suid</b> bit on the <B>MPlayer</B> excecutable.
+</P>
+
+
+<P><B><A NAME=2.3.1.16>2.3.1.16. Zr</A></B></P>
+
+<P>This is a display-driver (<CODE>-vo zr</CODE>) for a number of MJPEG
+capture/playback cards (tested for DC10+ and buz, and it should work for the
+LML33, the DC10). The driver works by encoding the frame to jpeg and then
+sending it to the card. For the jpeg encoding <B>libavcodec</B> is
+used, and required.</P>
+
+<P>This driver talks to the kernel driver available at
+<A HREF="http://mjpeg.sourceforge.net">http://mjpeg.sourceforge.net</A>, so
+you must get it working first. Then recompile <B>MPlayer</B> with
+<CODE>--enable-zr</CODE>.</P>
+
+<P>Some remarks:
+<UL>
+  <LI>don't use xawtv on the same device <B>MPlayer</B> uses, it will crash
+    your computer.</LI>
+  <LI>this driver adds <CODE>-zr*</CODE> commandline options. The explanation
+    of these options can be viewed with <CODE>-zrhelp</CODE>. It is possible to
+    crop the input frame (cut borders to make it fit or to enhance performace)
+    and to do other things.</LI>
+  <LI>the driver only takes data in YV12 format (libmpeg2, libavcodec for
+    example).</LI>
+</UL>
 </P>
 
 




More information about the MPlayer-cvslog mailing list