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

speed optimzation, remove normalization value (I guess it is not needed...)

Browse source
This commit is contained in:
Volker Fischer 2009-06-12 16:06:45 +00:00
parent 5f9dc603a1
commit 04da12c959
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/server.cpp
View file

@ -160,25 +160,34 @@ void CServer::OnTimer()
CVector<short> CServer::ProcessData ( CVector<CVector<double> >& vecvecdData, CVector<short> CServer::ProcessData ( CVector<CVector<double> >& vecvecdData,
CVector<double>& vecdGains ) CVector<double>& vecdGains )
{ {
CVector<short> vecsOutData ( MIN_SERVER_BLOCK_SIZE_SAMPLES ); int i;
// init return vector with zeros since we mix all channels on that vector
CVector<short> vecsOutData ( MIN_SERVER_BLOCK_SIZE_SAMPLES, 0 );
const int iNumClients = vecvecdData.Size(); const int iNumClients = vecvecdData.Size();
// some offset to avoid overload when mixing clients together
const double dNorm = (double) 1.25;
// mix all audio data from all clients together // mix all audio data from all clients together
for ( int i = 0; i < MIN_SERVER_BLOCK_SIZE_SAMPLES; i++ ) for ( int j = 0; j < iNumClients; j++ )
{ {
double dMixedData = 0.0; // if channel gain is 1, avoid multiplication for speed optimization
if ( vecdGains[j] == static_cast<double> ( 1.0 ) )
for ( int j = 0; j < iNumClients; j++ )
{ {
dMixedData += vecvecdData[j][i] * vecdGains[j]; for ( int i = 0; i < MIN_SERVER_BLOCK_SIZE_SAMPLES; i++ )
{
vecsOutData[i] =
Double2Short ( vecsOutData[i] + vecvecdData[j][i] );
}
}
else
{
for ( int i = 0; i < MIN_SERVER_BLOCK_SIZE_SAMPLES; i++ )
{
vecsOutData[i] =
Double2Short ( vecsOutData[i] +
vecvecdData[j][i] * vecdGains[j] );
}
} }
// normalization and truncating to short
vecsOutData[i] = Double2Short ( dMixedData / dNorm );
} }
return vecsOutData; return vecsOutData;