New speex repository

Resampler optimisations previously found in MS2/msresample.c are
now in speex repo.
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-11-16 10:53:44 +01:00
parent cc11c74401
commit 7e7d144dc2
4 changed files with 7 additions and 11 deletions

2
.gitmodules vendored
View file

@ -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

View file

@ -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)

@ -1 +1 @@
Subproject commit a6d05eb5ff9d5062852cdf7df574bec728921ef9
Subproject commit 7657e404191ce939f79fc571008272b411b52089

@ -1 +1 @@
Subproject commit ce510f9d1fa8d66aabcca308f0d2a9174f68acd4
Subproject commit 07b0535c9ba7b5da4700e811c8e04548813649cf