diff --git a/.classpath b/.classpath index c38155c75..d4d2b5b73 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,7 @@ - + diff --git a/.gitmodules b/.gitmodules index 4b9ab1166..407b05124 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "submodules/externals/gsm"] path = submodules/externals/gsm url = gitosis@belledonne-communications.com:gsm.git +[submodule "submodules/externals/speex"] + path = submodules/externals/speex + url = http://git.xiph.org/speex.git diff --git a/Android.mk b/Android.mk index 22ed03c14..084805be6 100644 --- a/Android.mk +++ b/Android.mk @@ -1,20 +1,20 @@ root-dir:=$(call my-dir) -include $(root-dir)/speex/Android.mk +include $(root-dir)/submodules/externals/build/speex/Android.mk -include $(root-dir)/gsm/Android.mk +include $(root-dir)/submodules/externals/build/gsm/Android.mk -include $(root-dir)/eXosip/Android.mk +include $(root-dir)/submodules/externals/build/exosip/Android.mk -include $(root-dir)/osip/Android.mk +include $(root-dir)/submodules/externals/build/osip/Android.mk -include $(root-dir)/../../linphone-android/linphone/oRTP/build/android/Android.mk +include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk -include $(root-dir)/../../linphone-android/linphone/mediastreamer2/build/android/Android.mk +include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk -include $(root-dir)/../../linphone-android/msandroid/Android.mk +include $(root-dir)/submodules/msandroid/Android.mk -include $(root-dir)/../../linphone-android/linphone/build/android/Android.mk +include $(root-dir)/submodules/linphone/build/android/Android.mk diff --git a/Application.mk b/Application.mk index 0d803939d..b1e035016 100644 --- a/Application.mk +++ b/Application.mk @@ -1,4 +1,4 @@ APP_PROJECT_PATH := $(call my-dir)/ APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 libmsandroidsnd liblinphone -APP_BUILD_SCRIPT:=$(call my-dir)/../linphone-builder/android/Android.mk +APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk APP_PLATFORM := android-3 diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so index 0c4f6676a..ee1937a94 100755 Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 0853abb1d..c3e7ee3ac 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -92,7 +92,7 @@ public class LinphoneService extends Service implements LinphoneCoreListener { try { initFromConf(); } catch (LinphoneException e) { - Log.w(TAG, "no config ready yet"); + Log.w(TAG, "no config ready yet"); } TimerTask lTask = new TimerTask() { @Override diff --git a/submodules/externals/build/exosip/Android.mk b/submodules/externals/build/exosip/Android.mk new file mode 100755 index 000000000..16c577bdd --- /dev/null +++ b/submodules/externals/build/exosip/Android.mk @@ -0,0 +1,72 @@ + +LOCAL_PATH:= $(call my-dir)/../../exosip +include $(CLEAR_VARS) + +LOCAL_MODULE := libeXosip2 + +# Don't prelink this library. +LOCAL_PRELINK_MODULE := false + +LOCAL_SRC_FILES = \ + src/eXosip.c \ + src/eXconf.c \ \ + src/eXregister_api.c \ + src/eXcall_api.c \ + src/eXmessage_api.c \ + src/eXtransport.c \ + src/jrequest.c \ + src/jresponse.c \ + src/jcallback.c \ + src/jdialog.c \ + src/udp.c \ + src/jcall.c \ + src/jreg.c \ + src/eXutils.c \ + src/jevents.c \ + src/misc.c \ + src/jauth.c \ + src/eXtransport.h \ + src/eXosip2.h + +LOCAL_SRC_FILES += \ + src/eXtl.c \ + src/eXtl_udp.c \ + src/eXtl_tcp.c \ + src/eXtl_dtls.c \ + src/eXtl_tls.c + +LOCAL_SRC_FILES += \ + src/milenage.c \ + src/rijndael.c \ + src/milenage.h \ + src/rijndael.h + +# BUILD_MAXSIZE: -UMINISIZE +LOCAL_SRC_FILES += \ + src/eXsubscription_api.c \ + src/eXoptions_api.c \ + src/eXinsubscription_api.c \ + src/eXpublish_api.c \ + src/jnotify.c \ + src/jsubscribe.c \ + src/inet_ntop.c \ + src/inet_ntop.h \ + src/jpipe.c \ + src/jpipe.h \ + src/eXrefer_api.c \ + src/jpublish.c \ + src/sdp_offans.c + +LOCAL_CFLAGS += \ + -UHAVE_CONFIG_H \ + -include $(LOCAL_PATH)/../build/exosip/libeXosip2_AndroidConfig.h \ + -DOSIP_MT \ + -DENABLE_TRACE + +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/../osip/include \ + +#LOCAL_SHARED_LIBRARIES := libosip2 + +include $(BUILD_STATIC_LIBRARY) diff --git a/submodules/externals/build/exosip/libeXosip2_AndroidConfig.h b/submodules/externals/build/exosip/libeXosip2_AndroidConfig.h new file mode 100755 index 000000000..a17d05950 --- /dev/null +++ b/submodules/externals/build/exosip/libeXosip2_AndroidConfig.h @@ -0,0 +1,123 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_NAMESER_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CTYPE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getifaddrs' function. */ +/* #undef HAVE_GETIFADDRS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_SSL_H */ + +/* Define if you have POSIX threads libraries and header files. */ +#define HAVE_PTHREAD 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_RESOLV8_COMPAT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_RESOLV_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SEMAPHORE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SEM_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SIGNAL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SOUNDCARD_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VARARGS_H */ + +/* Name of package */ +#define PACKAGE "libeXosip2" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Define to the necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "3.1.0" diff --git a/submodules/externals/build/gsm/Android.mk b/submodules/externals/build/gsm/Android.mk new file mode 100644 index 000000000..d4af20aac --- /dev/null +++ b/submodules/externals/build/gsm/Android.mk @@ -0,0 +1,34 @@ + +LOCAL_PATH:= $(call my-dir)/../../gsm +include $(CLEAR_VARS) + +LOCAL_MODULE:= libgsm + +LOCAL_SRC_FILES := \ + src/add.c \ + src/code.c \ + src/debug.c \ + src/decode.c \ + src/long_term.c \ + src/lpc.c \ + src/preprocess.c \ + src/rpe.c \ + src/gsm_destroy.c \ + src/gsm_decode.c \ + src/gsm_encode.c \ + src/gsm_explode.c \ + src/gsm_implode.c \ + src/gsm_create.c \ + src/gsm_print.c \ + src/gsm_option.c \ + src/short_term.c \ + src/table.c + + +#LOCAL_CFLAGS += \ + +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/inc + +include $(BUILD_STATIC_LIBRARY) + diff --git a/submodules/externals/build/osip/Android.mk b/submodules/externals/build/osip/Android.mk new file mode 100755 index 000000000..b8bb072a7 --- /dev/null +++ b/submodules/externals/build/osip/Android.mk @@ -0,0 +1,92 @@ + +LOCAL_PATH:= $(call my-dir)/../../osip +include $(CLEAR_VARS) + + +libosip2_SRC_FILES = \ + src/osip2/ict_fsm.c \ + src/osip2/ist_fsm.c \ + src/osip2/nict_fsm.c \ + src/osip2/nist_fsm.c \ + src/osip2/ict.c \ + src/osip2/ist.c \ + src/osip2/nict.c \ + src/osip2/nist.c \ + src/osip2/fsm_misc.c \ + src/osip2/osip.c \ + src/osip2/osip_transaction.c \ + src/osip2/osip_event.c \ + src/osip2/port_fifo.c \ + src/osip2/osip_dialog.c \ + src/osip2/osip_time.c \ + src/osip2/port_sema.c \ + src/osip2/port_thread.c \ + src/osip2/port_condv.c + +libosipparser2_SRC_FILES = \ + src/osipparser2/osip_proxy_authorization.c \ + src/osipparser2/osip_cseq.c \ + src/osipparser2/osip_record_route.c \ + src/osipparser2/osip_route.c \ + src/osipparser2/osip_to.c \ + src/osipparser2/osip_from.c \ + src/osipparser2/osip_uri.c \ + src/osipparser2/osip_authorization.c \ + src/osipparser2/osip_header.c \ + src/osipparser2/osip_www_authenticate.c \ + src/osipparser2/osip_via.c \ + src/osipparser2/osip_body.c \ + src/osipparser2/osip_md5c.c \ + src/osipparser2/osip_message.c \ + src/osipparser2/osip_list.c \ + src/osipparser2/osip_call_id.c \ + src/osipparser2/osip_message_parse.c \ + src/osipparser2/osip_contact.c \ + src/osipparser2/osip_message_to_str.c \ + src/osipparser2/osip_content_length.c \ + src/osipparser2/osip_parser_cfg.c \ + src/osipparser2/osip_content_type.c \ + src/osipparser2/osip_proxy_authenticate.c \ + src/osipparser2/osip_mime_version.c \ + src/osipparser2/osip_port.c + +# BUILD_MAXSIZE: -UMINISIZE +libosipparser2_SRC_FILES += \ + src/osipparser2/osip_accept_encoding.c \ + src/osipparser2/osip_content_encoding.c \ + src/osipparser2/osip_authentication_info.c \ + src/osipparser2/osip_proxy_authentication_info.c \ + src/osipparser2/osip_accept_language.c \ + src/osipparser2/osip_accept.c \ + src/osipparser2/osip_alert_info.c \ + src/osipparser2/osip_error_info.c \ + src/osipparser2/osip_allow.c \ + src/osipparser2/osip_content_disposition.c \ + src/osipparser2/sdp_accessor.c \ + src/osipparser2/sdp_message.c \ + src/osipparser2/osip_call_info.c + +LOCAL_SRC_FILES := \ + $(libosip2_SRC_FILES) \ + $(libosipparser2_SRC_FILES) + +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/include + +LOCAL_MODULE:= libosip2 + +# global flags +LOCAL_CFLAGS += \ + -UHAVE_CONFIG_H \ + -include $(LOCAL_PATH)/../build/osip/libosip2_AndroidConfig.h + +# specific flags +LOCAL_CFLAGS += \ + -DOSIP_MT \ + -DHAVE_PTHREAD \ + -DENABLE_TRACE \ + -DUSE_GPERF + +#LOCAL_LDLIBS += -lpthread + +include $(BUILD_STATIC_LIBRARY) diff --git a/submodules/externals/build/osip/libosip2_AndroidConfig.h b/submodules/externals/build/osip/libosip2_AndroidConfig.h new file mode 100755 index 000000000..b754cebf7 --- /dev/null +++ b/submodules/externals/build/osip/libosip2_AndroidConfig.h @@ -0,0 +1,117 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CTYPE_H 1 + +/* Define to 1 if you have header file */ +/* #undef HAVE_DICT_DICT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Defined if you have lrand48 */ +#define HAVE_LRAND48 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define if you have POSIX threads libraries and header files. */ +#define HAVE_PTHREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SEMAPHORE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if the system has the type `struct timeval'. */ +#define HAVE_STRUCT_TIMEVAL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSLOG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SEM_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SIGNAL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_UNISTD_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VARARGS_H */ + +/* Name of package */ +#define PACKAGE "libosip2" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Define to the necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "3.1.0" diff --git a/submodules/externals/build/speex/Android.mk b/submodules/externals/build/speex/Android.mk new file mode 100644 index 000000000..c9c547de7 --- /dev/null +++ b/submodules/externals/build/speex/Android.mk @@ -0,0 +1,93 @@ + +LOCAL_PATH:= $(call my-dir)/../../speex +include $(CLEAR_VARS) + +LOCAL_MODULE:= libspeex + +# Need some non-thumb arm instructions +LOCAL_ARM_MODE := arm + +libspeex_SRC_FILES := \ + libspeex/cb_search.c \ + libspeex/exc_10_32_table.c \ + libspeex/exc_8_128_table.c \ + libspeex/filters.c \ + libspeex/gain_table.c \ + libspeex/hexc_table.c \ + libspeex/high_lsp_tables.c \ + libspeex/lsp.c \ + libspeex/ltp.c \ + libspeex/speex.c \ + libspeex/stereo.c \ + libspeex/vbr.c \ + libspeex/vq.c \ + libspeex/bits.c \ + libspeex/exc_10_16_table.c \ + libspeex/exc_20_32_table.c \ + libspeex/exc_5_256_table.c \ + libspeex/exc_5_64_table.c \ + libspeex/gain_table_lbr.c \ + libspeex/hexc_10_32_table.c \ + libspeex/lpc.c \ + libspeex/lsp_tables_nb.c \ + libspeex/modes.c \ + libspeex/modes_wb.c \ + libspeex/nb_celp.c \ + libspeex/quant_lsp.c \ + libspeex/sb_celp.c \ + libspeex/speex_callbacks.c \ + libspeex/speex_header.c \ + libspeex/window.c + +# Default FFT is FFTW3 +fft_SRC_FILES = + +# Un-comment for KISS_FFT and SMALL_FFT +fft_SRC_FILES += libspeex/smallft.c + +# Un-comment for KISS_FFT +fft_SRC_FILES += \ + libspeex/kiss_fft.c \ + libspeex/_kiss_fft_guts.h \ + libspeex/kiss_fft.h \ + libspeex/kiss_fftr.c \ + libspeex/kiss_fftr.h + +libspeexdsp_SRC_FILES := \ + libspeex/preprocess.c \ + libspeex/jitter.c \ + libspeex/mdf.c \ + libspeex/fftwrap.c \ + libspeex/filterbank.c \ + libspeex/resample.c \ + libspeex/buffer.c \ + libspeex/scal.c \ + $(fft_SRC_FILES) + +LOCAL_SRC_FILES := \ + $(libspeex_SRC_FILES) \ + $(libspeexdsp_SRC_FILES) + +ifeq ($(TARGET_ARCH),arm) +LOCAL_CFLAGS +=\ + -DARM5E_ASM \ + -DDISABLE_FLOAT_API \ + -DFIXED_POINT=1 +else +LOCAL_CFLAGS += \ + -DFLOATING_POINT=1 +endif + + + +LOCAL_CFLAGS += \ + -UHAVE_CONFIG_H \ + -include $(LOCAL_PATH)/../build/speex/speex_AndroidConfig.h \ + '-DEXPORT=__attribute__((visibility("default")))' + +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/../build/speex \ + $(LOCAL_PATH)/include + +include $(BUILD_STATIC_LIBRARY) + diff --git a/submodules/externals/build/speex/speex/speex_config_types.h b/submodules/externals/build/speex/speex/speex_config_types.h new file mode 100644 index 000000000..bd548546b --- /dev/null +++ b/submodules/externals/build/speex/speex/speex_config_types.h @@ -0,0 +1,11 @@ +#ifndef __SPEEX_TYPES_H__ +#define __SPEEX_TYPES_H__ + +/* these are filled in by configure */ +typedef short spx_int16_t; +typedef unsigned short spx_uint16_t; +typedef int spx_int32_t; +typedef unsigned int spx_uint32_t; + +#endif + diff --git a/submodules/externals/build/speex/speex_AndroidConfig.h b/submodules/externals/build/speex/speex_AndroidConfig.h new file mode 100644 index 000000000..07701f5af --- /dev/null +++ b/submodules/externals/build/speex/speex_AndroidConfig.h @@ -0,0 +1,167 @@ +/* Manually modified for Android integration (as speex_AndroidConfig.h) */ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Make use of ARM4 assembly optimizations */ +/* #undef ARM4_ASM */ + +/* Make use of ARM5E assembly optimizations */ +/*#define ARM5E_ASM*/ + +/* Make use of Blackfin assembly optimizations */ +/* #undef BFIN_ASM */ + +/* Disable all parts of the API that are using floats */ +/*#define DISABLE_FLOAT_API*/ + +/* Disable VBR and VAD from the codec */ +/* #undef DISABLE_VBR */ + +/* Enable valgrind extra checks */ +/* #undef ENABLE_VALGRIND */ + +/* Symbol visibility prefix */ +#define EXPORT __attribute__((visibility("default"))) + +/* Debug fixed-point implementation */ +/* #undef FIXED_DEBUG */ + +/* Compile as fixed-point */ +/*#define FIXED_POINT 1*/ + +/* Compile as floating-point */ +/* #undef FLOATING_POINT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ALLOCA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `m' library (-lm). */ +#define HAVE_LIBM 1 + +/* Define to 1 if you have the `winmm' library (-lwinmm). */ +/* #undef HAVE_LIBWINMM */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_AUDIOIO_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SOUNDCARD_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* Version extra */ +#define SPEEX_EXTRA_VERSION "" + +/* Version major */ +#define SPEEX_MAJOR_VERSION 1 + +/* Version micro */ +#define SPEEX_MICRO_VERSION 16 + +/* Version minor */ +#define SPEEX_MINOR_VERSION 1 + +/* Complete version string */ +#define SPEEX_VERSION "1.2rc1" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Enable support for TI C55X DSP */ +/* #undef TI_C55X */ + +/* Make use of alloca */ +/* #undef USE_ALLOCA */ + +/* Use FFTW3 for FFT */ +/* #undef USE_GPL_FFTW3 */ + +/* Use Intel Math Kernel Library for FFT */ +/* #undef USE_INTEL_MKL */ + +/* Use KISS Fast Fourier Transform */ +/* #undef USE_KISS_FFT */ + +/* Use FFT from OggVorbis */ +#define USE_SMALLFT + +/* Use C99 variable-size arrays */ +#define VAR_ARRAYS + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Enable SSE support */ +/* #undef _USE_SSE */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to equivalent of C99 restrict keyword, or to nothing if this is not + supported. Do not define if restrict is supported directly. */ +#define restrict __restrict diff --git a/submodules/externals/speex b/submodules/externals/speex new file mode 160000 index 000000000..a6d05eb5f --- /dev/null +++ b/submodules/externals/speex @@ -0,0 +1 @@ +Subproject commit a6d05eb5ff9d5062852cdf7df574bec728921ef9 diff --git a/submodules/linphone b/submodules/linphone index 5a6a50ee7..da5f07375 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5a6a50ee78c69869d338efb78020f5fca192eac6 +Subproject commit da5f0737578936881ed77d88525cb9bf6cc4961b