Commit 22a5dc03 authored by Alexis de Lattre's avatar Alexis de Lattre

New convention : MPEG-1, MPEG-2, MPEG-4 and not MPEG 1, MPEG 2, MPEG 4

Added RTP output for VLC stream output in the features page
parent 0713fa6e
...@@ -23,14 +23,15 @@ The VideoLAN solution includes : ...@@ -23,14 +23,15 @@ The VideoLAN solution includes :
<itemizedlist> <itemizedlist>
<listitem><para>the VideoLAN Server (VLS), which can stream MPEG 1 and 2 <listitem><para>the VideoLAN Server (VLS), which can stream MPEG-1 and
files, DVDs, digital satellite channels, digital terrestial television MPEG-2 files, DVDs, digital satellite channels, digital terrestial
channels and live videos on the network in unicast or multicast,</para> television channels and live videos on the network in unicast or
multicast,</para>
<listitem><para>the VideoLAN Client (VLC), which can be used as a server <listitem><para>the VideoLAN Client (VLC), which can be used as a server
to stream MPEG 1, 2 and 4 files and DVDs on the network in unicast or to stream MPEG-1, MPEG-2 and MPEG-4 files and DVDs on the network in
multicast ; or used as a client to receive, decode and display MPEG streams unicast or multicast ; or used as a client to receive, decode and
under multiple operating systems.</para> display MPEG streams under multiple operating systems.</para>
</itemizedlist> </itemizedlist>
...@@ -68,14 +69,14 @@ OS X, BeOS, *BSD, Solaris, Familiar Linux and QNX. It can read : ...@@ -68,14 +69,14 @@ OS X, BeOS, *BSD, Solaris, Familiar Linux and QNX. It can read :
<itemizedlist> <itemizedlist>
<listitem><para>MPEG 1, MPEG 2 and MPEG 4 / DivX files from a hard disk <listitem><para>MPEG-1, MPEG-2 and MPEG-4 / DivX files from a hard disk
or a CD-ROM drive,</para> or a CD-ROM drive,</para>
<listitem><para>DVDs and VCDs,</para> <listitem><para>DVDs and VCDs,</para>
<listitem><para>from a satellite card,</para> <listitem><para>from a satellite card,</para>
<listitem><para>MPEG 1, MPEG 2 and MPEG 4 streams from the <listitem><para>MPEG-1, MPEG-2 and MPEG-4 streams from the
network sent by VLS or VLC's stream output.</para> network sent by VLS or VLC's stream output.</para>
</itemizedlist> </itemizedlist>
...@@ -84,7 +85,7 @@ network sent by VLS or VLC's stream output.</para> ...@@ -84,7 +85,7 @@ network sent by VLS or VLC's stream output.</para>
<itemizedlist> <itemizedlist>
<listitem><para>MPEG 1, MPEG 2 and MPEG 4 / DivX files,</para> <listitem><para>MPEG-1, MPEG-2 and MPEG-4 / DivX files,</para>
<listitem><para>and DVDs,</para> <listitem><para>and DVDs,</para>
...@@ -116,13 +117,14 @@ The VideoLAN Server (VLS) can stream : ...@@ -116,13 +117,14 @@ The VideoLAN Server (VLS) can stream :
<itemizedlist> <itemizedlist>
<listitem><para>an MPEG 1 or MPEG 2 file stored on a hard drive or on a <listitem><para>an MPEG-1 or MPEG-2 file stored on a hard drive or on a
CD,</para> CD,</para>
<listitem><para>a DVD located in a local DVD drive or copied on a hard <listitem><para>a DVD located in a local DVD drive or copied on a hard
disk,</para> disk,</para>
<listitem><para>a satellite card or a digital terrestial television card,</para> <listitem><para>a satellite card or a digital terrestial television
card,</para>
<listitem><para>an MPEG encoding card ;</para> <listitem><para>an MPEG encoding card ;</para>
......
...@@ -72,9 +72,9 @@ Back-Cover Texts. The text of the license can be found in the appendix ...@@ -72,9 +72,9 @@ Back-Cover Texts. The text of the license can be found in the appendix
<keyword>vlcs</keyword> <keyword>vlcs</keyword>
<keyword>stream</keyword> <keyword>stream</keyword>
<keyword>multicast</keyword> <keyword>multicast</keyword>
<keyword>MPEG 1</keyword> <keyword>MPEG-1</keyword>
<keyword>MPEG 2</keyword> <keyword>MPEG-2</keyword>
<keyword>MPEG 4</keyword> <keyword>MPEG-4</keyword>
<keyword>DVD</keyword> <keyword>DVD</keyword>
<keyword>DivX</keyword> <keyword>DivX</keyword>
</keywordset> </keywordset>
......
<chapter id="vlc-streamoutput"><title id="tvlc-streamoutput">Stream with VLC</title> <chapter id="vlc-streamoutput"><title id="tvlc-streamoutput">Stream with VLC</title>
<sect1><title>Unicast an MPEG 1, 2, or 4 file</title> <sect1><title>Unicast an MPEG-1, MPEG-2, or MPEG-4 file</title>
<simplesect><title>Start VLC on the server</title> <simplesect><title>Start VLC on the server</title>
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
output</emphasis> in the menu, check <emphasis>UDP</emphasis> and type output</emphasis> in the menu, check <emphasis>UDP</emphasis> and type
the IP address or the DNS name of the machine you want to stream to in the the IP address or the DNS name of the machine you want to stream to in the
<emphasis>Address</emphasis> box and click on <emphasis>OK</emphasis>. <emphasis>Address</emphasis> box and click on <emphasis>OK</emphasis>.
Then click on <emphasis>File</emphasis> and select the MPEG 1, MPEG 2, Then click on <emphasis>File</emphasis> and select the MPEG-1, MPEG-2,
MPEG 4 or DivX file you want to stream.</para> MPEG-4 or DivX file you want to stream.</para>
<listitem><para>under Linux/Unix : start VLC, click on <listitem><para>under Linux/Unix : start VLC, click on
<emphasis>File</emphasis>, then click on the <emphasis>Browse</emphasis> <emphasis>File</emphasis>, then click on the <emphasis>Browse</emphasis>
button and select the MPEG 1, MPEG 2, MPEG 4 or DivX file you want to button and select the MPEG-1, MPEG-2, MPEG-4 or DivX file you want to
stream. Then check <emphasis>Stream output</emphasis> and click on stream. Then check <emphasis>Stream output</emphasis> and click on
<emphasis>Settings</emphasis>. Check <emphasis>UDP</emphasis> and type <emphasis>Settings</emphasis>. Check <emphasis>UDP</emphasis> and type
the IP address or the DNS name of the machine you want to stream to in the the IP address or the DNS name of the machine you want to stream to in the
......
...@@ -18,7 +18,7 @@ Start VLC : under Windows, Mac OS X or BeOS, double-clic on the icone and under ...@@ -18,7 +18,7 @@ Start VLC : under Windows, Mac OS X or BeOS, double-clic on the icone and under
<para> <para>
To read an MPEG 1 MPEG 2 or MPEG 4 / DivX file stored on a hard drive To read an MPEG-1 MPEG-2 or MPEG-4 / DivX file stored on a hard drive
or a CD-ROM, click on the <emphasis>File</emphasis> icon or select in the or a CD-ROM, click on the <emphasis>File</emphasis> icon or select in the
menu <emphasis>File / Open file</emphasis> and select the file you want menu <emphasis>File / Open file</emphasis> and select the file you want
to play. to play.
......
...@@ -29,7 +29,7 @@ seek in a file downloaded, that's what we use to seek in the video. ...@@ -29,7 +29,7 @@ seek in a file downloaded, that's what we use to seek in the video.
you can use a Linux server running Apache. Other operating systems you can use a Linux server running Apache. Other operating systems
and other Web servers should work too, but we have never tested.</para> and other Web servers should work too, but we have never tested.</para>
<para>Make your MPEG 1, MPEG 2 or MPEG 4 / DivX files available to the <para>Make your MPEG-1, MPEG-2 or MPEG-4 / DivX files available to the
clients on the Web server. </para> clients on the Web server. </para>
<para> <para>
......
...@@ -74,9 +74,9 @@ Texts. The text of the license can be found in the appendix ...@@ -74,9 +74,9 @@ Texts. The text of the license can be found in the appendix
<keyword>vlcs</keyword> <keyword>vlcs</keyword>
<keyword>stream</keyword> <keyword>stream</keyword>
<keyword>multicast</keyword> <keyword>multicast</keyword>
<keyword>MPEG 1</keyword> <keyword>MPEG-1</keyword>
<keyword>MPEG 2</keyword> <keyword>MPEG-2</keyword>
<keyword>MPEG 4</keyword> <keyword>MPEG-4</keyword>
<keyword>DVD</keyword> <keyword>DVD</keyword>
<keyword>DivX</keyword> <keyword>DivX</keyword>
</keywordset> </keywordset>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<tr> <tr>
<td class="category" rowspan="10"><b>Stream Output</b></td> <td class="category" rowspan="13"><b>Stream Output</b></td>
<td class="type">File</td> <td class="type">File</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<tr> <tr>
<td class="type">Unicast</td> <td class="type">Unicast UDP / RTP</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<tr> <tr>
<td class="type">Multicast</td> <td class="type">Multicast UDP / RTP</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<tr> <tr>
<td class="type">MPEG 1 / 2 / 4 video</td> <td class="type">MPEG-1 video</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
...@@ -101,7 +101,43 @@ ...@@ -101,7 +101,43 @@
<tr> <tr>
<td class="type">MPEG audio</td> <td class="type">MPEG-2 video</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
<tr>
<td class="type">MPEG-4 video</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
<tr>
<td class="type">MPEG Layer 1, 2 and 3 audio</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
<tr>
<td class="type">MPEG-4 audio</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
...@@ -169,13 +205,23 @@ ...@@ -169,13 +205,23 @@
<tr> <tr>
<td class="category" rowspan="6"><b>Inputs</b></td> <td class="category" rowspan="7"><b>Inputs</b></td>
<td class="type">File</td> <td class="type">MPEG-1 File</td>
<td class="yes">MPEG 1 and 2</td> <td class="yes">Yes</td>
<td class="yes">MPEG 1 and 2</td> <td class="yes">Yes</td>
</tr> </tr>
<tr>
<td class="type">MPEG-2 File</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
<tr> <tr>
<td class="type">DVD</td> <td class="type">DVD</td>
...@@ -186,24 +232,24 @@ ...@@ -186,24 +232,24 @@
<tr> <tr>
<td class="type">DVB-S</td> <td class="type">DVB-S (Hauppauge Nova / Nexus)</td>
<td class="yes">Hauppauge Nova / Nexus</td> <td class="yes">Yes</td>
<td class="no">No</td> <td class="no">No</td>
</tr> </tr>
<tr> <tr>
<td class="type">DVB-T</td> <td class="type">DVB-T (Hauppauge Nova-t)</td>
<td class="yes">Hauppauge card</td> <td class="yes">Yes</td>
<td class="no">No</td> <td class="no">No</td>
</tr> </tr>
<tr> <tr>
<td class="type">MPEG encoding card</td> <td class="type">MPEG encoding card (Kfir)</td>
<td class="yes">Kfir</td> <td class="yes">Yes</td>
<td class="no">No</td> <td class="no">No</td>
</tr> </tr>
...@@ -219,25 +265,25 @@ ...@@ -219,25 +265,25 @@
<tr> <tr>
<td class="category" rowspan="3"><b>Output</b></td> <td class="category" rowspan="3"><b>Output</b></td>
<td class="type">Unicast</td> <td class="type">Unicast UDP / RTP</td>
<td class="yes">UDP / RTP</td> <td class="yes">Yes</td>
<td class="yes">UDP / RTP</td> <td class="yes">Yes</td>
</tr> </tr>
<tr> <tr>
<td class="type">Multicast</td> <td class="type">Multicast UDP / RTP</td>
<td class="yes">UDP / RTP</td> <td class="yes">Yes</td>
<td class="yes">UDP / RTP</td> <td class="yes">Yes</td>
</tr> </tr>
<tr> <tr>
<td class="type">File</td> <td class="type">MPEG TS file</td>
<td class="yes">MPEG TS</td> <td class="yes">Yes</td>
<td class="yes">MPEG TS</td> <td class="yes">Yes</td>
</tr> </tr>
...@@ -278,4 +324,4 @@ ...@@ -278,4 +324,4 @@
</table> </table>
<? footer('$Id: features.html,v 1.13 2003/02/03 22:26:31 marcari Exp $'); ?> <? footer('$Id: features.html,v 1.14 2003/02/16 13:55:14 alexis Exp $'); ?>
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
<ul> <ul>
<li>the VideoLAN Server (VLS), which can stream MPEG 1 and 2 files, <li>the VideoLAN Server (VLS), which can stream MPEG-1 and MPEG-2 files,
DVDs, digital satellite channels, digital terrestial television DVDs, digital satellite channels, digital terrestial television
channels and live videos on the network in unicast or multicast,</li> channels and live videos on the network in unicast or multicast,</li>
<li>the VideoLAN Client (VLC), which can be used as a server <li>the VideoLAN Client (VLC), which can be used as a server to stream
to stream MPEG 1, 2 and 4 files and DVDs on the network in unicast or MPEG-1, MPEG-2 and MPEG-4 / DivX files and DVDs on the network in
multicast ; or used as a client to receive, decode and display MPEG streams unicast or multicast ; or used as a client to receive, decode and
under multiple operating systems.</li> display MPEG streams under multiple operating systems.</li>
</ul> </ul>
...@@ -56,8 +56,8 @@ The bandwidth needed is:</p> ...@@ -56,8 +56,8 @@ The bandwidth needed is:</p>
<li>6 to 9 Mbit/s for a DVD,</li> <li>6 to 9 Mbit/s for a DVD,</li>
<li>3 to 4 Mbit/s for an MPEG 2 stream read from a satellite card, a <li>3 to 4 Mbit/s for an MPEG-2 stream read from a satellite card, a
digital terrestial television card or an MPEG 2 encoding card.</li> digital terrestial television card or an MPEG-2 encoding card.</li>
</ul> </ul>
...@@ -120,4 +120,4 @@ href="download.html">download page</a>.</p> ...@@ -120,4 +120,4 @@ href="download.html">download page</a>.</p>
</table> </table>
<? footer('$Id: index.html,v 1.23 2003/02/03 16:58:02 alexis Exp $'); ?> <? footer('$Id: index.html,v 1.24 2003/02/16 13:55:14 alexis Exp $'); ?>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<tr> <tr>
<td class="category" rowspan="9"><b>File/stream formats</b></td> <td class="category" rowspan="9"><b>File/stream formats</b></td>
<td class="type">Mpeg ES/PS/TS/mp3</td> <td class="type">MPEG ES/PS/TS/mp3</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<tr> <tr>
<td class="category" rowspan="12"><b>Video Codecs</b></td> <td class="category" rowspan="12"><b>Video Codecs</b></td>
<td class="type">MPEG 1</td> <td class="type">MPEG-1</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</tr> </tr>
<tr> <tr>
<td class="type">MPEG 2</td> <td class="type">MPEG-2</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
<td class="yes">Yes</td> <td class="yes">Yes</td>
...@@ -951,4 +951,4 @@ processors, and AltiVec on G4 processors. ...@@ -951,4 +951,4 @@ processors, and AltiVec on G4 processors.
[4] the OpenBSD 2.9 default assembler does not support MMX. [4] the OpenBSD 2.9 default assembler does not support MMX.
</p> </p>
<? footer('$Id: features.html,v 1.39 2003/02/12 23:18:16 jpsaman Exp $'); ?> <? footer('$Id: features.html,v 1.40 2003/02/16 13:55:14 alexis Exp $'); ?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment