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

only use low complexity OPUS processing for 128 samples frame size, see https://sourceforge.net/p/llcon/discussion/533517/thread/bdb3fe2195

Browse source
This commit is contained in:
Volker Fischer 2020-04-04 12:40:13 +02:00
parent 61ea6ca0d0
commit 5a05bf6a2f
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client.cpp
View file

@ -92,8 +92,8 @@ CClient::CClient ( const quint16 iPortNumber,
opus_custom_encoder_ctl ( OpusEncoderMono, opus_custom_encoder_ctl ( OpusEncoderMono,
OPUS_SET_APPLICATION ( OPUS_APPLICATION_RESTRICTED_LOWDELAY ) ); OPUS_SET_APPLICATION ( OPUS_APPLICATION_RESTRICTED_LOWDELAY ) );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC #if ( SYSTEM_FRAME_SIZE_SAMPLES == 128 )
// set encoder low complexity // set encoder low complexity for legacy 128 samples frame size
opus_custom_encoder_ctl ( OpusEncoderMono, opus_custom_encoder_ctl ( OpusEncoderMono,
OPUS_SET_COMPLEXITY ( 1 ) ); OPUS_SET_COMPLEXITY ( 1 ) );
#endif #endif
@ -115,8 +115,8 @@ CClient::CClient ( const quint16 iPortNumber,
opus_custom_encoder_ctl ( OpusEncoderStereo, opus_custom_encoder_ctl ( OpusEncoderStereo,
OPUS_SET_APPLICATION ( OPUS_APPLICATION_RESTRICTED_LOWDELAY ) ); OPUS_SET_APPLICATION ( OPUS_APPLICATION_RESTRICTED_LOWDELAY ) );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC #if ( SYSTEM_FRAME_SIZE_SAMPLES == 128 )
// set encoder low complexity // set encoder low complexity for legacy 128 samples frame size
opus_custom_encoder_ctl ( OpusEncoderStereo, opus_custom_encoder_ctl ( OpusEncoderStereo,
OPUS_SET_COMPLEXITY ( 1 ) ); OPUS_SET_COMPLEXITY ( 1 ) );
#endif #endif

3
src/global.h
View file

@ -129,9 +129,6 @@ LED bar: lbr
#define FRAME_SIZE_FACTOR_DEFAULT 2 // 256 (for frame size 128), 128 (for frame size 64) #define FRAME_SIZE_FACTOR_DEFAULT 2 // 256 (for frame size 128), 128 (for frame size 64)
#define FRAME_SIZE_FACTOR_SAFE 4 // 512 (for frame size 128), 256 (for frame size 64) #define FRAME_SIZE_FACTOR_SAFE 4 // 512 (for frame size 128), 256 (for frame size 64)
// low complexity CELT encoder (if defined)
#define USE_LOW_COMPLEXITY_CELT_ENC
// define the minimum allowed number of coded bytes for CELT (the encoder // define the minimum allowed number of coded bytes for CELT (the encoder
// gets in trouble if the value is too low) // gets in trouble if the value is too low)
#define CELT_MINIMUM_NUM_BYTES 10 #define CELT_MINIMUM_NUM_BYTES 10

8
src/server.cpp
View file

@ -266,8 +266,8 @@ CServer::CServer ( const int iNewMaxNumChan,
opus_custom_encoder_ctl ( OpusEncoderMono[i], opus_custom_encoder_ctl ( OpusEncoderMono[i],
OPUS_SET_APPLICATION ( OPUS_APPLICATION_RESTRICTED_LOWDELAY ) ); OPUS_SET_APPLICATION ( OPUS_APPLICATION_RESTRICTED_LOWDELAY ) );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC #if ( SYSTEM_FRAME_SIZE_SAMPLES == 128 )
// set encoder low complexity // set encoder low complexity for legacy 128 samples frame size
opus_custom_encoder_ctl ( OpusEncoderMono[i], opus_custom_encoder_ctl ( OpusEncoderMono[i],
OPUS_SET_COMPLEXITY ( 1 ) ); OPUS_SET_COMPLEXITY ( 1 ) );
#endif #endif
@ -289,8 +289,8 @@ CServer::CServer ( const int iNewMaxNumChan,
opus_custom_encoder_ctl ( OpusEncoderStereo[i], opus_custom_encoder_ctl ( OpusEncoderStereo[i],
OPUS_SET_APPLICATION ( OPUS_APPLICATION_RESTRICTED_LOWDELAY ) ); OPUS_SET_APPLICATION ( OPUS_APPLICATION_RESTRICTED_LOWDELAY ) );
#ifdef USE_LOW_COMPLEXITY_CELT_ENC #if ( SYSTEM_FRAME_SIZE_SAMPLES == 128 )
// set encoder low complexity // set encoder low complexity for legacy 128 samples frame size
opus_custom_encoder_ctl ( OpusEncoderStereo[i], opus_custom_encoder_ctl ( OpusEncoderStereo[i],
OPUS_SET_COMPLEXITY ( 1 ) ); OPUS_SET_COMPLEXITY ( 1 ) );
#endif #endif