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

improvement: only send channel levels if they are different from the previous ones

Browse source
This commit is contained in:
Volker Fischer 2020-06-07 12:09:30 +02:00
parent 6a896522f0
commit efc24ffdbe
2 changed files with 78 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/server.cpp
View file

@ -238,6 +238,7 @@ CServer::CServer ( const int iNewMaxNumChan,
iMaxNumChannels ( iNewMaxNumChan ), iMaxNumChannels ( iNewMaxNumChan ),
Socket ( this, iPortNumber ), Socket ( this, iPortNumber ),
Logging ( iMaxDaysHistory ), Logging ( iMaxDaysHistory ),
iFrameCount ( 0 ),
JamRecorder ( strRecordingDirName ), JamRecorder ( strRecordingDirName ),
bWriteStatusHTMLFile ( false ), bWriteStatusHTMLFile ( false ),
HighPrecisionTimer ( bNUseDoubleSystemFrameSize ), HighPrecisionTimer ( bNUseDoubleSystemFrameSize ),
@ -768,6 +769,7 @@ JitterMeas.Measure();
// some inits // some inits
int iNumClients = 0; // init connected client counter int iNumClients = 0; // init connected client counter
bool bChannelIsNowDisconnected = false; bool bChannelIsNowDisconnected = false;
bool bUpdateChannelLevels = false;
bool bSendChannelLevels = false; bool bSendChannelLevels = false;
// Make put and get calls thread safe. Do not forget to unlock mutex // Make put and get calls thread safe. Do not forget to unlock mutex
@ -865,6 +867,12 @@ JitterMeas.Measure();
vecvecdPannings[i][j] = vecChannels[iCurChanID].GetPan ( vecChanIDsCurConChan[j] ); vecvecdPannings[i][j] = vecChannels[iCurChanID].GetPan ( vecChanIDsCurConChan[j] );
} }
// flag for updating channel levels (if at least one clients wants it)
if ( vecChannels[iCurChanID].ChannelLevelsRequired() )
{
bUpdateChannelLevels = true;
}
// If the server frame size is smaller than the received OPUS frame size, we need a conversion // If the server frame size is smaller than the received OPUS frame size, we need a conversion
// buffer which stores the large buffer. // buffer which stores the large buffer.
// Note that we have a shortcut here. If the conversion buffer is not needed, the boolean flag // Note that we have a shortcut here. If the conversion buffer is not needed, the boolean flag
@ -941,31 +949,13 @@ JitterMeas.Measure();
// one client is connected. // one client is connected.
if ( iNumClients > 0 ) if ( iNumClients > 0 )
{ {
// low frequency updates // calculate levels for all connected clients
if ( iFrameCount > CHANNEL_LEVEL_UPDATE_INTERVAL ) if ( bUpdateChannelLevels )
{ {
iFrameCount = 0; bSendChannelLevels = CreateLevelsForAllConChannels ( iNumClients,
// Calculate channel levels if any client has requested them
for ( int i = 0; i < iNumClients; i++ )
{
if ( vecChannels[vecChanIDsCurConChan[i]].ChannelLevelsRequired() )
{
bSendChannelLevels = true;
CreateLevelsForAllConChannels ( iNumClients,
vecNumAudioChannels, vecNumAudioChannels,
vecvecsData, vecvecsData,
vecChannelLevels ); vecChannelLevels );
break;
}
}
}
iFrameCount++;
if ( bUseDoubleSystemFrameSize )
{
// additional increment needed for double frame size to get to the same time interval
iFrameCount++;
} }
for ( int i = 0; i < iNumClients; i++ ) for ( int i = 0; i < iNumClients; i++ )
@ -1075,7 +1065,9 @@ opus_custom_encoder_ctl ( CurOpusEncoder,
// send channel levels // send channel levels
if ( bSendChannelLevels && vecChannels[iCurChanID].ChannelLevelsRequired() ) if ( bSendChannelLevels && vecChannels[iCurChanID].ChannelLevelsRequired() )
{ {
ConnLessProtocol.CreateCLChannelLevelListMes ( vecChannels[iCurChanID].GetAddress(), vecChannelLevels, iNumClients ); ConnLessProtocol.CreateCLChannelLevelListMes ( vecChannels[iCurChanID].GetAddress(),
vecChannelLevels,
iNumClients );
} }
} }
} }
@ -1558,12 +1550,19 @@ void CServer::customEvent ( QEvent* pEvent )
} }
/// @brief Compute frame peak level for each client /// @brief Compute frame peak level for each client
void CServer::CreateLevelsForAllConChannels ( const int iNumClients, bool CServer::CreateLevelsForAllConChannels ( const int iNumClients,
const CVector<int>& vecNumAudioChannels, const CVector<int>& vecNumAudioChannels,
const CVector<CVector<int16_t> > vecvecsData, const CVector<CVector<int16_t> > vecvecsData,
CVector<uint16_t>& vecLevelsOut ) CVector<uint16_t>& vecLevelsOut )
{ {
int i, j, k; int i, j, k;
bool bLevelsWereUpdated = false;
// low frequency updates
if ( iFrameCount > CHANNEL_LEVEL_UPDATE_INTERVAL )
{
iFrameCount = 0;
bLevelsWereUpdated = true;
// init return vector with zeros since we mix all channels on that vector // init return vector with zeros since we mix all channels on that vector
vecLevelsOut.Reset ( 0 ); vecLevelsOut.Reset ( 0 );
@ -1612,4 +1611,16 @@ void CServer::CreateLevelsForAllConChannels ( const int i
vecLevelsOut[j] = static_cast<uint16_t> ( ceil ( dCurSigLevel ) ); vecLevelsOut[j] = static_cast<uint16_t> ( ceil ( dCurSigLevel ) );
} }
}
// increment the frame counter needed for low frequency update trigger
iFrameCount++;
if ( bUseDoubleSystemFrameSize )
{
// additional increment needed for double frame size to get to the same time interval
iFrameCount++;
}
return bLevelsWereUpdated;
} }

4
src/server.h
View file

@ -298,7 +298,7 @@ protected:
bool bUseDoubleSystemFrameSize; bool bUseDoubleSystemFrameSize;
int iServerFrameSizeSamples; int iServerFrameSizeSamples;
void CreateLevelsForAllConChannels ( const int iNumClients, bool CreateLevelsForAllConChannels ( const int iNumClients,
const CVector<int>& vecNumAudioChannels, const CVector<int>& vecNumAudioChannels,
const CVector<CVector<int16_t> > vecvecsData, const CVector<CVector<int16_t> > vecvecsData,
CVector<uint16_t>& vecLevelsOut ); CVector<uint16_t>& vecLevelsOut );
@ -347,7 +347,7 @@ protected:
CServerLogging Logging; CServerLogging Logging;
// channel level update frame interval counter // channel level update frame interval counter
uint16_t iFrameCount; int iFrameCount;
// recording thread // recording thread
recorder::CJamRecorder JamRecorder; recorder::CJamRecorder JamRecorder;