mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-15 22:08:33 +00:00
update speex to 1.2rc1
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11979 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris committed
1 parent
d885488f15
commit
4ee40ddc34
181 files changed
+24290
-5292
No files matched your search
+133
-61
@@ -6,15 +6,15 @@ AM_CONFIG_HEADER([config.h])
|
||||
|
||||
SPEEX_MAJOR_VERSION=1
|
||||
SPEEX_MINOR_VERSION=1
|
||||
SPEEX_MICRO_VERSION=13
|
||||
SPEEX_MICRO_VERSION=16
|
||||
SPEEX_EXTRA_VERSION=
|
||||
#SPEEX_VERSION=
|
||||
SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION
|
||||
SPEEX_VERSION="1.2beta1"
|
||||
#SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION
|
||||
SPEEX_VERSION="1.2rc1"
|
||||
|
||||
SPEEX_LT_CURRENT=5
|
||||
SPEEX_LT_CURRENT=6
|
||||
SPEEX_LT_REVISION=0
|
||||
SPEEX_LT_AGE=4
|
||||
SPEEX_LT_AGE=5
|
||||
|
||||
AC_SUBST(SPEEX_LT_CURRENT)
|
||||
AC_SUBST(SPEEX_LT_REVISION)
|
||||
@@ -30,6 +30,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
AC_C_BIGENDIAN
|
||||
@@ -40,7 +41,8 @@ AC_C_RESTRICT
|
||||
|
||||
AC_MSG_CHECKING(for C99 variable-size arrays)
|
||||
AC_TRY_COMPILE( , [
|
||||
int foo=10;
|
||||
int foo;
|
||||
foo = 10;
|
||||
int array[foo];
|
||||
],
|
||||
[has_var_arrays=yes;AC_DEFINE([VAR_ARRAYS], [], [Use C99 variable-size arrays])
|
||||
@@ -49,8 +51,14 @@ has_var_arrays=no
|
||||
)
|
||||
AC_MSG_RESULT($has_var_arrays)
|
||||
|
||||
AC_CHECK_HEADERS([alloca.h getopt.h])
|
||||
AC_MSG_CHECKING(for alloca)
|
||||
AC_TRY_COMPILE( [#include <alloca.h>], [
|
||||
AC_TRY_COMPILE( [
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
], [
|
||||
int foo=10;
|
||||
int *array = alloca(foo);
|
||||
],
|
||||
@@ -64,9 +72,49 @@ has_alloca=no
|
||||
)
|
||||
AC_MSG_RESULT($has_alloca)
|
||||
|
||||
AC_MSG_CHECKING(for SSE in current arch/CFLAGS)
|
||||
AC_LINK_IFELSE([
|
||||
AC_LANG_PROGRAM([[
|
||||
#include <xmmintrin.h>
|
||||
__m128 testfunc(float *a, float *b) {
|
||||
return _mm_add_ps(_mm_loadu_ps(a), _mm_loadu_ps(b));
|
||||
}
|
||||
]])],
|
||||
[
|
||||
has_sse=yes
|
||||
],
|
||||
[
|
||||
has_sse=no
|
||||
]
|
||||
)
|
||||
AC_MSG_RESULT($has_sse)
|
||||
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -fvisibility=hidden"
|
||||
AC_MSG_CHECKING(for ELF visibility)
|
||||
AC_COMPILE_IFELSE([
|
||||
AC_LANG_PROGRAM([[
|
||||
#pragma GCC visibility push(hidden)
|
||||
__attribute__((visibility("default")))
|
||||
int var=10;
|
||||
]])],
|
||||
[
|
||||
has_visibility=yes
|
||||
AC_DEFINE([EXPORT], [__attribute__((visibility("default")))], [Symbol visibility prefix])
|
||||
],
|
||||
[
|
||||
has_visibility=no
|
||||
AC_DEFINE([EXPORT], [], [Symbol visibility prefix])
|
||||
CFLAGS="$SAVE_CFLAGS"
|
||||
]
|
||||
)
|
||||
AC_MSG_RESULT($has_visibility)
|
||||
|
||||
AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
|
||||
|
||||
XIPH_PATH_OGG([src="src"], [src=""])
|
||||
AC_SUBST(src)
|
||||
|
||||
AC_CHECK_LIB(m, sin)
|
||||
|
||||
# Check for getopt_long; if not found, use included source.
|
||||
@@ -86,30 +134,45 @@ AC_DEFINE_UNQUOTED(SPEEX_MINOR_VERSION, ${SPEEX_MINOR_VERSION}, [Version minor])
|
||||
AC_DEFINE_UNQUOTED(SPEEX_MICRO_VERSION, ${SPEEX_MICRO_VERSION}, [Version micro])
|
||||
AC_DEFINE_UNQUOTED(SPEEX_EXTRA_VERSION, "${SPEEX_EXTRA_VERSION}", [Version extra])
|
||||
|
||||
AC_ARG_ENABLE(wideband, [ --disable-wideband Disable wideband codec],
|
||||
[if test "$enableval" = no; then
|
||||
AC_DEFINE([DISABLE_WIDEBAND], , [Disable wideband codec])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(vorbis-psy, [ --enable-vorbis-psy Enable Vorbis-style psychoacoustics (EXPERIMENTAL)],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_DEFINE([VORBIS_PSYCHO], , [Enable Vorbis-style psychoacoustics (EXPERIMENTAL)])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(valgrind, [ --enable-valgrind Enable valgrind extra checks],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_DEFINE([ENABLE_VALGRIND], , [Enable valgrind extra checks])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(sse, [ --enable-sse Enable SSE support], [if test "$enableval" = yes; then
|
||||
AC_DEFINE([_USE_SSE], , [Enable SSE support])
|
||||
AC_ARG_ENABLE(sse, [ --enable-sse Enable SSE support], [
|
||||
if test "x$enableval" != xno; then
|
||||
has_sse=yes
|
||||
CFLAGS="$CFLAGS -O3 -msse"
|
||||
else
|
||||
has_sse=no
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
FFT=smallft
|
||||
|
||||
AC_ARG_ENABLE(fixed-point, [ --enable-fixed-point Compile as fixed-point],
|
||||
[if test "$enableval" = yes; then
|
||||
FFT=kiss
|
||||
has_sse=no
|
||||
AC_DEFINE([FIXED_POINT], , [Compile as fixed-point])
|
||||
else
|
||||
AC_DEFINE([FLOATING_POINT], , [Compile as floating-point])
|
||||
fi],
|
||||
AC_DEFINE([FLOATING_POINT], , [Compile as floating-point]))
|
||||
|
||||
if test "$has_sse" = yes; then
|
||||
AC_DEFINE([_USE_SSE], , [Enable SSE support])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(float-api, [ --disable-float-api Disable the floating-point API],
|
||||
[if test "$enableval" = no; then
|
||||
AC_DEFINE([DISABLE_FLOAT_API], , [Disable all parts of the API that are using floats])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(vbr, [ --disable-vbr Disable VBR and VAD from the codec],
|
||||
[if test "$enableval" = no; then
|
||||
AC_DEFINE([DISABLE_VBR], , [Disable VBR and VAD from the codec])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(arm4-asm, [ --enable-arm4-asm Make use of ARM4 assembly optimizations],
|
||||
@@ -122,7 +185,7 @@ AC_ARG_ENABLE(arm5e-asm, [ --enable-arm5e-asm Make use of ARM5E assembly o
|
||||
AC_DEFINE([ARM5E_ASM], , [Make use of ARM5E assembly optimizations])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(blackfin-asm, [ --enable-blackfin-asm Make use of Blackfin assembly optimizations],
|
||||
AC_ARG_ENABLE(blackfin-asm, [ --enable-blackfin-asm Make use of Blackfin assembly optimizations],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_DEFINE([BFIN_ASM], , [Make use of Blackfin assembly optimizations])
|
||||
LDFLAGS="-Wl,-elf2flt=-s100000"
|
||||
@@ -133,21 +196,49 @@ AC_ARG_ENABLE(fixed-point-debug, [ --enable-fixed-point-debug Debug fixed-poin
|
||||
AC_DEFINE([FIXED_DEBUG], , [Debug fixed-point implementation])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(epic-48k, [ --enable-epic-48k Enable support for Epic 4.8 kbps mode],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_DEFINE([EPIC_48K], , [Enable support for Epic 4.8 kbps mode])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(ti-c55x, [ --enable-ti-c55x Enable support for TI C55X DSP],
|
||||
[if test "$enableval" = yes; then
|
||||
has_char16=yes;
|
||||
AC_DEFINE([TI_C55X], , [Enable support for TI C55X DSP])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(16bit-precision, [ --enable-16bit-precision Reduce precision to 16 bits (EXPERIMENTAL)],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_DEFINE([PRECISION16], , [Reduce precision to 16 bits (EXPERIMENTAL)])
|
||||
fi])
|
||||
AC_ARG_WITH([fft], [AS_HELP_STRING([--with-fft=choice],[use an alternate FFT implementation. The available choices are
|
||||
kiss (default fixed point), smallft (default floating point), gpl-fftw3 and proprietary-intel-mkl])],
|
||||
[FFT=$withval]
|
||||
)
|
||||
|
||||
FFT_PKGCONFIG=
|
||||
AS_CASE([$FFT],
|
||||
[kiss], [
|
||||
AC_DEFINE([USE_KISS_FFT], [], [Use KISS Fast Fourier Transform])
|
||||
],
|
||||
[smallft], [
|
||||
AC_DEFINE([USE_SMALLFT], [], [Use FFT from OggVorbis])
|
||||
],
|
||||
[gpl-fftw3], [
|
||||
AC_DEFINE([USE_GPL_FFTW3], [], [Use FFTW3 for FFT])
|
||||
PKG_CHECK_MODULES(FFT, fftw3f)
|
||||
],
|
||||
[proprietary-intel-mkl], [
|
||||
AC_DEFINE([USE_INTEL_MKL], [], [Use Intel Math Kernel Library for FFT])
|
||||
AC_MSG_CHECKING(for valid MKL)
|
||||
AC_LINK_IFELSE([
|
||||
AC_LANG_PROGRAM([[
|
||||
#include <mkl.h>
|
||||
void func() {
|
||||
DFTI_DESCRIPTOR_HANDLE h;
|
||||
MKL_LONG result=DftiCreateDescriptor(&h, DFTI_SINGLE, DFTI_REAL, 0);
|
||||
}]])],
|
||||
[AC_MSG_RESULT(yes)],
|
||||
[AC_MSG_FAILURE([Failed to compile MKL test program. Make sure you set CFLAGS to include the include directory and set LDFLAGS to include the library directory and all necesarry libraries.])]
|
||||
)
|
||||
],
|
||||
[AC_MSG_FAILURE([Unknown FFT $FFT specified for --with-fft])]
|
||||
)
|
||||
AM_CONDITIONAL(BUILD_KISS_FFT, [test "$FFT" = "kiss"])
|
||||
AM_CONDITIONAL(BUILD_SMALLFT, [test "$FFT" = "smallft"])
|
||||
AC_SUBST(FFT_PKGCONFIG)
|
||||
|
||||
|
||||
AC_CHECK_SIZEOF(short)
|
||||
AC_CHECK_SIZEOF(int)
|
||||
@@ -182,47 +273,28 @@ fi
|
||||
AC_SUBST(SIZE16)
|
||||
AC_SUBST(SIZE32)
|
||||
|
||||
|
||||
AC_DEFUN([AX_COMPILER_VENDOR],
|
||||
[
|
||||
AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
|
||||
[ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
|
||||
# note: don't check for gcc first since some other compilers define __GNUC__
|
||||
for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
|
||||
vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
|
||||
#if !($vencpp)
|
||||
thisisanerror;
|
||||
#endif
|
||||
])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
|
||||
done
|
||||
])
|
||||
])
|
||||
|
||||
AX_COMPILER_VENDOR
|
||||
|
||||
# Enable 64 bit build
|
||||
AC_ARG_ENABLE(64,
|
||||
[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
|
||||
|
||||
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
|
||||
if test "${enable_64}" = "yes"; then
|
||||
CFLAGS="$CFLAGS -m64"
|
||||
CXXFLAGS="$CXXFLAGS -m64"
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
|
||||
include/Makefile include/speex/Makefile speex.pc
|
||||
include/Makefile include/speex/Makefile speex.pc speexdsp.pc
|
||||
win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile
|
||||
win32/speexdec/Makefile symbian/Makefile
|
||||
win32/VS2003/Makefile win32/VS2005/Makefile
|
||||
win32/VS2003/Makefile
|
||||
win32/VS2003/tests/Makefile
|
||||
win32/VS2003/libspeex/Makefile
|
||||
win32/VS2003/libspeexdsp/Makefile
|
||||
win32/VS2003/speexdec/Makefile
|
||||
win32/VS2003/speexenc/Makefile
|
||||
win32/VS2005/Makefile
|
||||
win32/VS2005/libspeex/Makefile
|
||||
win32/VS2005/speexdec/Makefile
|
||||
win32/VS2005/speexenc/Makefile
|
||||
win32/VS2005/libspeexdsp/Makefile
|
||||
win32/VS2005/tests/Makefile
|
||||
win32/VS2008/libspeexdsp/Makefile
|
||||
win32/VS2008/Makefile
|
||||
win32/VS2008/speexdec/Makefile
|
||||
win32/VS2008/tests/Makefile
|
||||
win32/VS2008/libspeex/Makefile
|
||||
win32/VS2008/speexenc/Makefile
|
||||
include/speex/speex_config_types.h ti/Makefile
|
||||
ti/speex_C54_test/Makefile ti/speex_C55_test/Makefile
|
||||
ti/speex_C64_test/Makefile ])
|
||||
|
||||
Reference in new issue
Block a user