eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bug fix, new command line parameter for maximum upload rate for server

Browse source
This commit is contained in:
Volker Fischer 2009-03-10 12:07:08 +00:00
parent c61b9d593a
commit 0278d83d4d
5 changed files with 77 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
src/channel.cpp
View file

@ -28,15 +28,14 @@
/******************************************************************************\
* CChannelSet *
\******************************************************************************/
CChannelSet::CChannelSet ( const bool bForceLowUploadRate ) :
CChannelSet::CChannelSet ( const int iNewUploadRateLimitKbps ) :
bWriteStatusHTMLFile ( false ),
iUploadRateLimit ( DEF_MAX_UPLOAD_RATE_KBPS )
iUploadRateLimitKbps ( iNewUploadRateLimitKbps )
{
// enable all channels and set server flag
// enable all channels
for ( int i = 0; i < USED_NUM_CHANNELS; i++ )
{
vecChannels[i].SetEnable ( true );
vecChannels[i].SetForceLowUploadRate ( bForceLowUploadRate );
}
// define colors for chat window identifiers
@ -253,33 +252,46 @@ void CChannelSet::SetOutputParameters()
// is not enough, we start to increase the buffer size factor out.
bool bUploadRateIsBelowLimit = false;
const int iNumTrials = 4;
// first initialize all channels with the first parameter set (highest
// upload data rate)
for ( int i = 0; i < USED_NUM_CHANNELS; i++ )
{
if ( vecChannels[i].IsConnected() )
{
// set new parameters
vecChannels[i].SetNetwBufSizeFactOut ( 1 );
vecChannels[i].SetAudioCompressionOut ( CT_NONE );
}
}
// calculate and check total upload rate (maybe the initialization already
// gives desired upload rate)
bUploadRateIsBelowLimit =
( CalculateTotalUploadRateKbps() <= iUploadRateLimitKbps );
// try other parameter sets if required
const int iNumTrials = 3;
EAudComprType eCurAudComprType;
int iCurBlockSizeFact;
for ( int iCurTrialIdx = 0; iCurTrialIdx < iNumTrials; iCurTrialIdx++ )
int iCurTrialIdx = 0;
while ( ( iCurTrialIdx < iNumTrials ) && ( !bUploadRateIsBelowLimit ) )
{
switch ( iCurTrialIdx )
{
case 0:
// highest data rate
eCurAudComprType = CT_NONE;
iCurBlockSizeFact = 1;
break;
case 1:
// using other audio compression gives most reduction
eCurAudComprType = CT_MSADPCM;
iCurBlockSizeFact = 1;
break;
case 2:
case 1:
// trying to use larger block size factor to further reduce rate
eCurAudComprType = CT_MSADPCM;
iCurBlockSizeFact = 2;
break;
case 3:
case 2:
// trying to use larger block size factor to further reduce rate
eCurAudComprType = CT_MSADPCM;
iCurBlockSizeFact = 3;
@ -296,24 +308,34 @@ void CChannelSet::SetOutputParameters()
vecChannels[iCurCh].SetAudioCompressionOut ( eCurAudComprType );
// calculate and check total upload rate
int iTotalUploadRate = 0;
for ( int j = 0; j < USED_NUM_CHANNELS; j++ )
{
if ( vecChannels[j].IsConnected() )
{
// accumulate the upload rates from all channels
iTotalUploadRate += vecChannels[j].GetUploadRateKbps();
}
}
bUploadRateIsBelowLimit = ( iTotalUploadRate <= iUploadRateLimit );
bUploadRateIsBelowLimit =
( CalculateTotalUploadRateKbps() <= iUploadRateLimitKbps );
}
// next channel
iCurCh++;
}
// next trial index
iCurTrialIdx++;
}
}
int CChannelSet::CalculateTotalUploadRateKbps()
{
// calculate total upload rate
int iTotalUploadRate = 0;
for ( int i = 0; i < USED_NUM_CHANNELS; i++ )
{
if ( vecChannels[i].IsConnected() )
{
// accumulate the upload rates from all channels
iTotalUploadRate += vecChannels[i].GetUploadRateKbps();
}
}
return iTotalUploadRate;
}
int CChannelSet::CheckAddr ( const CHostAddress& Addr )
{
CHostAddress InetAddr;
@ -639,8 +661,7 @@ void CChannelSet::WriteHTMLChannelList()
\******************************************************************************/
CChannel::CChannel ( const bool bNIsServer ) : bIsServer ( bNIsServer ),
sName ( "" ), vecdGains ( USED_NUM_CHANNELS, (double) 1.0 ),
bIsEnabled ( false ), bForceLowUploadRate ( false ),
iCurNetwOutBlSiFact ( DEF_NET_BLOCK_SIZE_FACTOR )
bIsEnabled ( false ), iCurNetwOutBlSiFact ( DEF_NET_BLOCK_SIZE_FACTOR )
{
// query all possible network in buffer sizes for determining if an
// audio packet was received (the following code only works if all
@ -790,19 +811,6 @@ void CChannel::SetEnable ( const bool bNEnStat )
}
}
void CChannel::SetForceLowUploadRate ( const bool bNFoLoUpRat )
{
if ( bNFoLoUpRat )
{
// initialize with low upload rate parameters and set flag so that
// these parameters are not changed anymore
SetNetwBufSizeFactOut ( LOW_UPL_SET_BLOCK_SIZE_FACTOR_OUT );
SetAudioCompressionOut ( LOW_UPL_SET_AUDIO_COMPRESSION );
}
bForceLowUploadRate = bNFoLoUpRat;
}
void CChannel::SetAudioBlockSizeAndComprIn ( const int iNewBlockSize,
const EAudComprType eNewAudComprType )
{
@ -838,7 +846,7 @@ void CChannel::SetNetwBufSizeFactOut ( const int iNewNetwBlSiFactOut )
QMutexLocker locker ( &Mutex );
// use the network block size factor only for the server
if ( ( !bForceLowUploadRate ) && bIsServer )
if ( bIsServer )
{
// store new value
iCurNetwOutBlSiFact = iNewNetwBlSiFactOut;
@ -853,8 +861,6 @@ void CChannel::SetNetwBufSizeFactOut ( const int iNewNetwBlSiFactOut )
}
void CChannel::SetAudioCompressionOut ( const EAudComprType eNewAudComprTypeOut )
{
if ( !bForceLowUploadRate )
{
// store new value
eAudComprTypeOut = eNewAudComprTypeOut;
@ -872,7 +878,6 @@ void CChannel::SetAudioCompressionOut ( const EAudComprType eNewAudComprTypeOut
SetNetwBufSizeOut ( iCurAudioBlockSizeOut );
}
}
}
void CChannel::SetSockBufSize ( const int iNumBlocks )
{

10
src/channel.h
View file

@ -89,7 +89,6 @@ public:
bool IsConnected() const { return iConTimeOut > 0; }
void SetEnable ( const bool bNEnStat );
void SetForceLowUploadRate ( const bool bNFoLoUpRat );
void SetAddress ( const CHostAddress NAddr ) { InetAddr = NAddr; }
bool GetAddress ( CHostAddress& RetAddr );
@ -185,7 +184,6 @@ protected:
bool bIsEnabled;
bool bIsServer;
bool bForceLowUploadRate;
int iCurAudioBlockSizeIn;
int iCurNetwOutBlSiFact;
@ -230,7 +228,7 @@ class CChannelSet : public QObject
Q_OBJECT
public:
CChannelSet ( const bool bForceLowUploadRate );
CChannelSet ( const int iNewUploadRateLimitKbps = DEF_MAX_UPLOAD_RATE_KBPS );
virtual ~CChannelSet() {}
bool PutData ( const CVector<unsigned char>& vecbyRecBuf,
@ -264,6 +262,9 @@ public:
void StartStatusHTMLFileWriting ( const QString& strNewFileName,
const QString& strNewServerNameWithPort );
void SetUploadRateLimitKbps ( const int iNewUploadRateLimitKbps )
{ iUploadRateLimitKbps = iNewUploadRateLimitKbps; }
protected:
CVector<CChannelShortInfo> CreateChannelList();
void CreateAndSendChanListForAllConChannels();
@ -272,6 +273,7 @@ protected:
void CreateAndSendChatTextForAllConChannels ( const int iCurChanID, const QString& strChatText );
void WriteHTMLChannelList();
void SetOutputParameters();
int CalculateTotalUploadRateKbps();
/* do not use the vector class since CChannel does not have appropriate
copy constructor/operator */
@ -280,7 +282,7 @@ protected:
CVector<QString> vstrChatColors;
int iUploadRateLimit;
int iUploadRateLimitKbps;
// HTML file server status
bool bWriteStatusHTMLFile;

13
src/main.cpp
View file

@ -45,7 +45,7 @@ int main ( int argc, char** argv )
/* check if server or client application shall be started */
bool bIsClient = true;
bool bUseGUI = true;
bool bForceLowUploadRate = false;
int iUploadRateLimitKbps = DEF_MAX_UPLOAD_RATE_KBPS;
quint16 iPortNumber = LLCON_DFAULT_PORT_NUMBER;
std::string strIniFileName = "";
std::string strHTMLStatusFileName = "";
@ -82,10 +82,11 @@ int main ( int argc, char** argv )
}
// force low upload data rate flag -------------------------------------------
if ( GetFlagArgument ( argc, argv, i, "-u", "--lowuploadrate" ) )
if ( GetNumericArgument ( argc, argv, i, "-u", "--maxuploadrate",
100, 1000000, rDbleArgument ) )
{
bForceLowUploadRate = true;
cout << "force low upload rate" << std::endl;
iUploadRateLimitKbps = static_cast<int> ( rDbleArgument );
cout << "maximum upload rate: " << iUploadRateLimitKbps << std::endl;
continue;
}
@ -194,7 +195,7 @@ int main ( int argc, char** argv )
iPortNumber,
strHTMLStatusFileName.c_str(),
strServerName.c_str(),
bForceLowUploadRate );
iUploadRateLimitKbps );
if ( bUseGUI )
{
@ -249,7 +250,7 @@ std::string UsageArguments ( char **argv )
" -i, --inifile initialization file name (only available for client)\n"
" -p, --port local port number (only avaiable for server)\n"
" -m, --htmlstatus enable HTML status file, set file name (only avaiable for server)\n"
" -u, --lowuploadrate force low upload rate (only avaiable for server)\n"
" -u, --maxuploadrate maximum upload rate (only avaiable for server)\n"
" -h, -?, --help this help text\n"
"Example: " + std::string ( argv[0] ) + " -l -inifile myinifile.ini\n";
}

4
src/server.cpp
View file

@ -30,9 +30,9 @@ CServer::CServer ( const QString& strLoggingFileName,
const quint16 iPortNumber,
const QString& strHTMLStatusFileName,
const QString& strServerNameForHTMLStatusFile,
const bool bForceLowUploadRate ) :
const int iNewUploadRateLimitKbps ) :
Socket ( &ChannelSet, this, iPortNumber ),
ChannelSet ( bForceLowUploadRate )
ChannelSet ( iNewUploadRateLimitKbps )
{
vecsSendData.Init ( MIN_SERVER_BLOCK_SIZE_SAMPLES );

2
src/server.h
View file

@ -45,7 +45,7 @@ public:
const quint16 iPortNumber,
const QString& strHTMLStatusFileName,
const QString& strServerNameForHTMLStatusFile,
const bool bForceLowUploadRate );
const int iNewUploadRateLimitKbps );
virtual ~CServer() {}
void Start();