Changeset 4701 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Jan 3, 2014 3:44:05 AM (10 years ago)

Author:

nanang

Message:

Close #1720:

• Added configure flags --with-external-srtp and --disable-resample.
• Added macro setting PJMEDIA_LIBSRTP_AUTO_INIT_DEINIT to allow application to handle libsrtp init & deinit by itself.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -31 +31 @@
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
 
-#include <srtp.h>
+#if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0)
+#  include <srtp/srtp.h>
+#else
+#  include <srtp.h>
+#endif
 
 #define THIS_FILE   "transport_srtp.c"
@@ -277 +281 @@
 PJ_DEF(pj_status_t) pjmedia_srtp_init_lib(pjmedia_endpt *endpt)
 {
+#if PJMEDIA_LIBSRTP_AUTO_INIT_DEINIT
     if (libsrtp_initialized == PJ_FALSE) {
         err_status_t err;
@@ -299 +304 @@
         libsrtp_initialized = PJ_TRUE;
     }
+#else
+    PJ_UNUSED_ARG(endpt);
+#endif
     
     return PJ_SUCCESS;