Changeset 5643


Ignore:
Timestamp:
Aug 22, 2017 4:59:57 AM (2 years ago)
Author:
riza
Message:

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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/include/pjmedia/config.h

    r5639 r5643  
    13801380 * PJMEDIA_MAX_MTU. 
    13811381 * 
    1382  * Default: (PJMEDIA_MAX_MTU - SRTP_MAX_TRAILER_LEN) if SRTP is enabled,  
    1383  *          otherwise (PJMEDIA_MAX_MTU - 100) 
     1382 * Default: (PJMEDIA_MAX_MTU - 20 - (128+16)) if SRTP is enabled,  
     1383 *          otherwise (PJMEDIA_MAX_MTU - 20).  
     1384 *          Note that (128+16) constant value is taken from libSRTP macro  
     1385 *          SRTP_MAX_TRAILER_LEN. 
    13841386 */ 
    13851387#ifndef PJMEDIA_MAX_VID_PAYLOAD_SIZE 
    1386 /* Include SRTP_MAX_TRAILER_LEN definition. */ 
    1387 #   if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0) 
    1388 #       include "srtp/srtp.h" 
    1389 #   elif (defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)) 
    1390 #       include "../../third_party/srtp/include/srtp.h" 
    1391 #   endif 
    1392  
    1393 #   if defined(SRTP_MAX_TRAILER_LEN) 
    1394 #       define PJMEDIA_MAX_VID_PAYLOAD_SIZE     (PJMEDIA_MAX_MTU - \ 
    1395                                                  SRTP_MAX_TRAILER_LEN) 
    1396 #   else 
    1397 #       define PJMEDIA_MAX_VID_PAYLOAD_SIZE     (PJMEDIA_MAX_MTU - 100) 
    1398 #   endif 
     1388#  if PJMEDIA_HAS_SRTP 
     1389#     define PJMEDIA_MAX_VID_PAYLOAD_SIZE     (PJMEDIA_MAX_MTU - 20 - (128+16)) 
     1390#  else 
     1391#     define PJMEDIA_MAX_VID_PAYLOAD_SIZE     (PJMEDIA_MAX_MTU - 20) 
     1392#  endif 
    13991393#endif 
    14001394 
Note: See TracChangeset for help on using the changeset viewer.