Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

enable webrtc aecm for android x86

Browse source
This commit is contained in:
Jehan Monnier 2013-11-15 17:18:09 +01:00
parent ab8a2a4ea5
commit 4c99a6f202
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
jni/Android.mk
View file

@ -147,8 +147,6 @@ WEBRTC_BUILD_NEON_LIBS=false
# AECM # AECM
ifneq ($(BUILD_WEBRTC_AECM),0) ifneq ($(BUILD_WEBRTC_AECM),0)
ifneq ($(TARGET_ARCH), x86)
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
$(info $(TARGET_ARCH_ABI): Build NEON modules for AECM) $(info $(TARGET_ARCH_ABI): Build NEON modules for AECM)
WEBRTC_BUILD_NEON_LIBS=true WEBRTC_BUILD_NEON_LIBS=true
@ -160,7 +158,6 @@ ifneq ($(BUILD_WEBRTC_AECM),0)
include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/utility/Android.mk include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/utility/Android.mk
include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/aecm/Android.mk include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/aecm/Android.mk
endif endif
endif
# iSAC # iSAC
ifneq ($(BUILD_WEBRTC_ISAC),0) ifneq ($(BUILD_WEBRTC_ISAC),0)

4
jni/Application.mk
View file

@ -92,13 +92,17 @@ endif
ifneq ($(BUILD_WEBRTC_AECM), 0) ifneq ($(BUILD_WEBRTC_AECM), 0)
APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility libwebrtc_aecm APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility libwebrtc_aecm
ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
APP_MODULES += libwebrtc_spl_neon libwebrtc_aecm_neon APP_MODULES += libwebrtc_spl_neon libwebrtc_aecm_neon
endif endif
endif
ifeq ($(BUILD_WEBRTC_ISAC), 1) ifeq ($(BUILD_WEBRTC_ISAC), 1)
APP_MODULES += libwebrtc_spl libwebrtc_isacfix libmsisac APP_MODULES += libwebrtc_spl libwebrtc_isacfix libmsisac
ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
APP_MODULES += libwebrtc_spl_neon libwebrtc_isacfix_neon APP_MODULES += libwebrtc_spl_neon libwebrtc_isacfix_neon
endif endif
endif
ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0) ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
ifeq ($(RING),yes) ifeq ($(RING),yes)

2
project.properties
View file

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-17 target=android-18
android.library=false android.library=false

10
submodules/externals/build/webrtc/Android.mk vendored
View file

@ -1,10 +1,12 @@
MY_WEBRTC_COMMON_DEFS := \ MY_WEBRTC_COMMON_DEFS := \
-DWEBRTC_ANDROID \ -DWEBRTC_ANDROID \
-DWEBRTC_LINUX \ -DWEBRTC_LINUX \
-DWEBRTC_CLOCK_TYPE_REALTIME \ -DWEBRTC_CLOCK_TYPE_REALTIME
-DWEBRTC_ARCH_ARM
ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
MY_WEBRTC_COMMON_DEFS += -DWEBRTC_ARCH_ARM
endif
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
MY_WEBRTC_COMMON_DEFS += \ MY_WEBRTC_COMMON_DEFS += -DWEBRTC_DETECT_ARM_NEON
-DWEBRTC_DETECT_ARM_NEON
endif endif

2
submodules/linphone

@ -1 +1 @@
Subproject commit 0138897ef049fbf124b9a324592877bfe47349b2 Subproject commit 244edb9b71a5061f2d65eecd73c55bb48355710f