Commit 3433e47b authored by Guillaume BIENKOWSKI's avatar Guillaume BIENKOWSKI
Browse files

Merge branch 'isac'

parents 9a926854 4e75d6f9
...@@ -237,6 +237,11 @@ endif ...@@ -237,6 +237,11 @@ endif
endif endif
endif endif
ifneq ($(BUILD_WEBRTC_ISAC), 0)
LOCAL_CFLAGS += -DHAVE_ISAC
LOCAL_STATIC_LIBRARIES += libwebrtc_spl libwebrtc_isacfix libmsisac
endif
ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true) ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
LOCAL_SHARED_LIBRARIES += libasound LOCAL_SHARED_LIBRARIES += libasound
......
...@@ -57,7 +57,10 @@ extern void libmsx264_init(); ...@@ -57,7 +57,10 @@ extern void libmsx264_init();
#endif #endif
#ifdef HAVE_SILK #ifdef HAVE_SILK
extern void libmssilk_init(); extern void libmssilk_init();
#endif #endif
#ifdef HAVE_ISAC
extern void libmsisac_init();
#endif
#endif #endif
#ifdef ANDROID #ifdef ANDROID
...@@ -529,13 +532,16 @@ void setup_media_streams(MediastreamDatas* args) { ...@@ -529,13 +532,16 @@ void setup_media_streams(MediastreamDatas* args) {
#if TARGET_OS_IPHONE || defined(ANDROID) #if TARGET_OS_IPHONE || defined(ANDROID)
#if defined (HAVE_X264) && defined (VIDEO_ENABLED) #if defined (HAVE_X264) && defined (VIDEO_ENABLED)
libmsx264_init(); /*no plugin on IOS*/ libmsx264_init(); /*no plugin on IOS/Android */
#endif #endif
#if defined (HAVE_SILK) #if defined (HAVE_SILK)
libmssilk_init(); /*no plugin on IOS*/ libmssilk_init(); /*no plugin on IOS/Android */
#endif
#endif #endif
#if defined (HAVE_ISAC)
libmsisac_init();
#endif
#endif /* IPHONE | ANDROID */
rtp_profile_set_payload(&av_profile,110,&payload_type_speex_nb); rtp_profile_set_payload(&av_profile,110,&payload_type_speex_nb);
rtp_profile_set_payload(&av_profile,111,&payload_type_speex_wb); rtp_profile_set_payload(&av_profile,111,&payload_type_speex_wb);
......
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