From 0b31a1b57f9d5f4859698757ae999d810d3762fc Mon Sep 17 00:00:00 2001
From: moritz <moritz@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Date: Sun, 4 Nov 2007 13:09:08 +0000
Subject: [PATCH] Improve the reencoding examples; more usable defaults and add
 more options to create a more well-defined stream of raw samples.

git-svn-id: https://svn.xiph.org/trunk/ezstream@14093 0101bb08-14d6-0310-b084-bc0e0c8e3800
---
 examples/ezstream_reencoding_example_mp3.xml  | 24 ++++++++++++-------
 .../ezstream_reencoding_example_theora.xml    |  9 ++++++-
 .../ezstream_reencoding_example_vorbis.xml    | 18 ++++++++++----
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/examples/ezstream_reencoding_example_mp3.xml b/examples/ezstream_reencoding_example_mp3.xml
index 8a1c9d9..75f0eb7 100644
--- a/examples/ezstream_reencoding_example_mp3.xml
+++ b/examples/ezstream_reencoding_example_mp3.xml
@@ -29,9 +29,9 @@
     <svrinfourl>http://www.oddsock.org</svrinfourl>
     <svrinfogenre>RockNRoll</svrinfogenre>
     <svrinfodescription>This is a stream description</svrinfodescription>
-    <svrinfobitrate>56</svrinfobitrate>
-    <svrinfochannels>1</svrinfochannels>
-    <svrinfosamplerate>220500</svrinfosamplerate>
+    <svrinfobitrate>128</svrinfobitrate>
+    <svrinfochannels>2</svrinfochannels>
+    <svrinfosamplerate>44100</svrinfosamplerate>
     <!--
       Prohibit the server to advertise the stream on a public YP directory:
      -->
@@ -48,7 +48,14 @@
            the appropriate command line parameters of the encoders in the
            <encode /> elements.
 
-           New encdec sections can be added for new input/output formats.
+           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: -->
@@ -63,8 +70,9 @@
              -->
             <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>
+            <!-- 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>
             <!--
@@ -72,8 +80,8 @@
              -->
             <format>VORBIS</format>
             <match>.ogg</match>
-            <decode>oggdec -R -o - "@T@"</decode>
-            <encode>oggenc -r -q 1.5 --resample=44100 -t "@M@" -</encode>
+            <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>
diff --git a/examples/ezstream_reencoding_example_theora.xml b/examples/ezstream_reencoding_example_theora.xml
index d0b1bc3..d089316 100644
--- a/examples/ezstream_reencoding_example_theora.xml
+++ b/examples/ezstream_reencoding_example_theora.xml
@@ -49,7 +49,14 @@
            the appropriate command line parameters of the encoders in the
            <encode /> elements.
 
-           New encdec sections can be added for new input/output formats.
+           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>
             <!--
diff --git a/examples/ezstream_reencoding_example_vorbis.xml b/examples/ezstream_reencoding_example_vorbis.xml
index e350baa..f306173 100644
--- a/examples/ezstream_reencoding_example_vorbis.xml
+++ b/examples/ezstream_reencoding_example_vorbis.xml
@@ -49,7 +49,14 @@
            the appropriate command line parameters of the encoders in the
            <encode /> elements.
 
-           New encdec sections can be added for new input/output formats.
+           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: -->
@@ -64,8 +71,9 @@
              -->
             <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>
+            <!-- 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>
             <!--
@@ -73,8 +81,8 @@
              -->
             <format>VORBIS</format>
             <match>.ogg</match>
-            <decode>oggdec -R -o - "@T@"</decode>
-            <encode>oggenc -r -q 1.5 --resample=44100 -t "@M@" -</encode>
+            <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>