* #39101: updated pjsip stack, many android build enhancements.
The main issue here is due to the build system of the stack compared to a pure Android
NDK project. Generating arm and x86 ABI at the same time does not seem to be possible.
diff --git a/jni/pjproject-android/pjmedia/build/Makefile b/jni/pjproject-android/pjmedia/build/Makefile
index e21e9c0..a567e63 100644
--- a/jni/pjproject-android/pjmedia/build/Makefile
+++ b/jni/pjproject-android/pjmedia/build/Makefile
@@ -3,10 +3,6 @@
THIRD_PARTY:=$(PJDIR)/third_party
-SRTP_INC=$(CC_INC)$(THIRD_PARTY)/build/srtp \
- $(CC_INC)$(THIRD_PARTY)/srtp/crypto/include \
- $(CC_INC)$(THIRD_PARTY)/srtp/include
-
include $(PJDIR)/build/common.mak
export LIBDIR := ../lib
@@ -48,8 +44,7 @@
$(CC_INC)../../pjlib-util/include \
$(CC_INC)../../pjmedia/include \
$(CC_INC)../../pjnath/include \
- $(CC_INC)../.. \
- $(SRTP_INC)
+ $(CC_INC)../..
export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
$(HOST_CXXFLAGS) $(CXXFLAGS)
@@ -71,7 +66,7 @@
event.o format.o ffmpeg_util.o \
g711.o jbuf.o master_port.o mem_capture.o mem_player.o \
null_port.o plc_common.o port.o splitcomb.o \
- resample_resample.o resample_libsamplerate.o \
+ resample_resample.o resample_libsamplerate.o resample_speex.o \
resample_port.o rtcp.o rtcp_xr.o rtp.o \
sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \
sound_legacy.o sound_port.o stereo_port.o stream_common.o \
diff --git a/jni/pjproject-android/pjmedia/build/os-auto.mak.in b/jni/pjproject-android/pjmedia/build/os-auto.mak.in
index b0502f3..f451331 100644
--- a/jni/pjproject-android/pjmedia/build/os-auto.mak.in
+++ b/jni/pjproject-android/pjmedia/build/os-auto.mak.in
@@ -129,6 +129,42 @@
#
+# SRTP
+#
+ifeq (@ac_external_srtp@,1)
+# External SRTP
+export CFLAGS += -DPJMEDIA_EXTERNAL_SRTP=1
+else
+# Our SRTP in third_party
+export CFLAGS += -I$(THIRD_PARTY)/build/srtp \
+ -I$(THIRD_PARTY)/srtp/crypto/include \
+ -I$(THIRD_PARTY)/srtp/include
+
+endif
+
+#
+# Resample
+#
+AC_PJMEDIA_RESAMPLE=@ac_pjmedia_resample@
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),none)
+# No resample support
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_NONE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),libresample)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),libsamplerate)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBSAMPLERATE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),speex)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_SPEEX
+endif
+
+#
# PortAudio
#
ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),)
diff --git a/jni/pjproject-android/pjmedia/build/os-darwinos.mak b/jni/pjproject-android/pjmedia/build/os-darwinos.mak
index 7904594..3548c8e 100644
--- a/jni/pjproject-android/pjmedia/build/os-darwinos.mak
+++ b/jni/pjproject-android/pjmedia/build/os-darwinos.mak
@@ -78,6 +78,42 @@
export G7221_CFLAGS += -I$(THIRD_PARTY)
endif
+#
+# Resample
+#
+AC_PJMEDIA_RESAMPLE=libresample
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),none)
+# No resample support
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_NONE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),libresample)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),libsamplerate)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBSAMPLERATE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),speex)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_SPEEX
+endif
+
+#
+# SRTP
+#
+#ifeq (@ac_external_srtp@,1)
+ifeq (0,1)
+# External SRTP
+export CFLAGS += -DPJMEDIA_EXTERNAL_SRTP=1
+else
+# Our SRTP in third_party
+export CFLAGS += -I$(THIRD_PARTY)/build/srtp \
+ -I$(THIRD_PARTY)/srtp/crypto/include \
+ -I$(THIRD_PARTY)/srtp/include
+
+endif
#
# PortAudio
diff --git a/jni/pjproject-android/pjmedia/build/os-linux.mak b/jni/pjproject-android/pjmedia/build/os-linux.mak
index 63910c4..eb05091 100644
--- a/jni/pjproject-android/pjmedia/build/os-linux.mak
+++ b/jni/pjproject-android/pjmedia/build/os-linux.mak
@@ -72,6 +72,42 @@
export G7221_CFLAGS += -I$(THIRD_PARTY)
endif
+#
+# Resample
+#
+AC_PJMEDIA_RESAMPLE=libresample
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),none)
+# No resample support
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_NONE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),libresample)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),libsamplerate)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBSAMPLERATE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),speex)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_SPEEX
+endif
+
+#
+# SRTP
+#
+#ifeq (@ac_external_srtp@,1)
+ifeq (0,1)
+# External SRTP
+export CFLAGS += -DPJMEDIA_EXTERNAL_SRTP=1
+else
+# Our SRTP in third_party
+export CFLAGS += -I$(THIRD_PARTY)/build/srtp \
+ -I$(THIRD_PARTY)/srtp/crypto/include \
+ -I$(THIRD_PARTY)/srtp/include
+
+endif
#
# PortAudio
diff --git a/jni/pjproject-android/pjmedia/build/os-rtems.mak b/jni/pjproject-android/pjmedia/build/os-rtems.mak
index bbcfad4..cf7440f 100644
--- a/jni/pjproject-android/pjmedia/build/os-rtems.mak
+++ b/jni/pjproject-android/pjmedia/build/os-rtems.mak
@@ -6,3 +6,4 @@
export PJMEDIA_OBJS += nullsound.o
export SOUND_OBJS = $(NULLSOUND_OBJS)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE
diff --git a/jni/pjproject-android/pjmedia/build/os-win32.mak b/jni/pjproject-android/pjmedia/build/os-win32.mak
index 498a9e1..b85183a 100644
--- a/jni/pjproject-android/pjmedia/build/os-win32.mak
+++ b/jni/pjproject-android/pjmedia/build/os-win32.mak
@@ -74,6 +74,42 @@
export G7221_CFLAGS += -I$(THIRD_PARTY)
endif
+#
+# Resample
+#
+AC_PJMEDIA_RESAMPLE=libresample
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),none)
+# No resample support
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_NONE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),libresample)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),libsamplerate)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBSAMPLERATE
+endif
+
+ifeq ($(AC_PJMEDIA_RESAMPLE),speex)
+export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_SPEEX
+endif
+
+#
+# SRTP
+#
+#ifeq (@ac_external_srtp@,1)
+ifeq (0,1)
+# External SRTP
+export CFLAGS += -DPJMEDIA_EXTERNAL_SRTP=1
+else
+# Our SRTP in third_party
+export CFLAGS += -I$(THIRD_PARTY)/build/srtp \
+ -I$(THIRD_PARTY)/srtp/crypto/include \
+ -I$(THIRD_PARTY)/srtp/include
+
+endif
#
# PortAudio