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

started OPUS integration by just creating the OPUS objects and do nothing with them right now

Browse source
This commit is contained in:
Volker Fischer 2013-02-16 10:54:40 +00:00
parent 0c2ec12af0
commit f0d46f4fc0
4 changed files with 73 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/client.cpp
View file

@ -51,6 +51,8 @@ CClient::CClient ( const quint16 iPortNumber ) :
bUseDefaultCentralServerAddress ( true ), bUseDefaultCentralServerAddress ( true ),
iServerSockBufNumFrames ( DEF_NET_BUF_SIZE_NUM_BL ) iServerSockBufNumFrames ( DEF_NET_BUF_SIZE_NUM_BL )
{ {
int iOpusError;
// init audio encoder/decoder (mono) // init audio encoder/decoder (mono)
CeltModeMono = cc6_celt_mode_create ( CeltModeMono = cc6_celt_mode_create (
SYSTEM_SAMPLE_RATE_HZ, 1, SYSTEM_FRAME_SIZE_SAMPLES, NULL ); SYSTEM_SAMPLE_RATE_HZ, 1, SYSTEM_FRAME_SIZE_SAMPLES, NULL );
@ -64,6 +66,21 @@ CClient::CClient ( const quint16 iPortNumber ) :
cc6_CELT_SET_COMPLEXITY_REQUEST, cc6_celt_int32_t ( 1 ) ); cc6_CELT_SET_COMPLEXITY_REQUEST, cc6_celt_int32_t ( 1 ) );
#endif #endif
OpusEncoderMono = opus_encoder_create ( SYSTEM_SAMPLE_RATE_HZ,
1,
OPUS_APPLICATION_RESTRICTED_LOWDELAY,
&iOpusError );
OpusDecoderMono = opus_decoder_create ( SYSTEM_SAMPLE_RATE_HZ,
1,
&iOpusError );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC
// set encoder low complexity
opus_encoder_ctl ( OpusEncoderMono,
OPUS_SET_COMPLEXITY ( 1 ) );
#endif
// init audio encoder/decoder (stereo) // init audio encoder/decoder (stereo)
CeltModeStereo = cc6_celt_mode_create ( CeltModeStereo = cc6_celt_mode_create (
SYSTEM_SAMPLE_RATE_HZ, 2, SYSTEM_FRAME_SIZE_SAMPLES, NULL ); SYSTEM_SAMPLE_RATE_HZ, 2, SYSTEM_FRAME_SIZE_SAMPLES, NULL );
@ -77,6 +94,21 @@ CClient::CClient ( const quint16 iPortNumber ) :
cc6_CELT_SET_COMPLEXITY_REQUEST, cc6_celt_int32_t ( 1 ) ); cc6_CELT_SET_COMPLEXITY_REQUEST, cc6_celt_int32_t ( 1 ) );
#endif #endif
OpusEncoderStereo = opus_encoder_create ( SYSTEM_SAMPLE_RATE_HZ,
2,
OPUS_APPLICATION_RESTRICTED_LOWDELAY,
&iOpusError );
OpusDecoderStereo = opus_decoder_create ( SYSTEM_SAMPLE_RATE_HZ,
2,
&iOpusError );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC
// set encoder low complexity
opus_encoder_ctl ( OpusEncoderStereo,
OPUS_SET_COMPLEXITY ( 1 ) );
#endif
// Connections ------------------------------------------------------------- // Connections -------------------------------------------------------------
// connection for protocol // connection for protocol

5
src/client.h
View file

@ -31,6 +31,7 @@
#include <QDateTime> #include <QDateTime>
#include <QMessageBox> #include <QMessageBox>
#include "cc6_celt.h" #include "cc6_celt.h"
#include "opus.h"
#include "global.h" #include "global.h"
#include "socket.h" #include "socket.h"
#include "channel.h" #include "channel.h"
@ -271,6 +272,10 @@ protected:
cc6_CELTMode* CeltModeStereo; cc6_CELTMode* CeltModeStereo;
cc6_CELTEncoder* CeltEncoderStereo; cc6_CELTEncoder* CeltEncoderStereo;
cc6_CELTDecoder* CeltDecoderStereo; cc6_CELTDecoder* CeltDecoderStereo;
OpusEncoder* OpusEncoderMono;
OpusDecoder* OpusDecoderMono;
OpusEncoder* OpusEncoderStereo;
OpusDecoder* OpusDecoderStereo;
int iCeltNumCodedBytes; int iCeltNumCodedBytes;
bool bCeltDoHighQuality; bool bCeltDoHighQuality;
bool bUseStereo; bool bUseStereo;

31
src/server.cpp
View file

@ -186,6 +186,7 @@ CServer::CServer ( const int iNewNumChan,
bAutoRunMinimized ( false ), bAutoRunMinimized ( false ),
strWelcomeMessage ( strNewWelcomeMessage ) strWelcomeMessage ( strNewWelcomeMessage )
{ {
int iOpusError;
int i; int i;
// create CELT encoder/decoder for each channel (must be done before // create CELT encoder/decoder for each channel (must be done before
@ -206,6 +207,21 @@ CServer::CServer ( const int iNewNumChan,
cc6_CELT_SET_COMPLEXITY_REQUEST, cc6_celt_int32_t ( 1 ) ); cc6_CELT_SET_COMPLEXITY_REQUEST, cc6_celt_int32_t ( 1 ) );
#endif #endif
OpusEncoderMono[i] = opus_encoder_create ( SYSTEM_SAMPLE_RATE_HZ,
1,
OPUS_APPLICATION_RESTRICTED_LOWDELAY,
&iOpusError );
OpusDecoderMono[i] = opus_decoder_create ( SYSTEM_SAMPLE_RATE_HZ,
1,
&iOpusError );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC
// set encoder low complexity
opus_encoder_ctl ( OpusEncoderMono[i],
OPUS_SET_COMPLEXITY ( 1 ) );
#endif
// init audio endocder/decoder (stereo) // init audio endocder/decoder (stereo)
CeltModeStereo[i] = cc6_celt_mode_create ( CeltModeStereo[i] = cc6_celt_mode_create (
SYSTEM_SAMPLE_RATE_HZ, 2, SYSTEM_FRAME_SIZE_SAMPLES, NULL ); SYSTEM_SAMPLE_RATE_HZ, 2, SYSTEM_FRAME_SIZE_SAMPLES, NULL );
@ -218,6 +234,21 @@ CServer::CServer ( const int iNewNumChan,
cc6_celt_encoder_ctl ( CeltEncoderStereo[i], cc6_celt_encoder_ctl ( CeltEncoderStereo[i],
cc6_CELT_SET_COMPLEXITY_REQUEST, cc6_celt_int32_t ( 1 ) ); cc6_CELT_SET_COMPLEXITY_REQUEST, cc6_celt_int32_t ( 1 ) );
#endif #endif
OpusEncoderStereo[i] = opus_encoder_create ( SYSTEM_SAMPLE_RATE_HZ,
2,
OPUS_APPLICATION_RESTRICTED_LOWDELAY,
&iOpusError );
OpusDecoderStereo[i] = opus_decoder_create ( SYSTEM_SAMPLE_RATE_HZ,
2,
&iOpusError );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC
// set encoder low complexity
opus_encoder_ctl ( OpusEncoderStereo[i],
OPUS_SET_COMPLEXITY ( 1 ) );
#endif
} }
// define colors for chat window identifiers // define colors for chat window identifiers

5
src/server.h
View file

@ -30,6 +30,7 @@
#include <QDateTime> #include <QDateTime>
#include <QHostAddress> #include <QHostAddress>
#include "cc6_celt.h" #include "cc6_celt.h"
#include "opus.h"
#include "global.h" #include "global.h"
#include "socket.h" #include "socket.h"
#include "channel.h" #include "channel.h"
@ -213,6 +214,10 @@ protected:
cc6_CELTMode* CeltModeStereo[MAX_NUM_CHANNELS]; cc6_CELTMode* CeltModeStereo[MAX_NUM_CHANNELS];
cc6_CELTEncoder* CeltEncoderStereo[MAX_NUM_CHANNELS]; cc6_CELTEncoder* CeltEncoderStereo[MAX_NUM_CHANNELS];
cc6_CELTDecoder* CeltDecoderStereo[MAX_NUM_CHANNELS]; cc6_CELTDecoder* CeltDecoderStereo[MAX_NUM_CHANNELS];
OpusEncoder* OpusEncoderMono[MAX_NUM_CHANNELS];
OpusDecoder* OpusDecoderMono[MAX_NUM_CHANNELS];
OpusEncoder* OpusEncoderStereo[MAX_NUM_CHANNELS];
OpusDecoder* OpusDecoderStereo[MAX_NUM_CHANNELS];
CVector<QString> vstrChatColors; CVector<QString> vstrChatColors;