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

some code cleanup

Browse source
This commit is contained in:
Volker Fischer 2020-04-05 17:35:40 +02:00
parent a761f9bf9e
commit bd111c3abc
2 changed files with 19 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/server.cpp
View file

@ -316,11 +316,12 @@ CServer::CServer ( const int iNewMaxNumChan,
vecsSendData.Init ( 2 /* stereo */ * DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES /* worst case buffer size */ ); vecsSendData.Init ( 2 /* stereo */ * DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES /* worst case buffer size */ );
// allocate worst case memory for the temporary vectors // allocate worst case memory for the temporary vectors
vecChanIDsCurConChan.Init ( iMaxNumChannels ); vecChanIDsCurConChan.Init ( iMaxNumChannels );
vecvecdGains.Init ( iMaxNumChannels ); vecvecdGains.Init ( iMaxNumChannels );
vecvecsData.Init ( iMaxNumChannels ); vecvecsData.Init ( iMaxNumChannels );
vecNumAudioChannels.Init ( iMaxNumChannels ); vecNumAudioChannels.Init ( iMaxNumChannels );
vecAudioComprType.Init ( iMaxNumChannels ); vecNumFrameSizeConvBlocks.Init ( iMaxNumChannels );
vecAudioComprType.Init ( iMaxNumChannels );
for ( i = 0; i < iMaxNumChannels; i++ ) for ( i = 0; i < iMaxNumChannels; i++ )
{ {
@ -892,6 +893,16 @@ JitterMeas.Measure();
vecNumAudioChannels[i] = vecChannels[iCurChanID].GetNumAudioChannels(); vecNumAudioChannels[i] = vecChannels[iCurChanID].GetNumAudioChannels();
vecAudioComprType[i] = vecChannels[iCurChanID].GetAudioCompressionType(); vecAudioComprType[i] = vecChannels[iCurChanID].GetAudioCompressionType();
// get info about required frame size conversion properties
if ( bUseDoubleSystemFrameSize && ( vecAudioComprType[i] == CT_OPUS64 ) )
{
vecNumFrameSizeConvBlocks[i] = 2;
}
else
{
vecNumFrameSizeConvBlocks[i] = 1;
}
// select the opus decoder and raw audio frame length // select the opus decoder and raw audio frame length
if ( vecAudioComprType[i] == CT_OPUS ) if ( vecAudioComprType[i] == CT_OPUS )
{ {
@ -940,22 +951,7 @@ JitterMeas.Measure();
// 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();
// TODO for ( int iB = 0; iB < vecNumFrameSizeConvBlocks[i]; iB++ )
const bool bIsServerDoubleFrameSize = bUseDoubleSystemFrameSize && ( vecAudioComprType[i] == CT_OPUS64 );
const bool bIsClientDoubleFrameSize = !bUseDoubleSystemFrameSize && ( vecAudioComprType[i] == CT_OPUS );
const bool bIsCompatibleFramesSize = !( bIsServerDoubleFrameSize || bIsClientDoubleFrameSize );
//bUseDoubleSystemFrameSize
//ConvBuf
//CConvBuf<uint8_t> ConvBufIn; // TEST NOT WORKING!!!!
//ConvBufIn.Put ( );
int iNumInBlocks = 1;
if ( bIsServerDoubleFrameSize )
{
iNumInBlocks = 2;
}
for ( int iB = 0; iB < iNumInBlocks; iB++ )
{ {
// get data // get data
const EGetDataStat eGetStat = vecChannels[iCurChanID].GetData ( vecbyCodedData, iCeltNumCodedBytes ); const EGetDataStat eGetStat = vecChannels[iCurChanID].GetData ( vecbyCodedData, iCeltNumCodedBytes );
@ -1073,18 +1069,7 @@ if ( bIsServerDoubleFrameSize )
CurOpusEncoder = nullptr; CurOpusEncoder = nullptr;
} }
// TODO copied code from above!!! for ( int iB = 0; iB < vecNumFrameSizeConvBlocks[i]; iB++ )
const bool bIsServerDoubleFrameSize = bUseDoubleSystemFrameSize && ( vecAudioComprType[i] == CT_OPUS64 );
const bool bIsClientDoubleFrameSize = !bUseDoubleSystemFrameSize && ( vecAudioComprType[i] == CT_OPUS );
const bool bIsCompatibleFramesSize = !( bIsServerDoubleFrameSize || bIsClientDoubleFrameSize );
int iNumInBlocks = 1;
if ( bIsServerDoubleFrameSize )
{
iNumInBlocks = 2;
}
for ( int iB = 0; iB < iNumInBlocks; iB++ )
{ {
// OPUS encoding // OPUS encoding
if ( CurOpusEncoder != nullptr ) if ( CurOpusEncoder != nullptr )

1
src/server.h
View file

@ -250,6 +250,7 @@ protected:
CVector<CVector<double> > vecvecdGains; CVector<CVector<double> > vecvecdGains;
CVector<CVector<int16_t> > vecvecsData; CVector<CVector<int16_t> > vecvecsData;
CVector<int> vecNumAudioChannels; CVector<int> vecNumAudioChannels;
CVector<int> vecNumFrameSizeConvBlocks;
CVector<EAudComprType> vecAudioComprType; CVector<EAudComprType> vecAudioComprType;
CVector<int16_t> vecsSendData; CVector<int16_t> vecsSendData;
CVector<uint8_t> vecbyCodedData; CVector<uint8_t> vecbyCodedData;