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

backup checkin -> does not compile

Browse source
This commit is contained in:
Volker Fischer 2020-08-02 13:19:05 +02:00
parent ac0eb73bc6
commit ed38efa2c4
2 changed files with 95 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
src/server.cpp
View file

@ -995,7 +995,7 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE
for ( int i = 0; i < iNumClients; i++ ) for ( int i = 0; i < iNumClients; i++ )
{ {
int iClientFrameSizeSamples = 0; // initialize to avoid a compiler warning int iClientFrameSizeSamples = 0; // initialize to avoid a compiler warning
OpusCustomEncoder* CurOpusEncoder; OpusCustomEncoder* pCurOpusEncoder;
// get actual ID of current channel // get actual ID of current channel
const int iCurChanID = vecChanIDsCurConChan[i]; const int iCurChanID = vecChanIDsCurConChan[i];
@ -1003,17 +1003,6 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE
// get number of audio channels of current channel // get number of audio channels of current channel
const int iCurNumAudChan = vecNumAudioChannels[i]; const int iCurNumAudChan = vecNumAudioChannels[i];
// generate a separate mix for each channel
// actual processing of audio data -> mix
ProcessData ( vecvecsData,
vecvecdGains[i],
vecvecdPannings[i],
vecNumAudioChannels,
vecvecsIntermediateProcBuf[i],
vecvecsSendData[i],
iCurNumAudChan,
iNumClients );
// get current number of CELT coded bytes // get current number of CELT coded bytes
const int iCeltNumCodedBytes = vecChannels[iCurChanID].GetNetwFrameSize(); const int iCeltNumCodedBytes = vecChannels[iCurChanID].GetNetwFrameSize();
@ -1024,11 +1013,11 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE
if ( vecNumAudioChannels[i] == 1 ) if ( vecNumAudioChannels[i] == 1 )
{ {
CurOpusEncoder = OpusEncoderMono[iCurChanID]; pCurOpusEncoder = OpusEncoderMono[iCurChanID];
} }
else else
{ {
CurOpusEncoder = OpusEncoderStereo[iCurChanID]; pCurOpusEncoder = OpusEncoderStereo[iCurChanID];
} }
} }
else if ( vecAudioComprType[i] == CT_OPUS64 ) else if ( vecAudioComprType[i] == CT_OPUS64 )
@ -1037,56 +1026,35 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE
if ( vecNumAudioChannels[i] == 1 ) if ( vecNumAudioChannels[i] == 1 )
{ {
CurOpusEncoder = Opus64EncoderMono[iCurChanID]; pCurOpusEncoder = Opus64EncoderMono[iCurChanID];
} }
else else
{ {
CurOpusEncoder = Opus64EncoderStereo[iCurChanID]; pCurOpusEncoder = Opus64EncoderStereo[iCurChanID];
} }
} }
else else
{ {
CurOpusEncoder = nullptr; pCurOpusEncoder = nullptr;
} }
// If the server frame size is smaller than the received OPUS frame size, we need a conversion // generate a separate mix for each channel
// buffer which stores the large buffer. // actual processing of audio data -> mix
// Note that we have a shortcut here. If the conversion buffer is not needed, the boolean flag MixEncodeTransmitData ( vecvecsData,
// is false and the Get() function is not called at all. Therefore if the buffer is not needed vecvecdGains[i],
// we do not spend any time in the function but go directly inside the if condition. vecvecdPannings[i],
if ( ( vecUseDoubleSysFraSizeConvBuf[i] == 0 ) || vecNumAudioChannels,
DoubleFrameSizeConvBufOut[iCurChanID].Put ( vecvecsSendData[i], SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i] ) ) vecvecsIntermediateProcBuf[i],
{ vecvecbyCodedData[i],
if ( vecUseDoubleSysFraSizeConvBuf[i] != 0 ) DoubleFrameSizeConvBufOut[iCurChanID],
{ vecUseDoubleSysFraSizeConvBuf[i],
// get the large frame from the conversion buffer vecNumFrameSizeConvBlocks[i],
DoubleFrameSizeConvBufOut[iCurChanID].GetAll ( vecvecsSendData[i], DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i] ); pCurOpusEncoder,
} iCeltNumCodedBytes,
iClientFrameSizeSamples,
for ( int iB = 0; iB < vecNumFrameSizeConvBlocks[i]; iB++ ) iCurNumAudChan,
{ iNumClients,
// OPUS encoding vecvecsSendData[i] );
if ( CurOpusEncoder != nullptr )
{
// TODO find a better place than this: the setting does not change all the time
// so for speed optimization it would be better to set it only if the network
// frame size is changed
opus_custom_encoder_ctl ( CurOpusEncoder,
OPUS_SET_BITRATE ( CalcBitRateBitsPerSecFromCodedBytes ( iCeltNumCodedBytes, iClientFrameSizeSamples ) ) );
iUnused = opus_custom_encode ( CurOpusEncoder,
&vecvecsSendData[i][iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]],
iClientFrameSizeSamples,
&vecvecbyCodedData[i][0],
iCeltNumCodedBytes );
}
// send separate mix to current clients
vecChannels[iCurChanID].PrepAndSendPacket ( &Socket,
vecvecbyCodedData[i],
iCeltNumCodedBytes );
}
}
// update socket buffer size // update socket buffer size
vecChannels[iCurChanID].UpdateSocketBufferSize(); vecChannels[iCurChanID].UpdateSocketBufferSize();
@ -1121,16 +1089,23 @@ opus_custom_encoder_ctl ( CurOpusEncoder,
} }
/// @brief Mix all audio data from all clients together. /// @brief Mix all audio data from all clients together.
void CServer::ProcessData ( const CVector<CVector<int16_t> >& vecvecsData, void CServer::MixEncodeTransmitData ( const CVector<CVector<int16_t> >& vecvecsData,
const CVector<double>& vecdGains, const CVector<double>& vecdGains,
const CVector<double>& vecdPannings, const CVector<double>& vecdPannings,
const CVector<int>& vecNumAudioChannels, const CVector<int>& vecNumAudioChannels,
CVector<double>& vecdIntermProcBuf, CVector<double>& vecdIntermProcBuf,
CVector<int16_t>& vecsOutData, CVector<uint8_t>& vecbyCodedData,
const int iCurNumAudChan, CConvBuf<int16_t>& DoubleFrameSizeConvBufOut,
const int iNumClients ) const int iUseDoubleSysFraSizeConvBuf,
const int iNumFrameSizeConvBlocks,
OpusCustomEncoder* pCurOpusEncoder,
const int iCeltNumCodedBytes,
const int iClientFrameSizeSamples,
const int iCurNumAudChan,
const int iNumClients,
CVector<int16_t>& vecsOutData )
{ {
int i, j, k; int i, j, k, iUnused;
// init intermediate processing vector with zeros since we mix all channels on that vector // init intermediate processing vector with zeros since we mix all channels on that vector
vecdIntermProcBuf.Reset ( 0 ); vecdIntermProcBuf.Reset ( 0 );
@ -1262,6 +1237,47 @@ void CServer::ProcessData ( const CVector<CVector<int16_t> >& vecvecsData,
vecsOutData[i] = Double2Short ( vecdIntermProcBuf[i] ); vecsOutData[i] = Double2Short ( vecdIntermProcBuf[i] );
} }
} }
// If the server frame size is smaller than the received OPUS frame size, we need a conversion
// buffer which stores the large buffer.
// Note that we have a shortcut here. If the conversion buffer is not needed, the boolean flag
// is false and the Get() function is not called at all. Therefore if the buffer is not needed
// we do not spend any time in the function but go directly inside the if condition.
if ( ( iUseDoubleSysFraSizeConvBuf == 0 ) ||
DoubleFrameSizeConvBufOut.Put ( vecsOutData, SYSTEM_FRAME_SIZE_SAMPLES * iCurNumAudChan ) )
{
if ( iUseDoubleSysFraSizeConvBuf != 0 )
{
// get the large frame from the conversion buffer
DoubleFrameSizeConvBufOut.GetAll ( vecsOutData, DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES * iCurNumAudChan );
}
for ( int iB = 0; iB < iNumFrameSizeConvBlocks; iB++ )
{
// OPUS encoding
if ( pCurOpusEncoder != nullptr )
{
// TODO find a better place than this: the setting does not change all the time
// so for speed optimization it would be better to set it only if the network
// frame size is changed
opus_custom_encoder_ctl ( pCurOpusEncoder,
OPUS_SET_BITRATE ( CalcBitRateBitsPerSecFromCodedBytes ( iCeltNumCodedBytes, iClientFrameSizeSamples ) ) );
iUnused = opus_custom_encode ( pCurOpusEncoder,
&vecsOutData[iB * SYSTEM_FRAME_SIZE_SAMPLES * iCurNumAudChan],
iClientFrameSizeSamples,
&vecbyCodedData[0],
iCeltNumCodedBytes );
}
// send separate mix to current clients
vecChannels[iCurChanID].PrepAndSendPacket ( &Socket,
vecbyCodedData,
iCeltNumCodedBytes );
}
}
Q_UNUSED ( iUnused )
} }
CVector<CChannelInfo> CServer::CreateChannelList() CVector<CChannelInfo> CServer::CreateChannelList()

23
src/server.h
View file

@ -301,14 +301,21 @@ protected:
void WriteHTMLChannelList(); void WriteHTMLChannelList();
void ProcessData ( const CVector<CVector<int16_t> >& vecvecsData, void MixEncodeTransmitData ( const CVector<CVector<int16_t> >& vecvecsData,
const CVector<double>& vecdGains, const CVector<double>& vecdGains,
const CVector<double>& vecdPannings, const CVector<double>& vecdPannings,
const CVector<int>& vecNumAudioChannels, const CVector<int>& vecNumAudioChannels,
CVector<double>& vecdIntermProcBuf, CVector<double>& vecdIntermProcBuf,
CVector<int16_t>& vecsOutData, CVector<uint8_t>& vecbyCodedData,
const int iCurNumAudChan, CConvBuf<int16_t>& DoubleFrameSizeConvBufOut,
const int iNumClients ); const int iUseDoubleSysFraSizeConvBuf,
const int iNumFrameSizeConvBlocks,
OpusCustomEncoder* pCurOpusEncoder,
const int iCeltNumCodedBytes,
const int iClientFrameSizeSamples,
const int iCurNumAudChan,
const int iNumClients,
CVector<int16_t>& vecsOutData );
virtual void customEvent ( QEvent* pEvent ); virtual void customEvent ( QEvent* pEvent );