sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re #2035: Don't include srtp.h on pjmedia config.h, which raise error when including PJSIP from install dir. 

Thanks to Peter Koletzki for the report.



git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5643 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Riza Sulistyo 2017-08-22 04:59:57 +00:00
parent cc2ecbfb28
commit 087584a93f
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pjmedia/include/pjmedia/config.h
View File

@ -1379,23 +1379,17 @@
* Maximum video payload size. Note that this must not be greater than
* PJMEDIA_MAX_MTU.
*
* Default: (PJMEDIA_MAX_MTU - SRTP_MAX_TRAILER_LEN) if SRTP is enabled,
* otherwise (PJMEDIA_MAX_MTU - 100)
* Default: (PJMEDIA_MAX_MTU - 20 - (128+16)) if SRTP is enabled,
* otherwise (PJMEDIA_MAX_MTU - 20).
* Note that (128+16) constant value is taken from libSRTP macro
* SRTP_MAX_TRAILER_LEN.
*/
#ifndef PJMEDIA_MAX_VID_PAYLOAD_SIZE
/* Include SRTP_MAX_TRAILER_LEN definition. */
# if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0)
# include "srtp/srtp.h"
# elif (defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0))
# include "../../third_party/srtp/include/srtp.h"
# endif
# if defined(SRTP_MAX_TRAILER_LEN)
# define PJMEDIA_MAX_VID_PAYLOAD_SIZE (PJMEDIA_MAX_MTU - \
SRTP_MAX_TRAILER_LEN)
# else
# define PJMEDIA_MAX_VID_PAYLOAD_SIZE (PJMEDIA_MAX_MTU - 100)
# endif
# if PJMEDIA_HAS_SRTP
# define PJMEDIA_MAX_VID_PAYLOAD_SIZE (PJMEDIA_MAX_MTU - 20 - (128+16))
# else
# define PJMEDIA_MAX_VID_PAYLOAD_SIZE (PJMEDIA_MAX_MTU - 20)
# endif
#endif