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

support for OPUS codec

Browse source
This commit is contained in:
Volker Fischer 2013-02-16 18:16:12 +00:00
parent 0c4f22eaa2
commit eb277e3a96
1 changed files with 120 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
src/server.cpp
View file

@ -216,6 +216,10 @@ CServer::CServer ( const int iNewNumChan,
1, 1,
&iOpusError ); &iOpusError );
// we require a constant bit rate
opus_encoder_ctl ( OpusEncoderMono[i],
OPUS_SET_VBR ( 0 ) );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC #ifdef USE_LOW_COMPLEXITY_CELT_ENC
// set encoder low complexity // set encoder low complexity
opus_encoder_ctl ( OpusEncoderMono[i], opus_encoder_ctl ( OpusEncoderMono[i],
@ -244,6 +248,10 @@ CServer::CServer ( const int iNewNumChan,
2, 2,
&iOpusError ); &iOpusError );
// we require a constant bit rate
opus_encoder_ctl ( OpusEncoderStereo[i],
OPUS_SET_VBR ( 0 ) );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC #ifdef USE_LOW_COMPLEXITY_CELT_ENC
// set encoder low complexity // set encoder low complexity
opus_encoder_ctl ( OpusEncoderStereo[i], opus_encoder_ctl ( OpusEncoderStereo[i],
@ -615,18 +623,44 @@ void CServer::OnTimer()
if ( iCurNumAudChan == 1 ) if ( iCurNumAudChan == 1 )
{ {
// mono // mono
cc6_celt_decode ( CeltDecoderMono[iCurChanID],
if ( vecChannels[iCurChanID].GetAudioCompressionType() == CT_CELT )
{
cc6_celt_decode ( CeltDecoderMono[iCurChanID],
&vecbyData[0],
iCeltNumCodedBytes,
&vecvecsData[i][0] );
}
else
{
opus_decode ( OpusDecoderMono[iCurChanID],
&vecbyData[0], &vecbyData[0],
iCeltNumCodedBytes, iCeltNumCodedBytes,
&vecvecsData[i][0] ); &vecvecsData[i][0],
SYSTEM_FRAME_SIZE_SAMPLES,
0 );
}
} }
else else
{ {
// stereo // stereo
cc6_celt_decode ( CeltDecoderStereo[iCurChanID],
if ( vecChannels[iCurChanID].GetAudioCompressionType() == CT_CELT )
{
cc6_celt_decode ( CeltDecoderStereo[iCurChanID],
&vecbyData[0],
iCeltNumCodedBytes,
&vecvecsData[i][0] );
}
else
{
opus_decode ( OpusDecoderStereo[iCurChanID],
&vecbyData[0], &vecbyData[0],
iCeltNumCodedBytes, iCeltNumCodedBytes,
&vecvecsData[i][0] ); &vecvecsData[i][0],
SYSTEM_FRAME_SIZE_SAMPLES,
0 );
}
} }
} }
else else
@ -635,18 +669,44 @@ void CServer::OnTimer()
if ( iCurNumAudChan == 1 ) if ( iCurNumAudChan == 1 )
{ {
// mono // mono
cc6_celt_decode ( CeltDecoderMono[iCurChanID],
if ( vecChannels[iCurChanID].GetAudioCompressionType() == CT_CELT )
{
cc6_celt_decode ( CeltDecoderMono[iCurChanID],
NULL,
0,
&vecvecsData[i][0] );
}
else
{
opus_decode ( OpusDecoderMono[iCurChanID],
NULL, NULL,
0, iCeltNumCodedBytes,
&vecvecsData[i][0] ); &vecvecsData[i][0],
SYSTEM_FRAME_SIZE_SAMPLES,
0 );
}
} }
else else
{ {
// stereo // stereo
cc6_celt_decode ( CeltDecoderStereo[iCurChanID],
if ( vecChannels[iCurChanID].GetAudioCompressionType() == CT_CELT )
{
cc6_celt_decode ( CeltDecoderStereo[iCurChanID],
NULL,
0,
&vecvecsData[i][0] );
}
else
{
opus_decode ( OpusDecoderStereo[iCurChanID],
NULL, NULL,
0, iCeltNumCodedBytes,
&vecvecsData[i][0] ); &vecvecsData[i][0],
SYSTEM_FRAME_SIZE_SAMPLES,
0 );
}
} }
} }
@ -694,26 +754,72 @@ void CServer::OnTimer()
const int iCeltNumCodedBytes = const int iCeltNumCodedBytes =
vecChannels[iCurChanID].GetNetwFrameSize(); vecChannels[iCurChanID].GetNetwFrameSize();
// 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
const int iCeltBitRateBitsPerSec =
( SYSTEM_SAMPLE_RATE_HZ * iCeltNumCodedBytes * 8 ) /
SYSTEM_FRAME_SIZE_SAMPLES;
// CELT encoding // CELT encoding
CVector<unsigned char> vecCeltData ( iCeltNumCodedBytes ); CVector<unsigned char> vecCeltData ( iCeltNumCodedBytes );
if ( vecChannels[iCurChanID].GetNumAudioChannels() == 1 ) if ( vecChannels[iCurChanID].GetNumAudioChannels() == 1 )
{ {
// mono // mono
cc6_celt_encode ( CeltEncoderMono[iCurChanID],
if ( vecChannels[iCurChanID].GetAudioCompressionType() == CT_CELT )
{
cc6_celt_encode ( CeltEncoderMono[iCurChanID],
&vecsSendData[0],
NULL,
&vecCeltData[0],
iCeltNumCodedBytes );
}
else
{
// 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_encoder_ctl ( OpusEncoderMono[iCurChanID],
OPUS_SET_BITRATE ( iCeltBitRateBitsPerSec ) );
opus_encode ( OpusEncoderMono[iCurChanID],
&vecsSendData[0], &vecsSendData[0],
NULL, SYSTEM_FRAME_SIZE_SAMPLES,
&vecCeltData[0], &vecCeltData[0],
iCeltNumCodedBytes ); iCeltNumCodedBytes );
}
} }
else else
{ {
// stereo // stereo
cc6_celt_encode ( CeltEncoderStereo[iCurChanID],
if ( vecChannels[iCurChanID].GetAudioCompressionType() == CT_CELT )
{
cc6_celt_encode ( CeltEncoderStereo[iCurChanID],
&vecsSendData[0],
NULL,
&vecCeltData[0],
iCeltNumCodedBytes );
}
else
{
// 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_encoder_ctl ( OpusEncoderStereo[iCurChanID],
OPUS_SET_BITRATE ( iCeltBitRateBitsPerSec ) );
opus_encode ( OpusEncoderStereo[iCurChanID],
&vecsSendData[0], &vecsSendData[0],
NULL, SYSTEM_FRAME_SIZE_SAMPLES,
&vecCeltData[0], &vecCeltData[0],
iCeltNumCodedBytes ); iCeltNumCodedBytes );
}
} }
// send separate mix to current clients // send separate mix to current clients