ref: 10c879266abb00bd9378f37ac8f674411b5083eb
parent: d9a4973b8eba02cca15eb5852ef4e3293ab57dea
author: Erik de Castro Lopo <erikd@mega-nerd.com>
date: Thu Feb 26 19:42:15 EST 2004
Remove kiss fft and add --disable-fftw ./configure option. Kiss fft was removed to allow the Rabbit to be dual licensed.
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,10 @@
[ --disable-gcc-opt disable gcc optimisations ],
ac_arg_gcc_opt="N", ac_arg_gcc_opt="Y")
+AC_ARG_ENABLE(fftw,
+ [ --disable-fftw disable usage of FFTW ],
+ ac_arg_fftw="N", ac_arg_fftw="Y")
+
AC_ARG_ENABLE(debug,
[ --enable-debug enable debugging ],
ac_arg_debug=yes, ac_arg_debug=no)
@@ -185,14 +189,17 @@
#====================================================================================
# Check for libfftw3 which is required for the test and example programs.
-PKG_CHECK_MODULES(FFTW3, fftw3 >= 0.15.0, ac_cv_fftw3=1, ac_cv_fftw3=0)
+if test $ac_arg_fftw = "Y" ; then
+ PKG_CHECK_MODULES(FFTW3, fftw3 >= 0.15.0, ac_cv_fftw3=1, ac_cv_fftw3=0)
+ AC_DEFINE_UNQUOTED([HAVE_FFTW3],$ac_cv_fftw3,[Set to 1 if you have libfftw3.])
-AC_DEFINE_UNQUOTED([HAVE_FFTW3],$ac_cv_fftw3,[Set to 1 if you have libfftw3.])
+ if test x$ac_cv_fftw3 = x1 ; then
+ ac_cv_fftw3=yes
+ HAVE_FFTW3=1
+ fi
+ fi
-if test x$ac_cv_fftw3 = x1 ; then
- ac_cv_fftw3=yes
- HAVE_FFTW3=1
-else
+if test x$ac_cv_fftw3 != xyes ; then
ac_cv_fftw3=no
HAVE_FFTW3=0
fi
@@ -267,14 +274,7 @@
AC_MSG_RESULT([
Extra tools required for testing and examples :
- Have FFTW : ................... ${ac_cv_fftw3}])-
-if test x$ac_cv_fftw3 = xno ; then
- echo
- echo " * FFTW is available from http://www.fftw.org/ or if you "
- echo " * are using Debian : \"apt-get install fftw3 fftw3-dev\""
- echo
- fi
+ Use FFTW : .................... ${ac_cv_fftw3}]) AC_MSG_RESULT([ Have libsndfile : ............. ${ac_cv_sndfile}]) AC_MSG_RESULT([ Have libefence : .............. ${ac_cv_lib_efence_memalign}--- a/tests/_kiss_fft_guts.h
+++ /dev/null
@@ -1,107 +1,0 @@
-/*
-Copyright (c) 2003, Mark Borgerding
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* kiss_fft.h
- defines kiss_fft_scalar as either short or a float type
- and defines
- typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */-#include "kiss_fft.h"
-
-typedef struct {- int nfft;
- int inverse;
- int *factors;
- kiss_fft_cpx * twiddles;
- kiss_fft_cpx * tmpbuf;
- kiss_fft_cpx * scratch;
-}kiss_fft_state;
-
-/*
- Explanation of macros dealing with complex math:
-
- C_MUL(m,a,b) : m = a*b
- C_FIXDIV( c , div ) : if a fixed point impl., c /= div. noop otherwise
- C_SUB( res, a,b) : res = a - b
- C_SUBFROM( res , a) : res -= a
- C_ADDTO( res , a) : res += a
- * */
-#ifdef FIXED_POINT
-# define S_MUL(a,b) ( ( (a)*(b) + (1<<14) )>>15 )
-# define C_MUL(m,a,b) \
- do{ (m).r = ( ( (a).r*(b).r - (a).i*(b).i) + (1<<14) ) >> 15;\- (m).i = ( ( (a).r*(b).i + (a).i*(b).r) + (1<<14) ) >> 15;\
- }while(0)
-# define C_FIXDIV(c,div) \
- do{ (c).r /= div; (c).i /=div; }while(0)-
-# define C_MULBYSCALAR( c, s ) \
- do{ (c).r = ( ( (c).r*(s) ) + (1<<14) ) >> 15;\- (c).i = ( ( (c).i*(s) ) + (1<<14) ) >> 15; }while(0)
-
-#else /* not FIXED_POINT*/
-
-# define S_MUL(a,b) ( (a)*(b) )
-#define C_MUL(m,a,b) \
- do{ (m).r = (a).r*(b).r - (a).i*(b).i;\- (m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
-# define C_FIXDIV(c,div) /* NOOP */
-# define C_MULBYSCALAR( c, s ) \
- do{ (c).r *= (s);\- (c).i *= (s); }while(0)
-#endif
-
-#define C_ADD( res, a,b)\
- do { (res).r=(a).r+(b).r; (res).i=(a).i+(b).i; }while(0)-#define C_SUB( res, a,b)\
- do { (res).r=(a).r-(b).r; (res).i=(a).i-(b).i; }while(0)-#define C_ADDTO( res , a)\
- do { (res).r += (a).r; (res).i += (a).i; }while(0)-#define C_SUBFROM( res , a)\
- do { (res).r -= (a).r; (res).i -= (a).i; }while(0)-
-static inline
-kiss_fft_cpx kf_cexp(double phase) /* returns e ** (j*phase) */
-{- kiss_fft_cpx x;
-#ifdef FIXED_POINT
- x.r = (kiss_fft_scalar) (32767 * cos (phase));
- x.i = (kiss_fft_scalar) (32767 * sin (phase));
-#else
- x.r = cos (phase);
- x.i = sin (phase);
-#endif
- return x;
-}
-
-void kf_work(
- kiss_fft_cpx * Fout,
- const kiss_fft_cpx * f,
- int fstride,
- int in_skip,
- int * factors,
- const kiss_fft_state * st
- );
-
-/* a debugging function */
-#define pcpx(c)\
- fprintf(stderr,"%g + %gi\n",(double)((c)->r),(double)((c)->i) )
-
-/*
-** Do not edit or modify anything in this comment block.
-** The arch-tag line is a file identity tag for the GNU Arch
-** revision control system.
-**
-** arch-tag: 61697948-aa60-4f95-9433-da1f25c536e1
-*/
-
--- a/tests/calc_snr.c
+++ b/tests/calc_snr.c
@@ -21,11 +21,15 @@
#include "calc_snr.h"
#include "util.h"
+#if (HAVE_FFTW3 == 1)
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
+#include <fftw3.h>
+
#define MAX_SPEC_LEN (1<<18)
#define MAX_PEAKS 10
@@ -183,13 +187,6 @@
return snr ;
} /* find_snr */
-/*==============================================================================
-*/
-
-#if (HAVE_FFTW3 == 1)
-
-#include <fftw3.h>
-
static void
log_mag_spectrum (double *input, int len, double *magnitude)
{ fftw_plan plan = NULL ;@@ -207,6 +204,8 @@
} ;
fftw_execute (plan) ;
+
+ fftw_destroy_plan (plan) ;
/* (k < N/2 rounded up) */
maxval = 0.0 ;
@@ -229,49 +228,18 @@
return ;
} /* log_mag_spectrum */
-#else /* (! HAVE_FFTW3) */
+#else /* ! (HAVE_LIBFFTW && HAVE_LIBRFFTW) */
-#include "kiss_fft.h"
+double
+calculate_snr (float *data, int len)
+{ double snr = 200.0 ;-static void
-log_mag_spectrum (double *input, int len, double *magnitude)
-{ fftw_plan plan = NULL ;+ data = data ;
+ len = len ;
- double maxval ;
- int k ;
+ return snr ;
+} /* calculate_snr */
- if (input == NULL || magnitude == NULL)
- return ;
-
- plan = fftw_plan_r2r_1d (len, input, magnitude, FFTW_R2HC, FFTW_ESTIMATE | FFTW_PRESERVE_INPUT) ;
- if (plan == NULL)
- { printf ("%s : line %d : create plan failed.\n", __FILE__, __LINE__) ;- exit (1) ;
- } ;
-
- fftw_execute (plan) ;
-
- /* (k < N/2 rounded up) */
- maxval = 0.0 ;
- for (k = 1 ; k < len / 2 ; k++)
- { magnitude [k] = sqrt (magnitude [k] * magnitude [k] + magnitude [len - k - 1] * magnitude [len - k - 1]) ;- maxval = (maxval < magnitude [k]) ? magnitude [k] : maxval ;
- } ;
-
- memset (magnitude + len / 2, 0, len / 2 * sizeof (magnitude [0])) ;
-
- /* Don't care about DC component. Make it zero. */
- magnitude [0] = 0.0 ;
-
- /* log magnitude. */
- for (k = 0 ; k < len ; k++)
- { magnitude [k] = magnitude [k] / maxval ;- magnitude [k] = (magnitude [k] < 1e-15) ? -200.0 : 20.0 * log10 (magnitude [k]) ;
- } ;
-
- return ;
-} /* log_mag_spectrum */
-
#endif
/*
@@ -281,3 +249,4 @@
**
** arch-tag: 7ae937c5-53a5-45d8-8aa2-793de9c35f0a
*/
+
--- a/tests/kiss_fft.c
+++ /dev/null
@@ -1,373 +1,0 @@
-/*
-Copyright (c) 2003, Mark Borgerding
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "_kiss_fft_guts.h"
-/* The guts header contains all the multiplication and addition macros that are defined for
- fixed or floating point complex numbers. It also delares the kf_ internal functions.
- */
-
-/* the max length of the sequence of factors of nfft ,
- MAXFACTORS==32 this should be good up to more 1e15 samples
- ( 2 * 3**31 )
- */
-#define MAXFACTORS 32
-
-static void kf_bfly2(
- kiss_fft_cpx * Fout,
- int fstride,
- const kiss_fft_state * st,
- int m
- )
-{- kiss_fft_cpx * Fout2;
- kiss_fft_cpx * tw1 = st->twiddles;
- kiss_fft_cpx t;
- Fout2 = Fout + m;
- do{- C_FIXDIV(*Fout,2); C_FIXDIV(*Fout2,2);
-
- C_MUL (t, *Fout2 , *tw1);
- tw1 += fstride;
- C_SUB( *Fout2 , *Fout , t );
- C_ADDTO( *Fout , t );
- ++Fout2;
- ++Fout;
- }while (--m);
-}
-
-static void kf_bfly4(
- kiss_fft_cpx * Fout,
- int fstride,
- const kiss_fft_state * st,
- int m
- )
-{- kiss_fft_cpx *Fout1,*Fout2,*Fout3;
- kiss_fft_cpx *tw1,*tw2,*tw3;
- kiss_fft_cpx scratch[6];
-
- Fout1 = Fout + m;
- Fout2 = Fout + 2*m;
- Fout3 = Fout + 3*m;
- tw3 = tw2 = tw1 = st->twiddles;
-
- do {- C_FIXDIV(*Fout,4); C_FIXDIV(*Fout1,4); C_FIXDIV(*Fout2,4); C_FIXDIV(*Fout3,4);
-
- C_MUL(scratch[0],*Fout1 , *tw1 );
- C_MUL(scratch[1],*Fout2 , *tw2 );
- C_MUL(scratch[2],*Fout3 , *tw3 );
-
- C_SUB( scratch[5] , *Fout, scratch[1] );
- C_ADDTO(*Fout, scratch[1]);
- C_ADD( scratch[3] , scratch[0] , scratch[2] );
- C_SUB( scratch[4] , scratch[0] , scratch[2] );
- C_SUB( *Fout2, *Fout, scratch[3] );
- tw1 += fstride;
- tw2 += fstride*2;
- tw3 += fstride*3;
- C_ADDTO( *Fout , scratch[3] );
-
- if(st->inverse) {- Fout1->r = scratch[5].r - scratch[4].i;
- Fout1->i = scratch[5].i + scratch[4].r;
- Fout3->r = scratch[5].r + scratch[4].i;
- Fout3->i = scratch[5].i - scratch[4].r;
- }else{- Fout1->r = scratch[5].r + scratch[4].i;
- Fout1->i = scratch[5].i - scratch[4].r;
- Fout3->r = scratch[5].r - scratch[4].i;
- Fout3->i = scratch[5].i + scratch[4].r;
- }
- ++Fout; ++Fout1; ++Fout2; ++Fout3;
- }while(--m);
-}
-
-static void kf_bfly3(
- kiss_fft_cpx * Fout,
- int fstride,
- const kiss_fft_state * st,
- int m
- )
-{- kiss_fft_cpx *Fout0,*Fout1,*Fout2;
- kiss_fft_cpx *tw1,*tw2;
- kiss_fft_cpx scratch[5];
- kiss_fft_cpx epi3;
- epi3 = st->twiddles[fstride*m];
-
- Fout0=Fout;
- Fout1=Fout0+m;
- Fout2=Fout0+2*m;
- tw1=tw2=st->twiddles;
-
- do{- C_FIXDIV(*Fout0,3); C_FIXDIV(*Fout1,3); C_FIXDIV(*Fout2,3);
-
- C_MUL(scratch[1],*Fout1 , *tw1);
- C_MUL(scratch[2],*Fout2 , *tw2);
-
- C_ADD(scratch[3],scratch[1],scratch[2]);
- C_SUB(scratch[0],scratch[1],scratch[2]);
-
- Fout1->r = Fout0->r - scratch[3].r/2;
- Fout1->i = Fout0->i - scratch[3].i/2;
-
- C_MULBYSCALAR( scratch[0] , epi3.i );
-
- C_ADDTO(*Fout0,scratch[3]);
-
- Fout2->r = Fout1->r + scratch[0].i;
- Fout2->i = Fout1->i - scratch[0].r;
-
- Fout1->r -= scratch[0].i;
- Fout1->i += scratch[0].r;
-
- ++Fout0;++Fout1;++Fout2;
- tw1 += fstride;
- tw2 += fstride*2;
- }while(--m);
-}
-
-static void kf_bfly5(
- kiss_fft_cpx * Fout,
- int fstride,
- const kiss_fft_state * st,
- int m
- )
-{- kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
- int u;
- kiss_fft_cpx scratch[13];
- kiss_fft_cpx * twiddles = st->twiddles;
- kiss_fft_cpx *tw;
- kiss_fft_cpx y1,y2;
- y1 = twiddles[fstride*m];
- y2 = twiddles[fstride*2*m];
-
- Fout0=Fout;
- Fout1=Fout0+m;
- Fout2=Fout0+2*m;
- Fout3=Fout0+3*m;
- Fout4=Fout0+4*m;
-
- tw=st->twiddles;
- for ( u=0; u<m; ++u ) {- C_FIXDIV( *Fout0,5); C_FIXDIV( *Fout1,5); C_FIXDIV( *Fout2,5); C_FIXDIV( *Fout3,5); C_FIXDIV( *Fout4,5);
- scratch[0] = *Fout0;
-
- C_MUL(scratch[1] ,*Fout1, tw[u*fstride]);
- C_MUL(scratch[2] ,*Fout2, tw[2*u*fstride]);
- C_MUL(scratch[3] ,*Fout3, tw[3*u*fstride]);
- C_MUL(scratch[4] ,*Fout4, tw[4*u*fstride]);
-
- C_ADD( scratch[7],scratch[1],scratch[4]);
- C_SUB( scratch[10],scratch[1],scratch[4]);
- C_ADD( scratch[8],scratch[2],scratch[3]);
- C_SUB( scratch[9],scratch[2],scratch[3]);
-
- Fout0->r += scratch[7].r + scratch[8].r;
- Fout0->i += scratch[7].i + scratch[8].i;
-
- scratch[5].r = scratch[0].r + S_MUL(scratch[7].r,y1.r) + S_MUL(scratch[8].r,y2.r);
- scratch[5].i = scratch[0].i + S_MUL(scratch[7].i,y1.r) + S_MUL(scratch[8].i,y2.r);
-
- scratch[6].r = S_MUL(scratch[10].i,y1.i) + S_MUL(scratch[9].i,y2.i);
- scratch[6].i = -S_MUL(scratch[10].r,y1.i) - S_MUL(scratch[9].r,y2.i);
-
- C_SUB(*Fout1,scratch[5],scratch[6]);
- C_ADD(*Fout4,scratch[5],scratch[6]);
-
- scratch[11].r = scratch[0].r + S_MUL(scratch[7].r,y2.r) + S_MUL(scratch[8].r,y1.r);
- scratch[11].i = scratch[0].i + S_MUL(scratch[7].i,y2.r) + S_MUL(scratch[8].i,y1.r);
- scratch[12].r = - S_MUL(scratch[10].i,y2.i) + S_MUL(scratch[9].i,y1.i);
- scratch[12].i = S_MUL(scratch[10].r,y2.i) - S_MUL(scratch[9].r,y1.i);
-
- C_ADD(*Fout2,scratch[11],scratch[12]);
- C_SUB(*Fout3,scratch[11],scratch[12]);
-
- ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
- }
-}
-
-/* perform the butterfly for one stage of a mixed radix FFT */
-static void kf_bfly_generic(
- kiss_fft_cpx * Fout,
- int fstride,
- const kiss_fft_state * st,
- int m,
- int p
- )
-{- int u,k,q1,q;
- kiss_fft_cpx * scratch = st->scratch;
- kiss_fft_cpx * twiddles = st->twiddles;
- kiss_fft_cpx t;
- int Norig = st->nfft;
-
- for ( u=0; u<m; ++u ) {- k=u;
- for ( q1=0 ; q1<p ; ++q1 ) {- scratch[q1] = Fout[ k ];
- C_FIXDIV(scratch[q1],p);
- k += m;
- }
-
- k=u;
- for ( q1=0 ; q1<p ; ++q1 ) {- int twidx=0;
- Fout[ k ] = scratch[0];
- for (q=1;q<p;++q ) {- twidx += fstride * k;
- if (twidx>=Norig) twidx-=Norig;
- C_MUL(t,scratch[q] , twiddles[twidx] );
- C_ADDTO( Fout[ k ] ,t);
- }
- k += m;
- }
- }
-}
-
-void kf_work(
- kiss_fft_cpx * Fout,
- const kiss_fft_cpx * f,
- int fstride,
- int in_stride,
- int * factors,
- const kiss_fft_state * st
- )
-{- int m,p,q;
- p=*factors++;
- m=*factors++;
-
- for (q=0;q<p;++q) {- if (m==1)
- Fout[q] = *f;
- else
- kf_work( Fout + m*q, f, fstride*p, in_stride, factors,st);
- f += fstride*in_stride;
- }
-
- switch (p) {- case 2: kf_bfly2(Fout,fstride,st,m); break;
- case 3: kf_bfly3(Fout,fstride,st,m); break;
- case 4: kf_bfly4(Fout,fstride,st,m); break;
- case 5: kf_bfly5(Fout,fstride,st,m); break;
- default: kf_bfly_generic(Fout,fstride,st,m,p); break;
- }
-}
-
-/* facbuf is populated by p1,m1,p2,m2, ...
- where
- p[i] * m[i] = m[i-1]
- m0 = n */
-void kf_factor(int n,int * facbuf)
-{- int p=4;
- int floor_sqrt = floor (sqrt (n));
-
- /*factor out powers of 4, powers of 2, then any remaining primes */
- do {- while (n % p) {- switch (p) {- case 4: p = 2; break;
- case 2: p = 3; break;
- default: p += 2; break;
- }
- if (p > floor_sqrt)
- p = n; /* no more factors, skip to end */
- }
- n /= p;
- *facbuf++ = p;
- *facbuf++ = n;
- } while (n > 1);
-}
-
-/*
- *
- * User-callable function to allocate all necessary scratch space for the fft.
- *
- * The return value is a contiguous block of memory, allocated with malloc. As such,
- * It can be freed with free(), rather than a kiss_fft-specific function.
- * */
-void * kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem )
-{- kiss_fft_state * st=NULL;
- size_t memneeded = sizeof(kiss_fft_state)
- + sizeof(kiss_fft_cpx)*nfft /* twiddle factors*/
- + sizeof(kiss_fft_cpx)*nfft /* tmpbuf*/
- + sizeof(int)*2*MAXFACTORS /* factors*/
- + sizeof(kiss_fft_cpx)*nfft; /* scratch*/
-
- if ( lenmem==NULL ) {- st = ( kiss_fft_state *)malloc( memneeded );
- }else{- if (*lenmem >= memneeded)
- st = ( kiss_fft_state *)mem;
- *lenmem = memneeded;
- }
- if (st){- int i;
- st->nfft=nfft;
- st->inverse = inverse_fft;
- st->twiddles = (kiss_fft_cpx*)(st+1); /* just beyond struct*/
- st->tmpbuf = (kiss_fft_cpx*)(st->twiddles + nfft);/* just after twiddles*/
- st->scratch = (kiss_fft_cpx*)(st->tmpbuf + nfft);
- st->factors = (int*)(st->scratch + nfft);
-
- for (i=0;i<nfft;++i) {- const double pi=3.14159265358979323846264338327;
- double phase = ( -2*pi /nfft ) * i;
- if (st->inverse)
- phase *= -1;
- st->twiddles[i] = kf_cexp( phase );
- }
-
- kf_factor(nfft,st->factors);
- }
- return st;
-}
-
-void kiss_fft_stride(const void * cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int in_stride)
-{- const kiss_fft_state * st = cfg;
- if (st->nfft < 0) {- fprintf(stderr,"usage error: invalid kiss_fft_state. make sure the correct kiss_fft_alloc routine was used.\n");
- exit(1);
- }
-
- if (fin == fout) {- kf_work(st->tmpbuf,fin,1,in_stride, st->factors,st);
- memcpy(fout,st->tmpbuf,sizeof(kiss_fft_cpx)*st->nfft);
- }else{- kf_work( fout, fin, 1,in_stride, st->factors,st );
- }
-}
-
-void kiss_fft(const void * cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
-{- kiss_fft_stride(cfg,fin,fout,1);
-}
-
-
-/*
-** Do not edit or modify anything in this comment block.
-** The arch-tag line is a file identity tag for the GNU Arch
-** revision control system.
-**
-** arch-tag: 90159a40-9424-4c9a-9e8c-dcb050bc8bb1
-*/
-
--- a/tests/kiss_fft.h
+++ /dev/null
@@ -1,86 +1,0 @@
-#ifndef KISS_FFT_H
-#define KISS_FFT_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <memory.h>
-
-/*
- ATTENTION!
- If you would like a :
- -- a utility that will handle the caching of fft objects
- -- real-only FFT
- -- a multi-dimensional FFT
- -- a command-line utility to perform ffts
- -- a command-line utility to perform fast-convolution filtering
-
- then see tools/
- */
-
-#ifdef FIXED_POINT
-# define kiss_fft_scalar short
-#else
-# ifndef kiss_fft_scalar
-/* default is float */
-# define kiss_fft_scalar float
-# endif
-#endif
-
-typedef struct {- kiss_fft_scalar r;
- kiss_fft_scalar i;
-}kiss_fft_cpx;
-
-/*
- * kiss_fft_alloc
- *
- * Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
- *
- * typical usage: void * mycfg=kiss_fft_alloc(1024,0,NULL,NULL);
- *
- * The return value from fft_alloc is a cfg buffer used internally
- * by the fft routine or NULL.
- *
- * If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc.
- * The returned value should be free()d when done to avoid memory leaks.
- *
- * The state can be placed in a user supplied buffer 'mem':
- * If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
- * then the function places the cfg in mem and the size used in *lenmem
- * and returns mem.
- *
- * If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
- * then the function returns NULL and places the minimum cfg
- * buffer size in *lenmem.
- * */
-void* kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem);
-
-/*
- * kiss_fft(cfg,in_out_buf)
- *
- * Perform an FFT on a complex input buffer.
- * for a forward FFT,
- * fin should be f[0] , f[1] , ... ,f[nfft-1]
- * fout will be F[0] , F[1] , ... ,F[nfft-1]
- * Note that each element is complex and can be accessed like
- f[k].r and f[k].i
- * */
-void kiss_fft(const void * cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
-
-void kiss_fft_stride(const void * cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride);
-
-/* If kiss_fft_alloc allocated a buffer, it is one contiguous
- buffer and can be simply free()d when no longer needed*/
-#define kiss_fft_free free
-
-#endif
-
-/*
-** Do not edit or modify anything in this comment block.
-** The arch-tag line is a file identity tag for the GNU Arch
-** revision control system.
-**
-** arch-tag: 2bab07d5-bee1-4724-b5a1-f867d467b7c5
-*/
-