[xiph-commits] r14094 - trunk/ezstream/examples

moritz at svn.xiph.org moritz at svn.xiph.org
Sun Nov 4 05:40:58 PST 2007


Author: moritz
Date: 2007-11-04 05:40:58 -0800 (Sun, 04 Nov 2007)
New Revision: 14094

Added:
   trunk/ezstream/examples/ezstream_reencode_mp3.xml
   trunk/ezstream/examples/ezstream_reencode_theora.xml
   trunk/ezstream/examples/ezstream_reencode_vorbis.xml
   trunk/ezstream/examples/ezstream_stdin_vorbis.xml
Removed:
   trunk/ezstream/examples/ezstream_reencoding_example_mp3.xml
   trunk/ezstream/examples/ezstream_reencoding_example_theora.xml
   trunk/ezstream/examples/ezstream_reencoding_example_vorbis.xml
Modified:
   trunk/ezstream/examples/Makefile.am
Log:
 * Add new configuration example for streaming from standard input.
 * Rename reencoding examples to shorter and less redundant filenames.


Modified: trunk/ezstream/examples/Makefile.am
===================================================================
--- trunk/ezstream/examples/Makefile.am	2007-11-04 13:09:08 UTC (rev 14093)
+++ trunk/ezstream/examples/Makefile.am	2007-11-04 13:40:58 UTC (rev 14094)
@@ -1,9 +1,9 @@
 AUTOMAKE_OPTIONS = 1.9 foreign
 
 examplesdir =	@EXAMPLES_DIR@
-dist_examples_DATA = ezstream_mp3.xml ezstream_reencoding_example_mp3.xml \
-		ezstream_reencoding_example_theora.xml \
-		ezstream_reencoding_example_vorbis.xml ezstream_vorbis.xml \
+dist_examples_DATA = ezstream_mp3.xml ezstream_reencode_mp3.xml \
+		ezstream_reencode_theora.xml ezstream_reencode_vorbis.xml \
+		ezstream_stdin_vorbis.xml ezstream_vorbis.xml \
 		ezstream_metadata.xml
 dist_examples_SCRIPTS = meta.sh play.sh
 

Copied: trunk/ezstream/examples/ezstream_reencode_mp3.xml (from rev 14093, trunk/ezstream/examples/ezstream_reencoding_example_mp3.xml)
===================================================================
--- trunk/ezstream/examples/ezstream_reencode_mp3.xml	                        (rev 0)
+++ trunk/ezstream/examples/ezstream_reencode_mp3.xml	2007-11-04 13:40:58 UTC (rev 14094)
@@ -0,0 +1,87 @@
+<!--
+   EXAMPLE: MP3 stream using an external playlist program, WITH reencoding
+
+   This example streams a playlist that may contain MP3, Ogg Vorbis and FLAC
+   files. Ezstream will use external decoders to read the media files, and
+   reencode them to MP3 using the lame MP3 encoder. The output stream settings
+   are controlled via the paramters to lame.
+ -->
+<ezstream>
+    <url>http://localhost:8000/stream</url>
+    <sourcepassword>hackme</sourcepassword>
+    <!--
+       Since the reencoding feature is enabled below, <format /> sets the
+       output format of the stream.
+     -->
+    <format>MP3</format>
+    <filename>playlist.pl</filename>
+    <!--
+       Indicate that <filename> contains an executable program or script,
+       which prints a single line with a filename to standard output:
+     -->
+    <playlist_program>1</playlist_program>
+    <!--
+      The following settings are used to describe your stream to the server.
+      It's up to you to make sure that the bitrate/samplerate/channels
+      information matches up with your lame encoder settings below.
+     -->
+    <svrinfoname>My Stream</svrinfoname>
+    <svrinfourl>http://www.oddsock.org</svrinfourl>
+    <svrinfogenre>RockNRoll</svrinfogenre>
+    <svrinfodescription>This is a stream description</svrinfodescription>
+    <svrinfobitrate>128</svrinfobitrate>
+    <svrinfochannels>2</svrinfochannels>
+    <svrinfosamplerate>44100</svrinfosamplerate>
+    <!--
+      Prohibit the server to advertise the stream on a public YP directory:
+     -->
+    <svrinfopublic>0</svrinfopublic>
+    <reencode>
+        <!-- Enable the reencoding feature: -->
+        <enable>1</enable>
+        <!--
+           Each <encdec /> element specifies a pair of programs to be used for
+           decoding and encoding, respectively, and which file extension and
+           output stream format they apply to.
+
+           All the configuration of the output stream is usually done by using
+           the appropriate command line parameters of the encoders in the
+           <encode /> elements.
+
+           New <encdec /> sections can be added for new input/output formats.
+
+           Distorted audio, or audio playing at the wrong speed/pitch may be
+           caused by conflicting sample rates in the various <decode /> and
+           <encode /> sections, byte order (endianness) issues and mono input
+           files. See the documentation on the various de-/encoders for
+           the options that need to be used to create a consistent stream of
+           raw samples.
+         -->
+        <encdec>
+            <!-- Support for FLAC decoding: -->
+            <format>FLAC</format>
+            <match>.flac</match>
+            <decode>flac -s -d --force-raw-format --sign=signed --endian=little -o - "@T@"</decode>
+            <!-- <encode>Not supported Yet</encode> -->
+        </encdec>
+        <encdec>
+            <!--
+               Support for MP3 decoding via madplay, and encoding via LAME:
+             -->
+            <format>MP3</format>
+            <match>.mp3</match>
+            <!-- Note: madplay uses host byte order for raw samples. -->
+            <decode>madplay -b 16 -R 44100 -S -o raw:- "@T@"</decode>
+            <encode>lame --preset cbr 128 -r -x -s 44.1 --bitwidth 16 - -</encode>
+        </encdec>
+        <encdec>
+            <!--
+               Support for Vorbis decoding via oggdec, and encoding via oggenc:
+             -->
+            <format>VORBIS</format>
+            <match>.ogg</match>
+            <decode>oggdec -R -b 16 -e 0 -s 1 -o - "@T@"</decode>
+            <encode>oggenc -r -B 16 -C 2 -R 44100 --raw-endianness 0 -q 1.5 -t "@M@" -</encode>
+        </encdec>
+    </reencode>
+</ezstream>

Copied: trunk/ezstream/examples/ezstream_reencode_theora.xml (from rev 14093, trunk/ezstream/examples/ezstream_reencoding_example_theora.xml)
===================================================================
--- trunk/ezstream/examples/ezstream_reencode_theora.xml	                        (rev 0)
+++ trunk/ezstream/examples/ezstream_reencode_theora.xml	2007-11-04 13:40:58 UTC (rev 14094)
@@ -0,0 +1,78 @@
+<!--
+   EXAMPLE: Ogg Theora playlist stream WITH reencoding and sequential playback
+
+   This example streams a playlist that may contain .avi and MPEG files.
+   Ezstream will use the ffmpeg2theora program to both decode and reencode the
+   video files to Ogg Theora. The output stream settings are controlled via the
+   paramters to ffmpeg2theora.
+ -->
+<ezstream>
+    <url>http://localhost:8000/theora.ogg</url>
+    <sourcepassword>hackme</sourcepassword>
+    <!--
+       Since the reencoding feature is enabled below, <format /> sets the
+       output format of the stream.
+     -->
+    <format>THEORA</format>
+    <filename>playlist.m3u</filename>
+    <!--
+       Playlist shuffling is disabled, when the <shuffle /> element does not
+       exist or is commented out:
+     -->
+    <!-- <shuffle>1</shuffle> -->
+    <!--
+      The following settings are used to describe your stream to the server.
+      It's up to you to make sure that the bitrate/quality/samplerate/channels
+      information matches up with your oggenc encoder settings below.
+     -->
+    <svrinfoname>My Stream</svrinfoname>
+    <svrinfourl>http://www.oddsock.org</svrinfourl>
+    <svrinfogenre>Documentary</svrinfogenre>
+    <svrinfodescription>This is a stream description</svrinfodescription>
+    <svrinfobitrate>200</svrinfobitrate>
+    <svrinfochannels>2</svrinfochannels>
+    <svrinfosamplerate>44100</svrinfosamplerate>
+    <!--
+       A missing or commented out <svrinfopublic /> element means no
+       advertising on YP for this broadcast:
+     -->
+    <!-- <svrinfopublic>1</svrinfopublic> -->
+    <reencode>
+        <!-- Enable the reencoding feature: -->
+        <enable>1</enable>
+        <!--
+           Each <encdec /> element specifies a pair of programs to be used for
+           decoding and encoding, respectively, and which file extension and
+           output stream format they apply to.
+
+           All the configuration of the output stream is usually done by using
+           the appropriate command line parameters of the encoders in the
+           <encode /> elements.
+
+           New <encdec /> sections can be added for new input/output formats.
+
+           Distorted audio, or audio playing at the wrong speed/pitch may be
+           caused by conflicting sample rates in the various <decode /> and
+           <encode /> sections, byte order (endianness) issues and mono input
+           files. See the documentation on the various de-/encoders for
+           the options that need to be used to create a consistent stream of
+           raw samples.
+         -->
+        <encdec>
+            <!--
+               Support for THEORA. Ogg Theora streams are created differently
+               with ffmpeg2theora, which does the complete reencoding on its
+               own. Therefore, we only supply a <decode /> element and let
+               ezstream pass through the resulting stream unaltered to Icecast.
+             -->
+            <format>THEORA</format>
+            <match>.avi</match>
+            <decode>ffmpeg2theora -x 192 -y 128 -a 0 -v 4 --title "@M@" -o - "@T@"</decode>
+        </encdec>
+        <encdec>
+            <format>THEORA</format>
+            <match>.mpg</match>
+            <decode>ffmpeg2theora -x 192 -y 128 -a 0 -v 4 --title "@M@" -o - "@T@"</decode>
+        </encdec>
+    </reencode>
+</ezstream>

Copied: trunk/ezstream/examples/ezstream_reencode_vorbis.xml (from rev 14093, trunk/ezstream/examples/ezstream_reencoding_example_vorbis.xml)
===================================================================
--- trunk/ezstream/examples/ezstream_reencode_vorbis.xml	                        (rev 0)
+++ trunk/ezstream/examples/ezstream_reencode_vorbis.xml	2007-11-04 13:40:58 UTC (rev 14094)
@@ -0,0 +1,88 @@
+<!--
+   EXAMPLE: Ogg Vorbis playlist stream WITH reencoding and random playback
+
+   This example streams a playlist that may contain MP3, Ogg Vorbis and FLAC
+   files. Ezstream will use external decoders to read the media files, and
+   reencode them to Ogg Vorbis using the oggenc encoder. The output stream
+   settings are controlled via the paramters to oggenc.
+ -->
+<ezstream>
+    <url>http://localhost:8000/vorbis.ogg</url>
+    <sourcepassword>hackme</sourcepassword>
+    <!--
+       Since the reencoding feature is enabled below, <format /> sets the
+       output format of the stream.
+     -->
+    <format>VORBIS</format>
+    <filename>playlist.m3u</filename>
+    <!-- Enable playlist shuffling: -->
+    <shuffle>1</shuffle>
+    <!--
+       The file in <filename> is a regular playlist and not a program.
+       For demonstrational purposes, explicitly state this here:
+     -->
+    <playlist_program>0</playlist_program>
+    <!--
+      The following settings are used to describe your stream to the server.
+      It's up to you to make sure that the bitrate/quality/samplerate/channels
+      information matches up with your oggenc encoder settings below.
+     -->
+    <svrinfoname>My Stream</svrinfoname>
+    <svrinfourl>http://www.oddsock.org</svrinfourl>
+    <svrinfogenre>RockNRoll</svrinfogenre>
+    <svrinfodescription>This is a stream description</svrinfodescription>
+    <svrinfobitrate>88</svrinfobitrate>
+    <svrinfoquality>1.5</svrinfoquality>
+    <svrinfochannels>2</svrinfochannels>
+    <svrinfosamplerate>44100</svrinfosamplerate>
+    <!-- Allow the server to advertise the stream on a public YP directory: -->
+    <svrinfopublic>1</svrinfopublic>
+    <reencode>
+        <!-- Enable the reencoding feature: -->
+        <enable>1</enable>
+        <!--
+           Each <encdec /> element specifies a pair of programs to be used for
+           decoding and encoding, respectively, and which file extension and
+           output stream format they apply to.
+
+           All the configuration of the output stream is usually done by using
+           the appropriate command line parameters of the encoders in the
+           <encode /> elements.
+
+           New <encdec /> sections can be added for new input/output formats.
+
+           Distorted audio, or audio playing at the wrong speed/pitch may be
+           caused by conflicting sample rates in the various <decode /> and
+           <encode /> sections, byte order (endianness) issues and mono input
+           files. See the documentation on the various de-/encoders for
+           the options that need to be used to create a consistent stream of
+           raw samples.
+         -->
+        <encdec>
+            <!-- Support for FLAC decoding: -->
+            <format>FLAC</format>
+            <match>.flac</match>
+            <decode>flac -s -d --force-raw-format --sign=signed --endian=little -o - "@T@"</decode>
+            <!-- <encode>Not supported Yet</encode> -->
+        </encdec>
+        <encdec>
+            <!--
+               Support for MP3 decoding via madplay, and encoding via LAME:
+             -->
+            <format>MP3</format>
+            <match>.mp3</match>
+            <!-- Note: madplay uses host byte order for raw samples. -->
+            <decode>madplay -b 16 -R 44100 -S -o raw:- "@T@"</decode>
+            <encode>lame --preset cbr 128 -r -x -s 44.1 --bitwidth 16 - -</encode>
+        </encdec>
+        <encdec>
+            <!--
+               Support for Vorbis decoding via oggdec, and encoding via oggenc:
+             -->
+            <format>VORBIS</format>
+            <match>.ogg</match>
+            <decode>oggdec -R -b 16 -e 0 -s 1 -o - "@T@"</decode>
+            <encode>oggenc -r -B 16 -C 2 -R 44100 --raw-endianness 0 -q 1.5 -t "@M@" -</encode>
+        </encdec>
+    </reencode>
+</ezstream>

Deleted: trunk/ezstream/examples/ezstream_reencoding_example_mp3.xml
===================================================================
--- trunk/ezstream/examples/ezstream_reencoding_example_mp3.xml	2007-11-04 13:09:08 UTC (rev 14093)
+++ trunk/ezstream/examples/ezstream_reencoding_example_mp3.xml	2007-11-04 13:40:58 UTC (rev 14094)
@@ -1,87 +0,0 @@
-<!--
-   EXAMPLE: MP3 stream using an external playlist program, WITH reencoding
-
-   This example streams a playlist that may contain MP3, Ogg Vorbis and FLAC
-   files. Ezstream will use external decoders to read the media files, and
-   reencode them to MP3 using the lame MP3 encoder. The output stream settings
-   are controlled via the paramters to lame.
- -->
-<ezstream>
-    <url>http://localhost:8000/stream</url>
-    <sourcepassword>hackme</sourcepassword>
-    <!--
-       Since the reencoding feature is enabled below, <format /> sets the
-       output format of the stream.
-     -->
-    <format>MP3</format>
-    <filename>playlist.pl</filename>
-    <!--
-       Indicate that <filename> contains an executable program or script,
-       which prints a single line with a filename to standard output:
-     -->
-    <playlist_program>1</playlist_program>
-    <!--
-      The following settings are used to describe your stream to the server.
-      It's up to you to make sure that the bitrate/samplerate/channels
-      information matches up with your lame encoder settings below.
-     -->
-    <svrinfoname>My Stream</svrinfoname>
-    <svrinfourl>http://www.oddsock.org</svrinfourl>
-    <svrinfogenre>RockNRoll</svrinfogenre>
-    <svrinfodescription>This is a stream description</svrinfodescription>
-    <svrinfobitrate>128</svrinfobitrate>
-    <svrinfochannels>2</svrinfochannels>
-    <svrinfosamplerate>44100</svrinfosamplerate>
-    <!--
-      Prohibit the server to advertise the stream on a public YP directory:
-     -->
-    <svrinfopublic>0</svrinfopublic>
-    <reencode>
-        <!-- Enable the reencoding feature: -->
-        <enable>1</enable>
-        <!--
-           Each <encdec /> element specifies a pair of programs to be used for
-           decoding and encoding, respectively, and which file extension and
-           output stream format they apply to.
-
-           All the configuration of the output stream is usually done by using
-           the appropriate command line parameters of the encoders in the
-           <encode /> elements.
-
-           New <encdec /> sections can be added for new input/output formats.
-
-           Distorted audio, or audio playing at the wrong speed/pitch may be
-           caused by conflicting sample rates in the various <decode /> and
-           <encode /> sections, byte order (endianness) issues and mono input
-           files. See the documentation on the various de-/encoders for
-           the options that need to be used to create a consistent stream of
-           raw samples.
-         -->
-        <encdec>
-            <!-- Support for FLAC decoding: -->
-            <format>FLAC</format>
-            <match>.flac</match>
-            <decode>flac -s -d --force-raw-format --sign=signed --endian=little -o - "@T@"</decode>
-            <!-- <encode>Not supported Yet</encode> -->
-        </encdec>
-        <encdec>
-            <!--
-               Support for MP3 decoding via madplay, and encoding via LAME:
-             -->
-            <format>MP3</format>
-            <match>.mp3</match>
-            <!-- Note: madplay uses host byte order for raw samples. -->
-            <decode>madplay -b 16 -R 44100 -S -o raw:- "@T@"</decode>
-            <encode>lame --preset cbr 128 -r -x -s 44.1 --bitwidth 16 - -</encode>
-        </encdec>
-        <encdec>
-            <!--
-               Support for Vorbis decoding via oggdec, and encoding via oggenc:
-             -->
-            <format>VORBIS</format>
-            <match>.ogg</match>
-            <decode>oggdec -R -b 16 -e 0 -s 1 -o - "@T@"</decode>
-            <encode>oggenc -r -B 16 -C 2 -R 44100 --raw-endianness 0 -q 1.5 -t "@M@" -</encode>
-        </encdec>
-    </reencode>
-</ezstream>

Deleted: trunk/ezstream/examples/ezstream_reencoding_example_theora.xml
===================================================================
--- trunk/ezstream/examples/ezstream_reencoding_example_theora.xml	2007-11-04 13:09:08 UTC (rev 14093)
+++ trunk/ezstream/examples/ezstream_reencoding_example_theora.xml	2007-11-04 13:40:58 UTC (rev 14094)
@@ -1,78 +0,0 @@
-<!--
-   EXAMPLE: Ogg Theora playlist stream WITH reencoding and sequential playback
-
-   This example streams a playlist that may contain .avi and MPEG files.
-   Ezstream will use the ffmpeg2theora program to both decode and reencode the
-   video files to Ogg Theora. The output stream settings are controlled via the
-   paramters to ffmpeg2theora.
- -->
-<ezstream>
-    <url>http://localhost:8000/theora.ogg</url>
-    <sourcepassword>hackme</sourcepassword>
-    <!--
-       Since the reencoding feature is enabled below, <format /> sets the
-       output format of the stream.
-     -->
-    <format>THEORA</format>
-    <filename>playlist.m3u</filename>
-    <!--
-       Playlist shuffling is disabled, when the <shuffle /> element does not
-       exist or is commented out:
-     -->
-    <!-- <shuffle>1</shuffle> -->
-    <!--
-      The following settings are used to describe your stream to the server.
-      It's up to you to make sure that the bitrate/quality/samplerate/channels
-      information matches up with your oggenc encoder settings below.
-     -->
-    <svrinfoname>My Stream</svrinfoname>
-    <svrinfourl>http://www.oddsock.org</svrinfourl>
-    <svrinfogenre>Documentary</svrinfogenre>
-    <svrinfodescription>This is a stream description</svrinfodescription>
-    <svrinfobitrate>200</svrinfobitrate>
-    <svrinfochannels>2</svrinfochannels>
-    <svrinfosamplerate>44100</svrinfosamplerate>
-    <!--
-       A missing or commented out <svrinfopublic /> element means no
-       advertising on YP for this broadcast:
-     -->
-    <!-- <svrinfopublic>1</svrinfopublic> -->
-    <reencode>
-        <!-- Enable the reencoding feature: -->
-        <enable>1</enable>
-        <!--
-           Each <encdec /> element specifies a pair of programs to be used for
-           decoding and encoding, respectively, and which file extension and
-           output stream format they apply to.
-
-           All the configuration of the output stream is usually done by using
-           the appropriate command line parameters of the encoders in the
-           <encode /> elements.
-
-           New <encdec /> sections can be added for new input/output formats.
-
-           Distorted audio, or audio playing at the wrong speed/pitch may be
-           caused by conflicting sample rates in the various <decode /> and
-           <encode /> sections, byte order (endianness) issues and mono input
-           files. See the documentation on the various de-/encoders for
-           the options that need to be used to create a consistent stream of
-           raw samples.
-         -->
-        <encdec>
-            <!--
-               Support for THEORA. Ogg Theora streams are created differently
-               with ffmpeg2theora, which does the complete reencoding on its
-               own. Therefore, we only supply a <decode /> element and let
-               ezstream pass through the resulting stream unaltered to Icecast.
-             -->
-            <format>THEORA</format>
-            <match>.avi</match>
-            <decode>ffmpeg2theora -x 192 -y 128 -a 0 -v 4 --title "@M@" -o - "@T@"</decode>
-        </encdec>
-        <encdec>
-            <format>THEORA</format>
-            <match>.mpg</match>
-            <decode>ffmpeg2theora -x 192 -y 128 -a 0 -v 4 --title "@M@" -o - "@T@"</decode>
-        </encdec>
-    </reencode>
-</ezstream>

Deleted: trunk/ezstream/examples/ezstream_reencoding_example_vorbis.xml
===================================================================
--- trunk/ezstream/examples/ezstream_reencoding_example_vorbis.xml	2007-11-04 13:09:08 UTC (rev 14093)
+++ trunk/ezstream/examples/ezstream_reencoding_example_vorbis.xml	2007-11-04 13:40:58 UTC (rev 14094)
@@ -1,88 +0,0 @@
-<!--
-   EXAMPLE: Ogg Vorbis playlist stream WITH reencoding and random playback
-
-   This example streams a playlist that may contain MP3, Ogg Vorbis and FLAC
-   files. Ezstream will use external decoders to read the media files, and
-   reencode them to Ogg Vorbis using the oggenc encoder. The output stream
-   settings are controlled via the paramters to oggenc.
- -->
-<ezstream>
-    <url>http://localhost:8000/vorbis.ogg</url>
-    <sourcepassword>hackme</sourcepassword>
-    <!--
-       Since the reencoding feature is enabled below, <format /> sets the
-       output format of the stream.
-     -->
-    <format>VORBIS</format>
-    <filename>playlist.m3u</filename>
-    <!-- Enable playlist shuffling: -->
-    <shuffle>1</shuffle>
-    <!--
-       The file in <filename> is a regular playlist and not a program.
-       For demonstrational purposes, explicitly state this here:
-     -->
-    <playlist_program>0</playlist_program>
-    <!--
-      The following settings are used to describe your stream to the server.
-      It's up to you to make sure that the bitrate/quality/samplerate/channels
-      information matches up with your oggenc encoder settings below.
-     -->
-    <svrinfoname>My Stream</svrinfoname>
-    <svrinfourl>http://www.oddsock.org</svrinfourl>
-    <svrinfogenre>RockNRoll</svrinfogenre>
-    <svrinfodescription>This is a stream description</svrinfodescription>
-    <svrinfobitrate>88</svrinfobitrate>
-    <svrinfoquality>1.5</svrinfoquality>
-    <svrinfochannels>2</svrinfochannels>
-    <svrinfosamplerate>44100</svrinfosamplerate>
-    <!-- Allow the server to advertise the stream on a public YP directory: -->
-    <svrinfopublic>1</svrinfopublic>
-    <reencode>
-        <!-- Enable the reencoding feature: -->
-        <enable>1</enable>
-        <!--
-           Each <encdec /> element specifies a pair of programs to be used for
-           decoding and encoding, respectively, and which file extension and
-           output stream format they apply to.
-
-           All the configuration of the output stream is usually done by using
-           the appropriate command line parameters of the encoders in the
-           <encode /> elements.
-
-           New <encdec /> sections can be added for new input/output formats.
-
-           Distorted audio, or audio playing at the wrong speed/pitch may be
-           caused by conflicting sample rates in the various <decode /> and
-           <encode /> sections, byte order (endianness) issues and mono input
-           files. See the documentation on the various de-/encoders for
-           the options that need to be used to create a consistent stream of
-           raw samples.
-         -->
-        <encdec>
-            <!-- Support for FLAC decoding: -->
-            <format>FLAC</format>
-            <match>.flac</match>
-            <decode>flac -s -d --force-raw-format --sign=signed --endian=little -o - "@T@"</decode>
-            <!-- <encode>Not supported Yet</encode> -->
-        </encdec>
-        <encdec>
-            <!--
-               Support for MP3 decoding via madplay, and encoding via LAME:
-             -->
-            <format>MP3</format>
-            <match>.mp3</match>
-            <!-- Note: madplay uses host byte order for raw samples. -->
-            <decode>madplay -b 16 -R 44100 -S -o raw:- "@T@"</decode>
-            <encode>lame --preset cbr 128 -r -x -s 44.1 --bitwidth 16 - -</encode>
-        </encdec>
-        <encdec>
-            <!--
-               Support for Vorbis decoding via oggdec, and encoding via oggenc:
-             -->
-            <format>VORBIS</format>
-            <match>.ogg</match>
-            <decode>oggdec -R -b 16 -e 0 -s 1 -o - "@T@"</decode>
-            <encode>oggenc -r -B 16 -C 2 -R 44100 --raw-endianness 0 -q 1.5 -t "@M@" -</encode>
-        </encdec>
-    </reencode>
-</ezstream>

Added: trunk/ezstream/examples/ezstream_stdin_vorbis.xml
===================================================================
--- trunk/ezstream/examples/ezstream_stdin_vorbis.xml	                        (rev 0)
+++ trunk/ezstream/examples/ezstream_stdin_vorbis.xml	2007-11-04 13:40:58 UTC (rev 14094)
@@ -0,0 +1,36 @@
+<!--
+   EXAMPLE: Ogg Vorbis stream from standard input WITHOUT reencoding
+
+   This example streams an Ogg Vorbis stream from standard input (stdin.)
+   Since ezstream will not be doing any reencoding, the resulting stream
+   format (quality/bitrate, samplerate, channels) will be of the respective
+   input stream.
+ -->
+<ezstream>
+    <url>http://localhost:8000/vorbis.ogg</url>
+    <sourcepassword>hackme</sourcepassword>
+    <format>VORBIS</format>
+    <filename>stdin</filename>
+    <!--
+      Important:
+      For streaming from standard input, the default for continuous streaming
+      is bad. Set <stream_once /> to 1 here to prevent ezstream from spinning
+      endlessly when the input stream stops:
+     -->
+    <stream_once>1</stream_once>
+    <!--
+      The following settings are used to describe your stream to the server.
+      It's up to you to make sure that the bitrate/quality/samplerate/channels
+      information matches up with your input stream files.
+     -->
+    <svrinfoname>My Stream</svrinfoname>
+    <svrinfourl>http://www.oddsock.org</svrinfourl>
+    <svrinfogenre>RockNRoll</svrinfogenre>
+    <svrinfodescription>This is a stream description</svrinfodescription>
+    <svrinfobitrate>96</svrinfobitrate>
+    <svrinfoquality>2.0</svrinfoquality>
+    <svrinfochannels>2</svrinfochannels>
+    <svrinfosamplerate>44100</svrinfosamplerate>
+    <!-- Allow the server to advertise the stream on a public YP directory: -->
+    <svrinfopublic>1</svrinfopublic>
+</ezstream>



More information about the commits mailing list