kiss fft cleanup

libcelt/_kiss_fft_guts.h

@@ -35,30 +35,14 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #ifdef FIXED_POINT
 #include "arch.h"
 
-#define DOUBLE_PRECISION
-
-#ifdef DOUBLE_PRECISION
 
 # define SAMPPROD long long
 #define SAMP_MAX 2147483647
 #define TWID_MAX 32767
 #define TRIG_UPSCALE 1
 
-#else /* DOUBLE_PRECISION */
-
-# define SAMPPROD opus_int32
-#define SAMP_MAX 32767
-#define TRIG_UPSCALE 1
-
-#endif /* !DOUBLE_PRECISION */
-
 #define SAMP_MIN -SAMP_MAX
 
-#if defined(CHECK_OVERFLOW)
-#  define CHECK_OVERFLOW_OP(a,op,b)  \
-	if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \
-		fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) );  }
-#endif
 
 #   define S_MUL(a,b) MULT16_32_Q15(b, a)
 

libcelt/kiss_fft.h

@@ -48,17 +48,11 @@ extern "C" {
 
 #ifdef FIXED_POINT
 #include "arch.h"	
-#define DOUBLE_PRECISION
 
-#ifdef DOUBLE_PRECISION
 #  define kiss_fft_scalar opus_int32
 #  define kiss_twiddle_scalar opus_int16
-#  define KF_SUFFIX _celt_double
-#else
-#  define kiss_fft_scalar opus_int16
-#  define kiss_twiddle_scalar opus_int16
-#  define KF_SUFFIX _celt_single
-#endif
+
+
 #else
 # ifndef kiss_fft_scalar
 /*  default is float */
@@ -68,22 +62,6 @@ extern "C" {
 # endif
 #endif
 
-#if 0
-/* This adds a suffix to all the opus_fft functions so we
-   can easily link with more than one copy of the fft */
-#define CAT_SUFFIX(a,b) a ## b
-#define SUF(a,b) CAT_SUFFIX(a, b)
-
-#define kiss_fft_alloc_twiddles SUF(opus_fft_alloc_twiddles,KF_SUFFIX)
-#define kiss_fft_alloc SUF(opus_fft_alloc,KF_SUFFIX)
-#define kiss_fft SUF(opus_fft,KF_SUFFIX)
-#define kiss_ifft SUF(opus_ifft,KF_SUFFIX)
-#define kiss_fft_stride SUF(kiss_fft_stride,KF_SUFFIX)
-#define kiss_ifft_stride SUF(kiss_ifft_stride,KF_SUFFIX)
-#define kiss_fft_free SUF(opus_fft_free,KF_SUFFIX)
-
-#endif
-
 typedef struct {
     kiss_fft_scalar r;
     kiss_fft_scalar i;

libcelt/tests/dft-test.c

@@ -82,12 +82,10 @@ void test1d(int nfft,int isinverse)
         in[k].i = (rand() % 32767) - 16384;
     }
 
-#ifdef DOUBLE_PRECISION
     for (k=0;k<nfft;++k) {
        in[k].r *= 32768;
        in[k].i *= 32768;
     }
-#endif
 
     if (isinverse)
     {

libcelt/tests/mdct-test.c

@@ -105,11 +105,9 @@ void test1d(int nfft,int isinverse)
     for (k=0;k<nfft/2;++k) {
        window[k] = Q15ONE;
     }
-#ifdef DOUBLE_PRECISION
     for (k=0;k<nfft;++k) {
        in[k] *= 32768;
     }
-#endif
 
     if (isinverse)
     {