diff options
Diffstat (limited to 'libspeex')
-rw-r--r-- | libspeex/Makefile.am | 24 | ||||
-rw-r--r-- | libspeex/fftwrap.c | 11 | ||||
-rw-r--r-- | libspeex/preprocess.c | 4 |
3 files changed, 18 insertions, 21 deletions
diff --git a/libspeex/Makefile.am b/libspeex/Makefile.am index 5271839..a2898b7 100644 --- a/libspeex/Makefile.am +++ b/libspeex/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST=echo_diagnostic.m -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFTW3_CFLAGS@ +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@ lib_LTLIBRARIES = libspeex.la libspeexdsp.la @@ -16,9 +16,17 @@ libspeex_la_SOURCES = cb_search.c exc_10_32_table.c exc_8_128_table.c \ lpc.c lsp_tables_nb.c modes.c modes_wb.c nb_celp.c quant_lsp.c sb_celp.c \ speex_callbacks.c speex_header.c window.c -libspeexdsp_la_SOURCES = preprocess.c smallft.c \ - jitter.c mdf.c fftwrap.c kiss_fft.c _kiss_fft_guts.h kiss_fft.h \ - kiss_fftr.c kiss_fftr.h filterbank.c resample.c buffer.c +if BUILD_KISS_FFT + FFTSRC=kiss_fft.c _kiss_fft_guts.h kiss_fft.h kiss_fftr.c kiss_fftr.h +else +if BUILD_SMALLFT + FFTSRC=smallft.c +else + FFTSRC= +endif +endif + +libspeexdsp_la_SOURCES = preprocess.c jitter.c mdf.c fftwrap.c filterbank.c resample.c buffer.c $(FFTSRC) noinst_HEADERS = arch.h cb_search_arm4.h cb_search_bfin.h cb_search_sse.h \ filters.h filters_arm4.h filters_bfin.h filters_sse.h fixed_arm4.h \ @@ -26,7 +34,7 @@ noinst_HEADERS = arch.h cb_search_arm4.h cb_search_bfin.h cb_search_sse.h \ ltp_sse.h math_approx.h misc_bfin.h nb_celp.h quant_lsp.h sb_celp.h \ stack_alloc.h vbr.h vq.h vq_arm4.h vq_bfin.h vq_sse.h cb_search.h fftwrap.h \ filterbank.h fixed_generic.h lsp.h lsp_bfin.h ltp_bfin.h modes.h os_support.h \ - pseudofloat.h quant_lsp_bfin.h smallft.h vorbis_psy.h + pseudofloat.h quant_lsp_bfin.h smallft.h vorbis_psy.h resample_sse.h libspeex_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@ @@ -40,8 +48,8 @@ testenc_wb_LDADD = libspeex.la testenc_uwb_SOURCES = testenc_uwb.c testenc_uwb_LDADD = libspeex.la testdenoise_SOURCES = testdenoise.c -testdenoise_LDADD = libspeexdsp.la @FFTW3_LIBS@ +testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@ testecho_SOURCES = testecho.c -testecho_LDADD = libspeexdsp.la @FFTW3_LIBS@ +testecho_LDADD = libspeexdsp.la @FFT_LIBS@ testjitter_SOURCES = testjitter.c -testjitter_LDADD = libspeexdsp.la @FFTW3_LIBS@ +testjitter_LDADD = libspeexdsp.la @FFT_LIBS@ diff --git a/libspeex/fftwrap.c b/libspeex/fftwrap.c index 011c2dc..4f37e1b 100644 --- a/libspeex/fftwrap.c +++ b/libspeex/fftwrap.c @@ -36,17 +36,6 @@ #include "config.h" #endif -#ifdef FIXED_POINT -#define USE_KISS_FFT -#else -#ifndef USE_GPL_FFTW3 -#ifndef USE_INTEL_MKL -#define USE_SMALLFT -#endif -#endif -#endif - - #include "arch.h" #include "os_support.h" diff --git a/libspeex/preprocess.c b/libspeex/preprocess.c index 354af09..d1b9497 100644 --- a/libspeex/preprocess.c +++ b/libspeex/preprocess.c @@ -1194,7 +1194,7 @@ EXPORT int speex_preprocess_ctl(SpeexPreprocessState *state, int request, void * case SPEEX_PREPROCESS_GET_PROB: (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob, 100); break; -#ifndef DISABLE_FLOAT_API +#ifndef FIXED_POINT case SPEEX_PREPROCESS_SET_AGC_TARGET: st->agc_level = (*(spx_int32_t*)ptr); if (st->agc_level<1) @@ -1205,7 +1205,7 @@ EXPORT int speex_preprocess_ctl(SpeexPreprocessState *state, int request, void * case SPEEX_PREPROCESS_GET_AGC_TARGET: (*(spx_int32_t*)ptr) = st->agc_level; break; -#endif /* #ifndef DISABLE_FLOAT_API */ +#endif default: speex_warning_int("Unknown speex_preprocess_ctl request: ", request); return -1; |