NLSF_VQ_MAX_SURVIVORS is no longer useful
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Sun, 22 May 2016 04:52:59 +0000 (00:52 -0400)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Sun, 17 Jul 2016 19:05:54 +0000 (15:05 -0400)
silk/NLSF_encode.c
silk/control_codec.c
silk/define.h

index fb3b04b..268b9a1 100644 (file)
@@ -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 );
 
index 5426e1e..071e066 100644 (file)
@@ -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;
 }
index 5abf081..520cdbf 100644 (file)
@@ -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