From 3efbb0b44d5ca7a1640c52c7207c84c944cb4c65 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 10 Dec 2010 16:41:14 +0100
Subject: [PATCH] add optimized resampler

---
 submodules/externals/build/speex/Android.mk      | 16 ++++++++++++----
 .../build/speex/speex/speex_config_types.h       |  2 ++
 submodules/linphone                              |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/submodules/externals/build/speex/Android.mk b/submodules/externals/build/speex/Android.mk
index e661e838e..e77ef1493 100644
--- a/submodules/externals/build/speex/Android.mk
+++ b/submodules/externals/build/speex/Android.mk
@@ -67,10 +67,18 @@ LOCAL_SRC_FILES := \
 
 #	-DARM4_ASM 
 ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS +=\
-	-DARM5E_ASM \
-	-DDISABLE_FLOAT_API \
-	-DFIXED_POINT=1
+	ifeq ($(LINPHONE_VIDEO),1)
+		LOCAL_CFLAGS += -DOVERRIDE_INNER_PRODUCT_SINGLE -Dinner_product_single=ff_scalarproduct_float_neon
+	endif	
+	ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+		LOCAL_CFLAGS += -DFLOATING_POINT=1 
+		LOCAL_CFLAGS += -DOVERRIDE_INTERPOLATE_PRODUCT_SINGLE
+	else 
+		LOCAL_CFLAGS +=\
+			-DARM5E_ASM\
+			-DDISABLE_FLOAT_API \
+			-DFIXED_POINT=1
+	endif 
 else
 LOCAL_CFLAGS += \
 	-DFLOATING_POINT=1
diff --git a/submodules/externals/build/speex/speex/speex_config_types.h b/submodules/externals/build/speex/speex/speex_config_types.h
index bd548546b..71802ecfa 100644
--- a/submodules/externals/build/speex/speex/speex_config_types.h
+++ b/submodules/externals/build/speex/speex/speex_config_types.h
@@ -7,5 +7,7 @@ typedef unsigned short spx_uint16_t;
 typedef int spx_int32_t;
 typedef unsigned int spx_uint32_t;
 
+extern float ff_scalarproduct_float_neon  (const float *v1, const float *v2, int len);
+extern float interpolate_product_single(const float *a, const float *b, unsigned int len, const spx_uint32_t oversample, float *frac);
 #endif
 
diff --git a/submodules/linphone b/submodules/linphone
index 5299f13ea..45934f35c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 5299f13eada1a8380ace99762cf20b73916aa324
+Subproject commit 45934f35c0182d01d2f78ffca2b726d67fe95423