From 0b11af8bea8f24960d95db8f6122ecc35425e612 Mon Sep 17 00:00:00 2001 From: Mark Borgerding Date: Sun, 4 Apr 2004 22:02:16 +0000 Subject: [PATCH] default CFLAGS --- test/Makefile | 4 ++-- tools/Makefile | 4 ++-- tools/kiss_fftr.h | 24 +++++++++++++++++++++++- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/test/Makefile b/test/Makefile index 5a1438e..2226fdb 100644 --- a/test/Makefile +++ b/test/Makefile @@ -46,9 +46,9 @@ tools: cd ../tools && make all # for x86 pentium+ machines , these flags work well -CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer -I.. -I../tools $(WARNINGS) +#CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer -I.. -I../tools $(WARNINGS) # If the above flags do not work, try the following -#CFLAGS=-Wall -O3 -I.. -I../tools $(WARNINGS) +CFLAGS=-Wall -O3 -I.. -I../tools $(WARNINGS) $(SELFTEST): $(SELFTESTSRC) $(SRCFILES) $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) -lm $+ diff --git a/tools/Makefile b/tools/Makefile index ce87ae1..3868ec3 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -27,9 +27,9 @@ endif all: $(FFTUTIL) $(FASTFILT) $(FASTFILTREAL) $(PSDPNG) -CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer $(WARNINGS) +#CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer $(WARNINGS) # If the above flags do not work, try the following -#CFLAGS=-Wall -O3 +CFLAGS=-Wall -O3 $(WARNINGS) $(FASTFILTREAL): ../kiss_fft.c kiss_fastfir.c kiss_fftr.c $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -DREAL_FASTFIR -lm $+ -DFAST_FILT_UTIL diff --git a/tools/kiss_fftr.h b/tools/kiss_fftr.h index 86246f6..72e5a57 100644 --- a/tools/kiss_fftr.h +++ b/tools/kiss_fftr.h @@ -7,14 +7,36 @@ extern "C" { #endif -/* Real optimized version can save about 45% cpu time vs. complex fft of a real seq. +/* + + Real optimized version can save about 45% cpu time vs. complex fft of a real seq. + + + */ typedef struct kiss_fftr_state *kiss_fftr_cfg; + kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem, size_t * lenmem); +/* + nfft must be even + + If you don't care to allocate space, use mem = lenmem = NULL +*/ + + void kiss_fftr(kiss_fftr_cfg cfg,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata); +/* + input timedata has nfft scalar points + output freqdata has nfft/2+1 complex points +*/ + void kiss_fftri(kiss_fftr_cfg cfg,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata); +/* + input freqdata has nfft/2+1 complex points + output timedata has nfft scalar points +*/ #define kiss_fftr_free free