Removes a number of macro definitions which are used nowhere in the codebase.

9 files changed, 1 insertions, 31 deletions

diff --git a/silk/MacroCount.h b/silk/MacroCount.h
index 509c9c2d..0c3e680c 100644
--- a/silk/MacroCount.h
+++ b/silk/MacroCount.h
@@ -710,7 +710,6 @@ static inline opus_int silk_LIMIT_32(opus_int32 a, opus_int32 limit1, opus_int32
 }
 
 #else
-#define exVarDefine
 #define varDefine
 #define silk_SaveCount()
 
diff --git a/silk/PLC.h b/silk/PLC.h
index 6233fa6d..d0f618eb 100644
--- a/silk/PLC.h
+++ b/silk/PLC.h
@@ -34,7 +34,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define V_PITCH_GAIN_START_MIN_Q14      11469               /* 0.7 in Q14               */
 #define V_PITCH_GAIN_START_MAX_Q14      15565               /* 0.95 in Q14              */
 #define MAX_PITCH_LAG_MS                18
-#define SA_THRES_Q8                     50
 #define RAND_BUF_SIZE                   128
 #define RAND_BUF_MASK                   ( RAND_BUF_SIZE - 1 )
 #define LOG2_INV_LPC_GAIN_HIGH_THRES    3                   /* 2^3 = 8 dB LPC gain      */
diff --git a/silk/SigProc_FIX.h b/silk/SigProc_FIX.h
index 02d9b78b..19eeecfa 100644
--- a/silk/SigProc_FIX.h
+++ b/silk/SigProc_FIX.h
@@ -483,8 +483,6 @@ static inline opus_int32 silk_ROR32( opus_int32 a32, opus_int rot )
 #define silk_RSHIFT(a, shift)               silk_RSHIFT32(a, shift)                         /* shift >= 0, shift < 32 */
 
 /* saturates before shifting */
-#define silk_LSHIFT_SAT16(a, shift)         (silk_LSHIFT16( silk_LIMIT( (a), silk_RSHIFT16( silk_int16_MIN, (shift) ), \
-                                                    silk_RSHIFT16( silk_int16_MAX, (shift) ) ), (shift) ))
 #define silk_LSHIFT_SAT32(a, shift)         (silk_LSHIFT32( silk_LIMIT( (a), silk_RSHIFT32( silk_int32_MIN, (shift) ), \
                                                     silk_RSHIFT32( silk_int32_MAX, (shift) ) ), (shift) ))
 
@@ -566,8 +564,6 @@ static inline opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
 
 #define silk_sign(a)                        ((a) > 0 ? 1 : ( (a) < 0 ? -1 : 0 ))
 
-#define silk_sqrt(a)                        (sqrt(a))
-
 /* PSEUDO-RANDOM GENERATOR                                                          */
 /* Make sure to store the result as the seed for the next call (also in between     */
 /* frames), otherwise result won't be random at all. When only using some of the    */
diff --git a/silk/debug.h b/silk/debug.h
index 5a6b1a15..8c7a6696 100644
--- a/silk/debug.h
+++ b/silk/debug.h
@@ -269,9 +269,6 @@ extern int silk_debug_store_count;
     }                                                               \
 }
 
-/* micro sec */
-#define silk_GETTIME(void)       time = (opus_int64) silk_GetHighResolutionTime();
-
 #else /* SILK_DEBUG */
 
 /* define macros as empty strings */
diff --git a/silk/define.h b/silk/define.h
index 3dc35959..fbcc6a55 100644
--- a/silk/define.h
+++ b/silk/define.h
@@ -179,11 +179,6 @@ extern "C"
 # define NSQ_LPC_BUF_LENGTH                     DECISION_DELAY
 #endif
 
-/***********************/
-/* High pass filtering */
-/***********************/
-#define HIGH_PASS_INPUT                         1
-
 /***************************/
 /* Voice activity detector */
 /***************************/
diff --git a/silk/float/SigProc_FLP.h b/silk/float/SigProc_FLP.h
index 8b5a1fac..0fd1a6d9 100644
--- a/silk/float/SigProc_FLP.h
+++ b/silk/float/SigProc_FLP.h
@@ -152,9 +152,6 @@ double silk_energy_FLP(
 #define silk_max_float( a, b )                  (((a) > (b)) ? (a) :  (b))
 #define silk_abs_float( a )                     ((silk_float)fabs(a))
 
-#define silk_LIMIT_float( a, limit1, limit2 )   ((limit1) > (limit2) ? ((a) > (limit1) ? (limit1) : ((a) < (limit2) ? (limit2) : (a))) \
-                                                                     : ((a) > (limit2) ? (limit2) : ((a) < (limit1) ? (limit1) : (a))))
-
 /* sigmoid function */
 static inline silk_float silk_sigmoid( silk_float x )
 {
diff --git a/silk/macros.h b/silk/macros.h
index e6121e8b..c2c2a8b8 100644
--- a/silk/macros.h
+++ b/silk/macros.h
@@ -130,7 +130,6 @@ static inline opus_int32 silk_CLZ32(opus_int32 in32)
 #ifndef matrix_c_ptr
 #   define matrix_c_ptr(Matrix_base_adr, row, column, M)    *(Matrix_base_adr + ((row)+(M)*(column)))
 #endif
-#define matrix_c_adr(Matrix_base_adr, row, column, M)        (Matrix_base_adr + ((row)+(M)*(column)))
 
 #endif /* SILK_MACROS_H */
 
diff --git a/silk/pitch_est_defines.h b/silk/pitch_est_defines.h
index 32d2042a..c601a666 100644
--- a/silk/pitch_est_defines.h
+++ b/silk/pitch_est_defines.h
@@ -45,7 +45,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define PE_MAX_FRAME_LENGTH         ( PE_MAX_FRAME_LENGTH_MS * PE_MAX_FS_KHZ )
 #define PE_MAX_FRAME_LENGTH_ST_1    ( PE_MAX_FRAME_LENGTH >> 2 )
 #define PE_MAX_FRAME_LENGTH_ST_2    ( PE_MAX_FRAME_LENGTH >> 1 )
-#define PE_MAX_SF_FRAME_LENGTH      ( PE_SUB_FRAME * PE_MAX_FS_KHZ )
 
 #define PE_MAX_LAG_MS               18           /* 18 ms -> 56 Hz */
 #define PE_MIN_LAG_MS               2            /* 2 ms -> 500 Hz */
@@ -59,9 +58,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define PE_NB_CBKS_STAGE2           3
 #define PE_NB_CBKS_STAGE2_EXT       11
 
-#define PE_CB_mn2                   1
-#define PE_CB_mx2                   2
-
 #define PE_NB_CBKS_STAGE3_MAX       34
 #define PE_NB_CBKS_STAGE3_MID       24
 #define PE_NB_CBKS_STAGE3_MIN       16
diff --git a/silk/typedef.h b/silk/typedef.h
index e259d758..59090f47 100644
--- a/silk/typedef.h
+++ b/silk/typedef.h
@@ -39,8 +39,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdint.h>
 #endif
 
-#define silk_int_ptr_size intptr_t
-
 #if silk_USE_DOUBLE_PRECISION_FLOATS
 # define silk_float      double
 # define silk_float_MAX  DBL_MAX
@@ -63,13 +61,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define silk_int16_MIN   ((opus_int16)0x8000)                 /* -2^15     = -32768 */
 #define silk_int8_MAX    0x7F                                 /*  2^7 - 1  =  127 */
 #define silk_int8_MIN    ((opus_int8)0x80)                    /* -2^7      = -128 */
-
-#define silk_uint32_MAX  0xFFFFFFFF  /* 2^32 - 1 = 4294967295 */
-#define silk_uint32_MIN  0x00000000
-#define silk_uint16_MAX  0xFFFF      /* 2^16 - 1 = 65535 */
-#define silk_uint16_MIN  0x0000
-#define silk_uint8_MAX   0xFF        /*  2^8 - 1 = 255 */
-#define silk_uint8_MIN   0x00
+#define silk_uint8_MAX   0xFF                                 /*  2^8 - 1 = 255 */
 
 #define silk_TRUE        1
 #define silk_FALSE       0