From 7e7d144dc27d32c7546995324335ef50cd8c53f5 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Wed, 16 Nov 2011 10:53:44 +0100
Subject: [PATCH] New speex repository

Resampler optimisations previously found in MS2/msresample.c are
now in speex repo.
---
 .gitmodules                                 |  2 +-
 submodules/externals/build/speex/Android.mk | 12 ++++--------
 submodules/externals/speex                  |  2 +-
 submodules/linphone                         |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 88ea29f34..b7c3d6e15 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,7 +12,7 @@
 	url = git://git.linphone.org/gsm.git
 [submodule "submodules/externals/speex"]
 	path = submodules/externals/speex
-	url = http://git.xiph.org/speex.git
+	url = git://git.linphone.org/speex
 [submodule "submodules/msilbc"]
 	path = submodules/msilbc
 	url = git://git.linphone.org/msilbc.git
diff --git a/submodules/externals/build/speex/Android.mk b/submodules/externals/build/speex/Android.mk
index 80fe4243b..7e3e881fb 100644
--- a/submodules/externals/build/speex/Android.mk
+++ b/submodules/externals/build/speex/Android.mk
@@ -59,6 +59,7 @@ libspeexdsp_SRC_FILES := \
 	libspeex/resample.c \
 	libspeex/buffer.c \
 	libspeex/scal.c \
+	libspeex/speexdsp.c \
 	$(fft_SRC_FILES)
 
 LOCAL_SRC_FILES := \
@@ -77,18 +78,13 @@ FIXED_POINT_FLAGS=\
 
 ifeq ($(TARGET_ARCH),arm)
 	ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+		LOCAL_CFLAGS += -DARMV7NEON_ASM
+		# add NEON support
+		LOCAL_SRC_FILES += libspeex/resample_neon.c.neon
 		ifeq ($(USE_FLOAT),1)
 			LOCAL_CFLAGS += -DFLOATING_POINT=1 
-			LOCAL_CFLAGS += -DOVERRIDE_INTERPOLATE_PRODUCT_SINGLE
-			ifeq ($(LINPHONE_VIDEO),1)
-				LOCAL_CFLAGS += -DOVERRIDE_INNER_PRODUCT_SINGLE -Dinner_product_single=ff_scalarproduct_float_neon
-			endif	
 		else 
 			LOCAL_CFLAGS += $(FIXED_POINT_FLAGS)
-			LOCAL_CFLAGS += -DOVERRIDE_INTERPOLATE_PRODUCT_SINGLE -Dinterpolate_product_single=interpolate_product_single_int
-			ifeq ($(LINPHONE_VIDEO),1)
-				LOCAL_CFLAGS += -DOVERRIDE_INNER_PRODUCT_SINGLE -Dinner_product_single=msresampler_scalarproduct_int16
-			endif
 		endif
 	else
 		LOCAL_CFLAGS += $(FIXED_POINT_FLAGS)
diff --git a/submodules/externals/speex b/submodules/externals/speex
index a6d05eb5f..7657e4041 160000
--- a/submodules/externals/speex
+++ b/submodules/externals/speex
@@ -1 +1 @@
-Subproject commit a6d05eb5ff9d5062852cdf7df574bec728921ef9
+Subproject commit 7657e404191ce939f79fc571008272b411b52089
diff --git a/submodules/linphone b/submodules/linphone
index ce510f9d1..07b0535c9 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ce510f9d1fa8d66aabcca308f0d2a9174f68acd4
+Subproject commit 07b0535c9ba7b5da4700e811c8e04548813649cf