diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-05-22 00:52:59 -0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-06-02 15:13:35 -0400 |
| commit | 676a1a34e752fe0594ec707c6c04822bdd1db621 (patch) | |
| tree | de85bd4280716de50312a64545d3d51fe10267a7 | |
| parent | 46d1dee6190dd59abb4482fa8e11cad619ea1af5 (diff) | |
| download | opus-676a1a34e752fe0594ec707c6c04822bdd1db621.tar.gz | |
NLSF_VQ_MAX_SURVIVORS is no longer useful
| -rw-r--r-- | silk/NLSF_encode.c | 1 | ||||
| -rw-r--r-- | silk/control_codec.c | 1 | ||||
| -rw-r--r-- | silk/define.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/silk/NLSF_encode.c b/silk/NLSF_encode.c index fb3b04b8..268b9a19 100644 --- a/silk/NLSF_encode.c +++ b/silk/NLSF_encode.c @@ -60,7 +60,6 @@ opus_int32 silk_NLSF_encode( /* O Returns 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 ); diff --git a/silk/control_codec.c b/silk/control_codec.c index 5426e1e1..071e066f 100644 --- a/silk/control_codec.c +++ b/silk/control_codec.c @@ -387,7 +387,6 @@ static opus_int silk_setup_complexity( 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; } diff --git a/silk/define.h b/silk/define.h index 5abf0810..520cdbfc 100644 --- a/silk/define.h +++ b/silk/define.h @@ -205,7 +205,6 @@ extern "C" /******************/ #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 |