Changeset 5639
- Timestamp:
- Aug 2, 2017 10:44:10 AM (7 years ago)
- Location:
- pjproject/trunk/pjmedia
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/include/pjmedia/config.h
r5619 r5639 1380 1380 * PJMEDIA_MAX_MTU. 1381 1381 * 1382 * Default: (PJMEDIA_MAX_MTU - 100) 1383 */ 1384 #ifndef PJMEDIA_MAX_VID_PAYLOAD_SIZE 1385 # define PJMEDIA_MAX_VID_PAYLOAD_SIZE (PJMEDIA_MAX_MTU - 100) 1382 * Default: (PJMEDIA_MAX_MTU - SRTP_MAX_TRAILER_LEN) if SRTP is enabled, 1383 * otherwise (PJMEDIA_MAX_MTU - 100) 1384 */ 1385 #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 1386 1399 #endif 1387 1400 -
pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c
r5635 r5639 69 69 70 70 #define DEACTIVATE_MEDIA(pool, m) pjmedia_sdp_media_deactivate(pool, m) 71 72 #ifdef SRTP_MAX_TRAILER_LEN 73 # define MAX_TRAILER_LEN SRTP_MAX_TRAILER_LEN 74 #else 75 # define MAX_TRAILER_LEN 10 76 #endif 71 77 72 78 static const pj_str_t ID_RTP_AVP = { "RTP/AVP", 7 }; … … 1063 1069 return pjmedia_transport_send_rtp(srtp->member_tp, pkt, size); 1064 1070 1065 if (size > sizeof(srtp->rtp_tx_buffer) - 10)1071 if (size > sizeof(srtp->rtp_tx_buffer) - MAX_TRAILER_LEN) 1066 1072 return PJ_ETOOBIG; 1067 1073 … … 1109 1115 } 1110 1116 1111 if (size > sizeof(srtp->rtcp_tx_buffer) - 10)1117 if (size > sizeof(srtp->rtcp_tx_buffer) - MAX_TRAILER_LEN) 1112 1118 return PJ_ETOOBIG; 1113 1119
Note: See TracChangeset
for help on using the changeset viewer.