Commit b2ddf6ec authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix build without webrtc echo canceller.

parent ee7845e0
......@@ -42,9 +42,7 @@ MEDIASTREAMER2_INCLUDES := \
$(LOCAL_PATH)/../../../externals/ffmpeg \
$(LOCAL_PATH)/../../../externals/ \
$(LOCAL_PATH)/../../../externals/build/ffmpeg \
$(LOCAL_PATH)/../../../externals/libvpx/ \
$(LOCAL_PATH)/../../../externals/webrtc/ \
$(LOCAL_PATH)/../../../externals/webrtc/modules/audio_processing/aecm/include
$(LOCAL_PATH)/../../../externals/libvpx/
LOCAL_MODULE := libmediastreamer2
......@@ -102,11 +100,6 @@ LOCAL_SRC_FILES = \
LOCAL_STATIC_LIBRARIES :=
ifneq ($(TARGET_ARCH_ABI), x86)
LOCAL_SRC_FILES += \
audiofilters/webrtc_aec.c
endif
##if BUILD_ALSA
ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
LOCAL_SRC_FILES += audiofilters/alsa.c
......@@ -209,7 +202,16 @@ LOCAL_STATIC_LIBRARIES += \
libspeex \
libspeexdsp
ifneq ($(BUILD_WEBRTC_AECM), 0)
ifneq ($(TARGET_ARCH_ABI), x86)
LOCAL_CFLAGS += -DBUILD_WEBRTC_AECM
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../../externals/webrtc/ \
$(LOCAL_PATH)/../../../externals/webrtc/modules/audio_processing/aecm/include
LOCAL_SRC_FILES += audiofilters/webrtc_aec.c
LOCAL_STATIC_LIBRARIES += \
libwebrtc_aecm \
libwebrtc_apm_utility \
......@@ -221,6 +223,7 @@ LOCAL_STATIC_LIBRARIES += \
libwebrtc_spl_neon
endif
endif
endif
ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
......
......@@ -37,7 +37,7 @@ extern MSFilterDesc ms_g722_enc_desc;
extern MSFilterDesc ms_l16_enc_desc;
extern MSFilterDesc ms_l16_dec_desc;
extern MSFilterDesc ms_jpeg_writer_desc;
#ifdef __arm__
#if defined(__arm__) && defined(BUILD_WEBRTC_AECM)
extern MSFilterDesc ms_webrtc_aec_desc;
#endif
......@@ -79,7 +79,7 @@ MSFilterDesc * ms_voip_filter_descs[]={
&ms_vp8_dec_desc,
&ms_jpeg_writer_desc,
#endif
#ifdef __arm__
#if defined(__arm__) && defined(BUILD_WEBRTC_AECM)
&ms_webrtc_aec_desc,
#endif
NULL
......
......@@ -656,7 +656,7 @@ AudioStream *audio_stream_new(int loc_rtp_port, int loc_rtcp_port, bool_t ipv6){
if (ec_desc!=NULL)
stream->ec=ms_filter_new_from_desc(ec_desc);
else
#if defined(ANDROID) && defined __arm__
#if defined(ANDROID) && defined __arm__ && defined(BUILD_WEBRTC_AECM)
stream->ec=ms_filter_new(MS_WEBRTC_AEC_ID);
#else
stream->ec=ms_filter_new(MS_SPEEX_EC_ID);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment