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

Build the iSAC codec and the WebRTC echo canceller from the mswebrtc plugin.

Browse source
This commit is contained in:
Ghislain MARY 2014-06-13 14:59:23 +02:00
parent ba44e3c0f7
commit 883d92f608
4 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
jni/Android.mk
View file

@ -152,36 +152,32 @@ WEBRTC_BUILD_NEON_LIBS=false
# AECM # AECM
ifneq ($(BUILD_WEBRTC_AECM),0) ifneq ($(BUILD_WEBRTC_AECM),0)
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
$(info $(TARGET_ARCH_ABI): Build NEON modules for AECM)
WEBRTC_BUILD_NEON_LIBS=true
endif
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) $(info $(TARGET_ARCH_ABI): Build AECM from WebRTC)
$(info $(TARGET_ARCH_ABI): Build NEON modules for AECM) include $(linphone-root-dir)/submodules/externals/build/webrtc/system_wrappers/Android.mk
WEBRTC_BUILD_NEON_LIBS=true include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/utility/Android.mk
endif include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/aecm/Android.mk
$(info $(TARGET_ARCH_ABI): Build AECM from WebRTC)
include $(linphone-root-dir)/submodules/externals/build/webrtc/system_wrappers/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
endif endif
# iSAC # iSAC
ifneq ($(BUILD_WEBRTC_ISAC),0) ifneq ($(BUILD_WEBRTC_ISAC),0)
# don't build for neon in x86
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
$(info $(TARGET_ARCH_ABI): Build NEON modules for ISAC)
WEBRTC_BUILD_NEON_LIBS=true
endif
# don't build for neon in x86 $(info $(TARGET_ARCH_ABI): Build iSAC plugin for mediastreamer2)
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
$(info $(TARGET_ARCH_ABI): Build NEON modules for ISAC)
WEBRTC_BUILD_NEON_LIBS=true
endif
$(info $(TARGET_ARCH_ABI): Build iSAC plugin for mediastreamer2)
include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
include $(linphone-root-dir)/submodules/msisac/Android.mk
endif endif
# common modules for ISAC and AECM # common modules for ISAC and AECM
ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00) ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00)
$(info $(TARGET_ARCH_ABI): Build common modules for iSAC and AECM ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC))) $(info $(TARGET_ARCH_ABI): Build common modules for iSAC and AECM ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)))
include $(linphone-root-dir)/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk include $(linphone-root-dir)/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk
include $(linphone-root-dir)/submodules/mswebrtc/Android.mk
endif endif

4
jni/Application.mk
View file

@ -100,14 +100,14 @@ APP_MODULES += libopus
endif 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 libmswebrtc
ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI))) 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 endif
ifeq ($(BUILD_WEBRTC_ISAC), 1) ifeq ($(BUILD_WEBRTC_ISAC), 1)
APP_MODULES += libwebrtc_spl libwebrtc_isacfix libmsisac APP_MODULES += libwebrtc_spl libwebrtc_isacfix libmswebrtc
ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI))) ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
APP_MODULES += libwebrtc_spl_neon libwebrtc_isacfix_neon APP_MODULES += libwebrtc_spl_neon libwebrtc_isacfix_neon
endif endif

2
submodules/linphone

@ -1 +1 @@
Subproject commit 8db55ea83e5b275dd28bf7cb6199d2541c88db49 Subproject commit 7caaca64ff3e96d202ad9192a0e6dbf76f9deecc

2
submodules/mswebrtc

@ -1 +1 @@
Subproject commit a106bde1dd8fb195b3ada76ebf01f2d2fa5872f9 Subproject commit 0c9d65c32431969e58f77e0c280d7ce601ca043b