diff --git a/src_FIX/SKP_Silk_NLSF_MSVQ_encode_FIX.c b/src_FIX/SKP_Silk_NLSF_MSVQ_encode_FIX.c
index aa357f289dcf18013d21f4428df714bf4e8ceff3..2e926bb474b105ea916c2bcd147f77e1b174d96a 100644
--- a/src_FIX/SKP_Silk_NLSF_MSVQ_encode_FIX.c
+++ b/src_FIX/SKP_Silk_NLSF_MSVQ_encode_FIX.c
@@ -49,16 +49,6 @@ void SKP_Silk_NLSF_MSVQ_encode_FIX(
SKP_int32 se_Q15, wsse_Q20, bestRateDist_Q20;
#endif
-#if( LOW_COMPLEXITY_ONLY == 1 )
- SKP_int32 pRateDist_Q18[ NLSF_MSVQ_TREE_SEARCH_MAX_VECTORS_EVALUATED_LC_MODE ];
- SKP_int32 pRate_Q5[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE ];
- SKP_int32 pRate_new_Q5[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE ];
- SKP_int pTempIndices[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE ];
- SKP_int pPath[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE * NLSF_MSVQ_MAX_CB_STAGES ];
- SKP_int pPath_new[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE * NLSF_MSVQ_MAX_CB_STAGES ];
- SKP_int pRes_Q15[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE * MAX_LPC_ORDER ];
- SKP_int pRes_new_Q15[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE * MAX_LPC_ORDER ];
-#else
SKP_int32 pRateDist_Q18[ NLSF_MSVQ_TREE_SEARCH_MAX_VECTORS_EVALUATED ];
SKP_int32 pRate_Q5[ MAX_NLSF_MSVQ_SURVIVORS ];
SKP_int32 pRate_new_Q5[ MAX_NLSF_MSVQ_SURVIVORS ];
@@ -67,7 +57,6 @@ void SKP_Silk_NLSF_MSVQ_encode_FIX(
SKP_int pPath_new[ MAX_NLSF_MSVQ_SURVIVORS * NLSF_MSVQ_MAX_CB_STAGES ];
SKP_int pRes_Q15[ MAX_NLSF_MSVQ_SURVIVORS * MAX_LPC_ORDER ];
SKP_int pRes_new_Q15[ MAX_NLSF_MSVQ_SURVIVORS * MAX_LPC_ORDER ];
-#endif
const SKP_int *pConstInt;
SKP_int *pInt;
@@ -75,7 +64,6 @@ void SKP_Silk_NLSF_MSVQ_encode_FIX(
const SKP_Silk_NLSF_CBS *pCurrentCBStage;
SKP_assert( NLSF_MSVQ_Survivors <= MAX_NLSF_MSVQ_SURVIVORS );
- SKP_assert( ( LOW_COMPLEXITY_ONLY == 0 ) || ( NLSF_MSVQ_Survivors <= MAX_NLSF_MSVQ_SURVIVORS_LC_MODE ) );
#ifdef SAVE_ALL_INTERNAL_DATA
DEBUG_STORE_DATA( NLSF.dat, pNLSF_Q15, LPC_order * sizeof( SKP_int ) );
diff --git a/src_FLP/SKP_Silk_NLSF_MSVQ_encode_FLP.c b/src_FLP/SKP_Silk_NLSF_MSVQ_encode_FLP.c
index 94f5810a10dee669e99d7d7087ecdbbe8968e14e..585bf7770d84e5e85d998ba1de2fe1f4aae3e55d 100644
--- a/src_FLP/SKP_Silk_NLSF_MSVQ_encode_FLP.c
+++ b/src_FLP/SKP_Silk_NLSF_MSVQ_encode_FLP.c
@@ -49,16 +49,6 @@ void SKP_Silk_NLSF_MSVQ_encode_FLP(
SKP_float se, wsse, bestRateDist;
#endif
-#if( LOW_COMPLEXITY_ONLY == 1 )
- SKP_float pRateDist[ NLSF_MSVQ_TREE_SEARCH_MAX_VECTORS_EVALUATED_LC_MODE ];
- SKP_float pRate[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE ];
- SKP_float pRate_new[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE ];
- SKP_int pTempIndices[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE ];
- SKP_int pPath[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE * NLSF_MSVQ_MAX_CB_STAGES ];
- SKP_int pPath_new[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE * NLSF_MSVQ_MAX_CB_STAGES ];
- SKP_float pRes_Q8[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE * MAX_LPC_ORDER ];
- SKP_float pRes_Q8_new[ MAX_NLSF_MSVQ_SURVIVORS_LC_MODE * MAX_LPC_ORDER ];
-#else
SKP_float pRateDist[ NLSF_MSVQ_TREE_SEARCH_MAX_VECTORS_EVALUATED ];
SKP_float pRate[ MAX_NLSF_MSVQ_SURVIVORS ];
SKP_float pRate_new[ MAX_NLSF_MSVQ_SURVIVORS ];
@@ -67,7 +57,6 @@ void SKP_Silk_NLSF_MSVQ_encode_FLP(
SKP_int pPath_new[ MAX_NLSF_MSVQ_SURVIVORS * NLSF_MSVQ_MAX_CB_STAGES ];
SKP_float pRes_Q8[ MAX_NLSF_MSVQ_SURVIVORS * MAX_LPC_ORDER ];
SKP_float pRes_Q8_new[ MAX_NLSF_MSVQ_SURVIVORS * MAX_LPC_ORDER ];
-#endif
const SKP_float *pConstFloat;
SKP_float *pFloat;
@@ -77,7 +66,6 @@ void SKP_Silk_NLSF_MSVQ_encode_FLP(
const SKP_Silk_NLSF_CBS *pCurrentCBStage;
SKP_assert( NLSF_MSVQ_Survivors <= MAX_NLSF_MSVQ_SURVIVORS );
- SKP_assert( ( LOW_COMPLEXITY_ONLY == 0 ) || ( NLSF_MSVQ_Survivors <= MAX_NLSF_MSVQ_SURVIVORS_LC_MODE ) );
#ifdef SAVE_ALL_INTERNAL_DATA
DEBUG_STORE_DATA( NLSF.dat, pNLSF, LPC_order * sizeof( SKP_float ) );
diff --git a/src_FLP/SKP_Silk_encode_frame_FLP.c b/src_FLP/SKP_Silk_encode_frame_FLP.c
index 08ed3beea3098d59520704fcf8869f82c4354a6a..7a19b4f2a0da07f93130424a8d42e3fcb734ed5d 100644
--- a/src_FLP/SKP_Silk_encode_frame_FLP.c
+++ b/src_FLP/SKP_Silk_encode_frame_FLP.c
@@ -80,7 +80,7 @@ TOC(VAD)
} else {
psEnc->sCmn.noSpeechCounter = 0;
psEnc->sCmn.inDTX = 0;
- sEncCtrl.sCmn.signalType = TYPE_UNVOICED;
+ sEncCtrl.sCmn.signalType = TYPE_UNVOICED;
}
/*******************************************/
diff --git a/src_common/SKP_Silk_define.h b/src_common/SKP_Silk_define.h
index fbfdd7e522096470e9908cf5ff4547942a68c216..3b25aee049f51820de8ebe28a1d3353f885753ae 100644
--- a/src_common/SKP_Silk_define.h
+++ b/src_common/SKP_Silk_define.h
@@ -89,9 +89,6 @@ extern "C"
#define CONCEC_SWB_SMPLS_THRES 480 * 15 /* 300 ms */
#define WB_DETECT_ACTIVE_SPEECH_MS_THRES 15000 /* ms of active speech needed for WB detection */
-/* Low complexity setting */
-#define LOW_COMPLEXITY_ONLY 0
-
/* Activate bandwidth transition filtering for mode switching */
#define SWITCH_TRANSITION_FILTERING 1
diff --git a/src_common/SKP_Silk_setup_complexity.h b/src_common/SKP_Silk_setup_complexity.h
index 42e8108c8b62bedf6a0b6e14e9bf96687e86291e..bc6534fa4a01823295d7a007535b103fc415d354 100644
--- a/src_common/SKP_Silk_setup_complexity.h
+++ b/src_common/SKP_Silk_setup_complexity.h
@@ -35,13 +35,8 @@ SKP_INLINE SKP_int SKP_Silk_setup_complexity(
{
SKP_int ret = 0;
- /* Check that settings are valid */
- if( LOW_COMPLEXITY_ONLY && Complexity != 0 ) {
- ret = SKP_SILK_ENC_INVALID_COMPLEXITY_SETTING;
- }
-
/* Set encoding complexity */
- if( Complexity < 2 || LOW_COMPLEXITY_ONLY ) {
+ if( Complexity < 2 ) {
psEncC->pitchEstimationComplexity = SKP_Silk_PE_MIN_COMPLEX;
psEncC->pitchEstimationThreshold_Q16 = SKP_FIX_CONST( 0.8, 16 );
psEncC->pitchEstimationLPCOrder = 6;
@@ -52,7 +47,7 @@ SKP_INLINE SKP_int SKP_Silk_setup_complexity(
psEncC->LTPQuantLowComplexity = 1;
psEncC->NLSF_MSVQ_Survivors = 2;
psEncC->warping_Q16 = 0;
- } else if( Complexity < 4 || LOW_COMPLEXITY_ONLY ) {
+ } else if( Complexity < 4 ) {
psEncC->pitchEstimationComplexity = SKP_Silk_PE_MID_COMPLEX;
psEncC->pitchEstimationThreshold_Q16 = SKP_FIX_CONST( 0.76, 16 );
psEncC->pitchEstimationLPCOrder = 8;