[xiph-commits] r12531 - trunk/ezstream/conf
moritz at svn.xiph.org
moritz at svn.xiph.org
Sat Feb 24 13:12:58 PST 2007
Author: moritz
Date: 2007-02-24 13:12:54 -0800 (Sat, 24 Feb 2007)
New Revision: 12531
Modified:
trunk/ezstream/conf/Makefile.am
trunk/ezstream/conf/ezstream_mp3.xml
trunk/ezstream/conf/ezstream_reencoding_example_mp3.xml
trunk/ezstream/conf/ezstream_reencoding_example_theora.xml
trunk/ezstream/conf/ezstream_reencoding_example_vorbis.xml
trunk/ezstream/conf/ezstream_vorbis.xml
Log:
Clean up and install example configuration files.
Modified: trunk/ezstream/conf/Makefile.am
===================================================================
--- trunk/ezstream/conf/Makefile.am 2007-02-24 21:11:49 UTC (rev 12530)
+++ trunk/ezstream/conf/Makefile.am 2007-02-24 21:12:54 UTC (rev 12531)
@@ -2,4 +2,9 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = ezstream_mp3.xml ezstream_reencoding_example_mp3.xml ezstream_reencoding_example_theora.xml ezstream_reencoding_example_vorbis.xml ezstream_vorbis.xml
+CLEANFILES = core *.core *~ .*~
+
+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
Modified: trunk/ezstream/conf/ezstream_mp3.xml
===================================================================
--- trunk/ezstream/conf/ezstream_mp3.xml 2007-02-24 21:11:49 UTC (rev 12530)
+++ trunk/ezstream/conf/ezstream_mp3.xml 2007-02-24 21:12:54 UTC (rev 12531)
@@ -1,24 +1,31 @@
-<!-- This example is for a input playlist that must contain
- all MP3 files. ezstream will perform NO reencoding, and
- the destination stream bitrate, channels, etc. will be those
- of the input files -->
+<!--
+ EXAMPLE: MP3 playlist stream WITHOUT reencoding
+
+ This example streams a playlist that contains only MP3 files. No other file
+ formats may be listed. Since ezstream will not be doing any reencoding, the
+ resulting stream format (bitrate, samplerate, channels) will be of the
+ respective input files.
+ -->
<ezstream>
<url>http://localhost:8000/stream</url>
<sourcepassword>hackme</sourcepassword>
<format>MP3</format>
<filename>playlist.m3u</filename>
- <!-- The following settings are used to describe your stream
- to the server. It's up to you to make sure the
- bitrate/quality/samplerate/channels
- match up to your input stream -->
- <svrinfoname>My Stream</svrinfoname>
- <svrinfourl>http://www.oddsock.org</svrinfourl>
+ <!--
+ 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 input stream files. Note that
+ <svrinfoquality /> only applies to Ogg Vorbis streams.
+ -->
+ <svrinfoname>My Stream</svrinfoname>
+ <svrinfourl>http://www.oddsock.org</svrinfourl>
<svrinfogenre>RockNRoll</svrinfogenre>
<svrinfodescription>This is a stream description</svrinfodescription>
- <svrinfobitrate>128</svrinfobitrate>
- <!-- Quality is only applicable to ogg vorbis streams -->
- <!-- <svrinfoquality>1.0</svrinfoquality> -->
+ <svrinfobitrate>128</svrinfobitrate>
<svrinfochannels>2</svrinfochannels>
<svrinfosamplerate>44100</svrinfosamplerate>
- <svrinfopublic>1</svrinfopublic>
+ <!--
+ Prohibit the server to advertise the stream on a public YP directory:
+ -->
+ <svrinfopublic>0</svrinfopublic>
</ezstream>
Modified: trunk/ezstream/conf/ezstream_reencoding_example_mp3.xml
===================================================================
--- trunk/ezstream/conf/ezstream_reencoding_example_mp3.xml 2007-02-24 21:11:49 UTC (rev 12530)
+++ trunk/ezstream/conf/ezstream_reencoding_example_mp3.xml 2007-02-24 21:12:54 UTC (rev 12531)
@@ -1,79 +1,79 @@
-<!-- This example is for a input playlist that can contain
- FLAC, MP3, and OggVorbis files and a output stream that
- is MP3. The output stream settings (bitrate, channels, etc.)
- are controlled by the parameters to lame. (see the encode setting
- for the MP3 format later in this file). -->
+<!--
+ EXAMPLE: MP3 playlist stream WITH reencoding and sequential 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 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>
- <!-- This is what form your output will take. If you are
- reencoding, this is the format to reencode to, if not
- then you need to make sure all your input files are in this
- format. -->
+ <!--
+ Since the reencoding feature is enabled below, <format /> sets the
+ output format of the stream.
+ -->
<format>MP3</format>
- <filename>tracks.m3u</filename>
- <!-- The following settings are used to describe your stream
- to the server. It's up to you to make sure the
- bitrate/quality/samplerate/channels
- match up to your output stream -->
- <svrinfoname>My Stream</svrinfoname>
- <svrinfourl>http://www.oddsock.org</svrinfourl>
+ <filename>playlist.m3u</filename>
+ <!--
+ Explicitly disable playlist shuffling. Sequential playback is also the
+ default.
+ -->
+ <shuffle>0</shuffle>
+ <!--
+ 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>
- <!-- Quality is only applicable to ogg vorbis streams -->
- <!-- <svrinfoquality>1.0</svrinfoquality> -->
- <svrinfochannels>2</svrinfochannels>
- <svrinfosamplerate>44100</svrinfosamplerate>
- <svrinfopublic>1</svrinfopublic>
+ <svrinfobitrate>56</svrinfobitrate>
+ <svrinfochannels>1</svrinfochannels>
+ <svrinfosamplerate>220500</svrinfosamplerate>
+ <!--
+ Prohibit the server to advertise the stream on a public YP directory:
+ -->
+ <svrinfopublic>0</svrinfopublic>
<reencode>
- <enable>1</enable>
- <!-- Each encdec block specifies a pair of programs used for decoding and
- encoding of the stream. If reencoding is enabled, then all input files
- must be first decoded before being sent to the encoder. EZSTREAM uses
- file extensions to match up input files with the appropraite decoder,
- and uses the <format> setting to match up the output format with the
- appropriate encoder.
-
- Note: It it up to you to set the appropriate bitrate/samplerate/channels
- of the output stream by using command line paramters to the encoders. Use
- the examples defined here as a guide. All output from decoders should be in
- RAW format, and all input to the encoders should also be in RAW format. -->
+ <!-- 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.
+ -->
<encdec>
- <!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
- so we don't need an encode part) -->
- <format>THEORA</format>
- <match>.avi</match>
- <decode>ffmpeg2theora -x 192 -y 128 -a -1 -v 0 "@T@" -o -</decode>
+ <!-- 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 THEORA (ffmpeg2theora does both decoding and encoding
- so we don't need an encode part) -->
- <format>THEORA</format>
- <match>.mpg</match>
- <decode>ffmpeg2theora -a -1 -v 2 "@T@" -o -</decode>
+ <!--
+ Support for MP3 decoding via madplay, and encoding via LAME:
+ -->
+ <format>MP3</format>
+ <match>.mp3</match>
+ <decode>madplay -o raw:- "@T@"</decode>
+ <encode>lame -r -x -b 56 -s 44.1 --resample 22.05 -a - -</encode>
</encdec>
- <encdec>
- <!-- Support for FLAC decoding (input files) -->
- <format>FLAC</format>
- <match>.flac</match>
- <decode>flac -s -d --force-raw-format --sign=signed --endian=little "@T@" -o -</decode>
- <encode>Not supported Yet</encode>
- </encdec>
- <encdec>
- <!-- Support for MP3 decoding via madplay, and encoding via LAME -->
- <format>MP3</format>
- <match>.mp3</match>
- <decode>madplay -o raw:- "@T@"</decode>
- <encode>lame -r -x -b 56 -s 44.1 --resample 22.05 -a - -</encode>
- </encdec>
- <encdec>
- <!-- Support for Vorbis decoding via oggdec, and encoding via oggenc -->
- <format>VORBIS</format>
- <match>.ogg</match>
- <decode>oggdec --raw=1 "@T@" -o -</decode>
- <encode>oggenc -Q -r -q 0 --resample=44100 --downmix -t "@M@" -c STREAMER=ezstream -</encode>
- </encdec>
- <!-- New encdec sections can be added for new input/output formats -->
+ <encdec>
+ <!--
+ Support for Vorbis decoding via oggdec, and encoding via oggenc:
+ -->
+ <format>VORBIS</format>
+ <match>.ogg</match>
+ <decode>oggdec -R -o - "@T@"</decode>
+ <encode>oggenc -r -q 1.5 --resample=44100 -t "@M@" -</encode>
+ </encdec>
</reencode>
</ezstream>
Modified: trunk/ezstream/conf/ezstream_reencoding_example_theora.xml
===================================================================
--- trunk/ezstream/conf/ezstream_reencoding_example_theora.xml 2007-02-24 21:11:49 UTC (rev 12530)
+++ trunk/ezstream/conf/ezstream_reencoding_example_theora.xml 2007-02-24 21:12:54 UTC (rev 12531)
@@ -1,58 +1,71 @@
-<!-- This example is for a input playlist that can contain
- avi and mpg (video) files files and a output stream that
- is OggTheora. The output stream settings (bitrate, channels, etc.)
- are controlled by the parameters to ffmpeg2theora. (see the decode setting
- for the THEORA format later in this file). -->
+<!--
+ 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>
- <!-- This is what form your output will take. If you are
- reencoding, this is the format to reencode to, if not
- then you need to make sure all your input files are in this
- format. -->
+ <!--
+ Since the reencoding feature is enabled below, <format /> sets the
+ output format of the stream.
+ -->
<format>THEORA</format>
- <filename>tracks.m3u</filename>
- <!-- The following settings are used to describe your stream
- to the server. It's up to you to make sure the
- bitrate/quality/samplerate/channels
- match up to your output stream -->
- <svrinfoname>My Stream</svrinfoname>
- <svrinfourl>http://www.oddsock.org</svrinfourl>
- <svrinfogenre>RockNRoll</svrinfogenre>
+ <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>128</svrinfobitrate>
- <!-- Quality is only applicable to ogg vorbis streams -->
- <!-- <svrinfoquality>1.0</svrinfoquality> -->
+ <svrinfobitrate>200</svrinfobitrate>
<svrinfochannels>2</svrinfochannels>
<svrinfosamplerate>44100</svrinfosamplerate>
- <svrinfopublic>1</svrinfopublic>
+ <!--
+ A missing or commented out <svrinfopublic /> element means no
+ advertising on YP for this broadcast:
+ -->
+ <!-- <svrinfopublic>1</svrinfopublic> -->
<reencode>
- <enable>1</enable>
- <!-- Each encdec block specifies a pair of programs used for decoding and
- encoding of the stream. If reencoding is enabled, then all input files
- must be first decoded before being sent to the encoder. EZSTREAM uses
- file extensions to match up input files with the appropraite decoder,
- and uses the <format> setting to match up the output format with the
- appropriate encoder.
-
- Note: It it up to you to set the appropriate bitrate/samplerate/channels
- of the output stream by using command line paramters to the encoders. Use
- the examples defined here as a guide. All output from decoders should be in
- RAW format, and all input to the encoders should also be in RAW format. -->
+ <!-- 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.
+ -->
<encdec>
- <!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
- so we don't need an encode part) -->
- <format>THEORA</format>
- <match>.avi</match>
- <decode>ffmpeg2theora -x 192 -y 128 -a -1 -v 0 "@T@" -o -</decode>
+ <!--
+ 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>
- <!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
- so we don't need an encode part) -->
- <format>THEORA</format>
- <match>.mpg</match>
- <decode>ffmpeg2theora -a -1 -v 2 "@T@" -o -</decode>
+ <format>THEORA</format>
+ <match>.mpg</match>
+ <decode>ffmpeg2theora -x 192 -y 128 -a 0 -v 4 --title "@M@" -o - "@T@"</decode>
</encdec>
- <!-- New encdec sections can be added for new input/output formats -->
</reencode>
</ezstream>
Modified: trunk/ezstream/conf/ezstream_reencoding_example_vorbis.xml
===================================================================
--- trunk/ezstream/conf/ezstream_reencoding_example_vorbis.xml 2007-02-24 21:11:49 UTC (rev 12530)
+++ trunk/ezstream/conf/ezstream_reencoding_example_vorbis.xml 2007-02-24 21:12:54 UTC (rev 12531)
@@ -1,74 +1,75 @@
+<!--
+ 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>
- <!-- This is what form your output will take. If you are
- reencoding, this is the format to reencode to, if not
- then you need to make sure all your input files are in this
- format. -->
+ <!--
+ Since the reencoding feature is enabled below, <format /> sets the
+ output format of the stream.
+ -->
<format>VORBIS</format>
- <filename>tracks.m3u</filename>
- <!-- The following settings are used to describe your stream
- to the server. It's up to you to make sure the
- bitrate/quality/samplerate/channels
- match up to your output stream -->
- <svrinfoname>My Stream</svrinfoname>
- <svrinfourl>http://www.oddsock.org</svrinfourl>
+ <filename>playlist.m3u</filename>
+ <!-- Enable playlist shuffling: -->
+ <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>RockNRoll</svrinfogenre>
<svrinfodescription>This is a stream description</svrinfodescription>
- <svrinfobitrate>128</svrinfobitrate>
- <!-- Quality is only applicable to ogg vorbis streams -->
- <!-- <svrinfoquality>1.0</svrinfoquality> -->
+ <svrinfobitrate>88</svrinfobitrate>
+ <svrinfoquality>1.5</svrinfoquality>
<svrinfochannels>2</svrinfochannels>
<svrinfosamplerate>44100</svrinfosamplerate>
- <svrinfopublic>1</svrinfopublic>
+ <!-- Allow the server to advertise the stream on a public YP directory: -->
+ <svrinfopublic>1</svrinfopublic>
<reencode>
- <enable>1</enable>
- <!-- Each encdec block specifies a pair of programs used for decoding and
- encoding of the stream. If reencoding is enabled, then all input files
- must be first decoded before being sent to the encoder. EZSTREAM uses
- file extensions to match up input files with the appropraite decoder,
- and uses the <format> setting to match up the output format with the
- appropriate encoder.
-
- Note: It it up to you to set the appropriate bitrate/samplerate/channels
- of the output stream by using command line paramters to the encoders. Use
- the examples defined here as a guide. All output from decoders should be in
- RAW format, and all input to the encoders should also be in RAW format. -->
+ <!-- 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.
+ -->
<encdec>
- <!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
- so we don't need an encode part) -->
- <format>THEORA</format>
- <match>.avi</match>
- <decode>ffmpeg2theora -x 192 -y 128 -a -1 -v 0 "@T@" -o -</decode>
+ <!-- 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 THEORA (ffmpeg2theora does both decoding and encoding
- so we don't need an encode part) -->
- <format>THEORA</format>
- <match>.mpg</match>
- <decode>ffmpeg2theora -a -1 -v 2 "@T@" -o -</decode>
+ <!--
+ Support for MP3 decoding via madplay, and encoding via LAME:
+ -->
+ <format>MP3</format>
+ <match>.mp3</match>
+ <decode>madplay -o raw:- "@T@"</decode>
+ <encode>lame -r -x -b 56 -s 44.1 --resample 22.05 -a - -</encode>
</encdec>
- <encdec>
- <!-- Support for FLAC decoding (input files) -->
- <format>FLAC</format>
- <match>.flac</match>
- <decode>flac -s -d --force-raw-format --sign=signed --endian=little "@T@" -o -</decode>
- <encode>Not supported Yet</encode>
- </encdec>
- <encdec>
- <!-- Support for MP3 decoding via madplay, and encoding via LAME -->
- <format>MP3</format>
- <match>.mp3</match>
- <decode>madplay -o raw:- "@T@"</decode>
- <encode>lame -r -x -b 56 -s 44.1 --resample 22.05 -a - -</encode>
- </encdec>
- <encdec>
- <!-- Support for Vorbis decoding via oggdec, and encoding via oggenc -->
- <format>VORBIS</format>
- <match>.ogg</match>
- <decode>oggdec --raw=1 "@T@" -o -</decode>
- <encode>oggenc -Q -r -q 0 --resample=44100 --downmix -t "@M@" -c STREAMER=ezstream -</encode>
- </encdec>
- <!-- New encdec sections can be added for new input/output formats -->
+ <encdec>
+ <!--
+ Support for Vorbis decoding via oggdec, and encoding via oggenc:
+ -->
+ <format>VORBIS</format>
+ <match>.ogg</match>
+ <decode>oggdec -R -o - "@T@"</decode>
+ <encode>oggenc -r -q 1.5 --resample=44100 -t "@M@" -</encode>
+ </encdec>
</reencode>
</ezstream>
Modified: trunk/ezstream/conf/ezstream_vorbis.xml
===================================================================
--- trunk/ezstream/conf/ezstream_vorbis.xml 2007-02-24 21:11:49 UTC (rev 12530)
+++ trunk/ezstream/conf/ezstream_vorbis.xml 2007-02-24 21:12:54 UTC (rev 12531)
@@ -1,19 +1,29 @@
-<!-- This example is for a input playlist that must contain
- all OggVorbis files. ezstream will perform NO reencoding, and
- the destination stream bitrate, channels, etc. will be those
- of the input files -->
+<!--
+ EXAMPLE: Ogg Vorbis playlist stream WITHOUT reencoding
+
+ This example streams a playlist that contains only Ogg Vorbis files. No
+ other file formats may be listed. Since ezstream will not be doing any
+ reencoding, the resulting stream format (quality/bitrate, samplerate,
+ channels) will be of the respective input files.
+ -->
<ezstream>
<url>http://localhost:8000/vorbis.ogg</url>
<sourcepassword>hackme</sourcepassword>
<format>VORBIS</format>
<filename>playlist.m3u</filename>
- <svrinfoname>My Stream</svrinfoname>
- <svrinfourl>http://www.oddsock.org</svrinfourl>
+ <!--
+ 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>192</svrinfobitrate>
- <svrinfoquality>4.0</svrinfoquality>
+ <svrinfobitrate>96</svrinfobitrate>
+ <svrinfoquality>2.0</svrinfoquality>
<svrinfochannels>2</svrinfochannels>
<svrinfosamplerate>44100</svrinfosamplerate>
- <svrinfopublic>1</svrinfopublic>
+ <!-- Allow the server to advertise the stream on a public YP directory: -->
+ <svrinfopublic>1</svrinfopublic>
</ezstream>
More information about the commits
mailing list