diff options
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/build/Makefile | 7 | ||||
-rw-r--r-- | pjmedia/build/os-auto.mak.in | 14 | ||||
-rw-r--r-- | pjmedia/build/os-darwinos.mak | 15 | ||||
-rw-r--r-- | pjmedia/build/os-linux.mak | 15 | ||||
-rw-r--r-- | pjmedia/build/os-win32.mak | 15 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/transport_srtp.c | 8 |
6 files changed, 68 insertions, 6 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 7df9ede..ca8e588 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -3,10 +3,6 @@ include ../../version.mak 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 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ $(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) diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index 04224e8..e71cde1 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -127,6 +127,20 @@ endif # +# 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 + +# # PortAudio # ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) diff --git a/pjmedia/build/os-darwinos.mak b/pjmedia/build/os-darwinos.mak index 7904594..82fdfbf 100644 --- a/pjmedia/build/os-darwinos.mak +++ b/pjmedia/build/os-darwinos.mak @@ -80,6 +80,21 @@ 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 # ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) diff --git a/pjmedia/build/os-linux.mak b/pjmedia/build/os-linux.mak index 63910c4..a6d2dd3 100644 --- a/pjmedia/build/os-linux.mak +++ b/pjmedia/build/os-linux.mak @@ -74,6 +74,21 @@ 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 # ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) diff --git a/pjmedia/build/os-win32.mak b/pjmedia/build/os-win32.mak index 498a9e1..0df71a5 100644 --- a/pjmedia/build/os-win32.mak +++ b/pjmedia/build/os-win32.mak @@ -76,6 +76,21 @@ 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 # ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) diff --git a/pjmedia/src/pjmedia/transport_srtp.c b/pjmedia/src/pjmedia/transport_srtp.c index a661c37..bd0e9b6 100644 --- a/pjmedia/src/pjmedia/transport_srtp.c +++ b/pjmedia/src/pjmedia/transport_srtp.c @@ -30,7 +30,11 @@ #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) +#if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0) +#include <srtp/srtp.h> +#else #include <srtp.h> +#endif #define THIS_FILE "transport_srtp.c" @@ -315,11 +319,15 @@ static void pjmedia_srtp_deinit_lib(pjmedia_endpt *endpt) PJ_UNUSED_ARG(endpt); +#if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0) + PJ_UNUSED_ARG(err); +#else err = srtp_deinit(); if (err != err_status_ok) { PJ_LOG(4, (THIS_FILE, "Failed to deinitialize libsrtp: %s", get_libsrtp_errstr(err))); } +#endif libsrtp_initialized = PJ_FALSE; } |