ref: e437424c2398aeed9f035e8b381ebcf2c698c0fb
parent: 8daa4d373948aadbd155f03b3dbc2ce658dfac12
author: Jean-Marc Valin <jmvalin@jmvalin.ca>
date: Sat May 21 20:52:59 EDT 2016
NLSF_VQ_MAX_SURVIVORS is no longer useful
--- a/silk/NLSF_encode.c
+++ b/silk/NLSF_encode.c
@@ -60,7 +60,6 @@
const opus_int16 *pCB_Wght_Q9;
SAVE_STACK;
- silk_assert( nSurvivors <= NLSF_VQ_MAX_SURVIVORS );
silk_assert( signalType >= 0 && signalType <= 2 );
silk_assert( NLSF_mu_Q20 <= 32767 && NLSF_mu_Q20 >= 0 );
--- a/silk/control_codec.c
+++ b/silk/control_codec.c
@@ -387,7 +387,6 @@
silk_assert( psEncC->warping_Q16 <= 32767 );
silk_assert( psEncC->la_shape <= LA_SHAPE_MAX );
silk_assert( psEncC->shapeWinLength <= SHAPE_LPC_WIN_MAX );
- silk_assert( psEncC->NLSF_MSVQ_Survivors <= NLSF_VQ_MAX_SURVIVORS );
return ret;
}
--- a/silk/define.h
+++ b/silk/define.h
@@ -205,7 +205,6 @@
/******************/
#define NLSF_W_Q 2
#define NLSF_VQ_MAX_VECTORS 32
-#define NLSF_VQ_MAX_SURVIVORS 16
#define NLSF_QUANT_MAX_AMPLITUDE 4
#define NLSF_QUANT_MAX_AMPLITUDE_EXT 10
#define NLSF_QUANT_LEVEL_ADJ 0.1