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

added possibility to disable highpass and lowpass filters for lame

This commit is contained in:
darkeye 2001-10-20 10:56:45 +00:00
parent 4309523f0d
commit d398578542
7 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
darkice/trunk/ChangeLog
View File

@ -1,3 +1,7 @@
DarkIce 0.8
o added possibility to disable lowpass and highpass filtering for lame
19-10-2001: DarkIce 0.7 released 19-10-2001: DarkIce 0.7 released
o added support for FreeBSD o added support for FreeBSD

2
darkice/trunk/configure.in
View File

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/DarkIce.cpp) AC_INIT(src/DarkIce.cpp)
AM_INIT_AUTOMAKE(darkice, 0.7) AM_INIT_AUTOMAKE(darkice, 0.8beta)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)

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

@ -135,12 +135,14 @@ server should dump the contents of
this stream on its side. this stream on its side.
.TP .TP
.I lowpass .I lowpass
Lowpass filter setting for the lame encoder. If not set, Lowpass filter setting for the lame encoder. If not set or set to 0,
the encoder's default behaviour is used the encoder's default behaviour is used. If set to -1, the filter is
disabled.
.TP .TP
.I highpass .I highpass
Highpass filter setting for the lame encoder. If not set, Highpass filter setting for the lame encoder. If not set or set to 0,
the encoder's default behaviour is used the encoder's default behaviour is used. If set to -1, the filter is
disabled.
.PP .PP
.B [icecast2-x] .B [icecast2-x]
@ -256,12 +258,14 @@ AIM information related to the stream
ICQ information related to the stream ICQ information related to the stream
.TP .TP
.I lowpass .I lowpass
Lowpass filter setting for the lame encoder. If not set, Lowpass filter setting for the lame encoder. If not set or set to 0,
the encoder's default behaviour is used the encoder's default behaviour is used. If set to -1, the filter is
disabled.
.TP .TP
.I highpass .I highpass
Highpass filter setting for the lame encoder. If not set, Highpass filter setting for the lame encoder. If not set or set to 0,
the encoder's default behaviour is used the encoder's default behaviour is used. If set to -1, the filter is
disabled.
.PP .PP
A sample configuration file follows. This file makes A sample configuration file follows. This file makes

5
darkice/trunk/rpm/darkice.spec
View File

@ -36,7 +36,7 @@ Summary : DarkIce live IceCast / ShoutCast streamer
Name: darkice Name: darkice
Vendor: Tyrell Hungary Vendor: Tyrell Hungary
Packager: Akos Maroy <darkeye@tyrell.hu> Packager: Akos Maroy <darkeye@tyrell.hu>
Version: 0.7 Version: 0.8beta
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: Applications/Multimedia Group: Applications/Multimedia
@ -97,6 +97,9 @@ make clean
# =================================================================== change log # =================================================================== change log
# #
# $Log$ # $Log$
# Revision 1.9 2001/10/20 10:56:45 darkeye
# added possibility to disable highpass and lowpass filters for lame
#
# Revision 1.8 2001/10/19 12:48:03 darkeye # Revision 1.8 2001/10/19 12:48:03 darkeye
# for new version # for new version
# #

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

@ -210,8 +210,8 @@ DarkIce :: configIceCast ( const Config & config,
const char * url = 0; const char * url = 0;
const char * genre = 0; const char * genre = 0;
bool isPublic = false; bool isPublic = false;
unsigned int lowpass = 0; int lowpass = 0;
unsigned int highpass = 0; int highpass = 0;
str = cs->get( "sampleRate"); str = cs->get( "sampleRate");
sampleRate = str ? Util::strToL( str) : dsp->getSampleRate(); sampleRate = str ? Util::strToL( str) : dsp->getSampleRate();
@ -411,8 +411,8 @@ DarkIce :: configShoutCast ( const Config & config,
const char * url = 0; const char * url = 0;
const char * genre = 0; const char * genre = 0;
bool isPublic = false; bool isPublic = false;
unsigned int lowpass = 0; int lowpass = 0;
unsigned int highpass = 0; int highpass = 0;
const char * irc = 0; const char * irc = 0;
const char * aim = 0; const char * aim = 0;
const char * icq = 0; const char * icq = 0;
@ -608,6 +608,9 @@ DarkIce :: run ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.22 2001/10/20 10:56:45 darkeye
added possibility to disable highpass and lowpass filters for lame
Revision 1.21 2001/10/19 12:39:42 darkeye Revision 1.21 2001/10/19 12:39:42 darkeye
created configure options to compile with or without lame / Ogg Vorbis created configure options to compile with or without lame / Ogg Vorbis

39
darkice/trunk/src/LameLibEncoder.cpp
View File

@ -125,30 +125,26 @@ LameLibEncoder :: open ( void )
reportEvent( 5, "set lame bit rate", lame_get_brate( lameGlobalFlags)); reportEvent( 5, "set lame bit rate", lame_get_brate( lameGlobalFlags));
if ( lowpass ) { if ( 0 > lame_set_lowpassfreq( lameGlobalFlags, lowpass) ) {
if ( 0 > lame_set_lowpassfreq( lameGlobalFlags, lowpass) ) { throw Exception( __FILE__, __LINE__,
throw Exception( __FILE__, __LINE__, "lame lib setting lowpass frequency error",
"lame lib setting lowpass frequency error", lowpass );
lowpass );
}
reportEvent( 5,
"set lame lowpass frequency",
lame_get_lowpassfreq( lameGlobalFlags));
} }
reportEvent( 5,
"set lame lowpass frequency",
lame_get_lowpassfreq( lameGlobalFlags));
if ( highpass ) { if ( 0 > lame_set_highpassfreq( lameGlobalFlags, highpass) ) {
if ( 0 > lame_set_highpassfreq( lameGlobalFlags, highpass) ) { throw Exception( __FILE__, __LINE__,
throw Exception( __FILE__, __LINE__, "lame lib setting highpass frequency error",
"lame lib setting highpass frequency error", lowpass );
lowpass );
}
reportEvent( 5,
"set lame highpass frequency",
lame_get_highpassfreq( lameGlobalFlags));
} }
reportEvent( 5,
"set lame highpass frequency",
lame_get_highpassfreq( lameGlobalFlags));
// not configurable lame settings // not configurable lame settings
if ( 0 > lame_set_quality( lameGlobalFlags, 2) ) { if ( 0 > lame_set_quality( lameGlobalFlags, 2) ) {
@ -419,6 +415,9 @@ LameLibEncoder :: close ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.9 2001/10/20 10:56:45 darkeye
added possibility to disable highpass and lowpass filters for lame
Revision 1.8 2001/10/19 12:39:42 darkeye Revision 1.8 2001/10/19 12:39:42 darkeye
created configure options to compile with or without lame / Ogg Vorbis created configure options to compile with or without lame / Ogg Vorbis

23
darkice/trunk/src/LameLibEncoder.h
View File

@ -84,16 +84,16 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter
Ref<Sink> sink; Ref<Sink> sink;
/** /**
* Highpass filter. Sound frequency in Hz, from where up the * Lowpass filter. Sound frequency in Hz, from where up the
* input is cut. * input is cut.
*/ */
unsigned int lowpass; int lowpass;
/** /**
* Lowpass filter. Sound frequency in Hz, from where down the * Highpass filter. Sound frequency in Hz, from where down the
* input is cut. * input is cut.
*/ */
unsigned int highpass; int highpass;
/** /**
* Initialize the object. * Initialize the object.
@ -111,8 +111,8 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter
*/ */
inline void inline void
init ( Sink * sink, init ( Sink * sink,
unsigned int lowpass, int lowpass,
unsigned int highpass ) throw ( Exception ) int highpass ) throw ( Exception )
{ {
this->sink = sink; this->sink = sink;
this->lowpass = lowpass; this->lowpass = lowpass;
@ -223,8 +223,8 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter
unsigned int outBitrate, unsigned int outBitrate,
unsigned int outSampleRate = 0, unsigned int outSampleRate = 0,
unsigned int outChannel = 0, unsigned int outChannel = 0,
unsigned int lowpass = 0, int lowpass = 0,
unsigned int highpass = 0 ) int highpass = 0 )
throw ( Exception ) throw ( Exception )
: AudioEncoder ( inSampleRate, : AudioEncoder ( inSampleRate,
@ -264,8 +264,8 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter
unsigned int outBitrate, unsigned int outBitrate,
unsigned int outSampleRate = 0, unsigned int outSampleRate = 0,
unsigned int outChannel = 0, unsigned int outChannel = 0,
unsigned int lowpass = 0, int lowpass = 0,
unsigned int highpass = 0 ) int highpass = 0 )
throw ( Exception ) throw ( Exception )
: AudioEncoder ( as, : AudioEncoder ( as,
@ -456,6 +456,9 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter
$Source$ $Source$
$Log$ $Log$
Revision 1.10 2001/10/20 10:56:45 darkeye
added possibility to disable highpass and lowpass filters for lame
Revision 1.9 2001/10/19 12:39:42 darkeye Revision 1.9 2001/10/19 12:39:42 darkeye
created configure options to compile with or without lame / Ogg Vorbis created configure options to compile with or without lame / Ogg Vorbis