adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added patch to allow mp3 stream downsampling to mono for icecast2 as well

This commit is contained in:
darkeye 2004-02-15 12:14:38 +00:00
parent 9d186e8e96
commit 21f3ad142e
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
darkice/trunk/AUTHORS
View File

@ -18,4 +18,5 @@ with contributions by:
Ricardo Galli <gallir@uib.es> Ricardo Galli <gallir@uib.es>
John Hay <jhay@icomtek.csir.co.za> John Hay <jhay@icomtek.csir.co.za>
Christian Forster <forster@like.e-technik.uni-erlangen.de> Christian Forster <forster@like.e-technik.uni-erlangen.de>
John Deeny <taqueso@dilapidated.org>

3
darkice/trunk/ChangeLog
View File

@ -2,6 +2,9 @@ DarkIce next release
o added ALSA support, thanks to Christian Forster o added ALSA support, thanks to Christian Forster
<forster@like.e-technik.uni-erlangen.de> <forster@like.e-technik.uni-erlangen.de>
o added fix to enable downsampling from stereo to mono of mp3 streams
when streaming to an icecast2 server. thanks to John Deeny
<taqueso@dilapidated.org>
07-01-2004: DarkIce 0.13.2 released 07-01-2004: DarkIce 0.13.2 released

6
darkice/trunk/man/darkice.cfg.5
View File

@ -239,6 +239,12 @@ Optional values:
The sample rate of the encoded mp3 output. If not specified, defaults The sample rate of the encoded mp3 output. If not specified, defaults
to the value of the input sample rate. to the value of the input sample rate.
.TP .TP
.I channel
Number of channels for the mp3 output (e.g. 1 for mono, 2 for stereo).
If not specified, defaults to the value of the input sample rate.
Different channels for input and output are only supported for mp3,
but not for Ogg Vorbis.
.TP
.I maxBitrate .I maxBitrate
The maximum bitrate of the stream. Only used when in cbr mode and in The maximum bitrate of the stream. Only used when in cbr mode and in
Ogg Vorbis format. Ogg Vorbis format.

8
darkice/trunk/src/DarkIce.cpp
View File

@ -369,6 +369,7 @@ DarkIce :: configIceCast2 ( const Config & config,
IceCast2::StreamFormat format; IceCast2::StreamFormat format;
unsigned int sampleRate = 0; unsigned int sampleRate = 0;
unsigned int channel = 0;
AudioEncoder::BitrateMode bitrateMode; AudioEncoder::BitrateMode bitrateMode;
unsigned int bitrate = 0; unsigned int bitrate = 0;
unsigned int maxBitrate = 0; unsigned int maxBitrate = 0;
@ -398,6 +399,8 @@ DarkIce :: configIceCast2 ( const Config & config,
str = cs->get( "sampleRate"); str = cs->get( "sampleRate");
sampleRate = str ? Util::strToL( str) : dsp->getSampleRate(); sampleRate = str ? Util::strToL( str) : dsp->getSampleRate();
str = cs->get( "channel");
channel = str ? Util::strToL( str) : dsp->getChannel();
// determine fixed bitrate or variable bitrate quality // determine fixed bitrate or variable bitrate quality
str = cs->get( "bitrate"); str = cs->get( "bitrate");
@ -505,7 +508,7 @@ DarkIce :: configIceCast2 ( const Config & config,
bitrate, bitrate,
quality, quality,
sampleRate, sampleRate,
dsp->getChannel() ); channel );
#endif // HAVE_LAME_LIB #endif // HAVE_LAME_LIB
break; break;
@ -996,6 +999,9 @@ DarkIce :: run ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.37 2004/02/15 12:14:38 darkeye
added patch to allow mp3 stream downsampling to mono for icecast2 as well
Revision 1.36 2004/02/15 12:06:30 darkeye Revision 1.36 2004/02/15 12:06:30 darkeye
added ALSA support, thanks to Christian Forster added ALSA support, thanks to Christian Forster