Changeset 4890
- Timestamp:
- Aug 19, 2014 12:54:34 AM (10 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c
r4601 r4890 498 498 bytes_read = read_op->size; 499 499 500 if ( (read_op->op == PJ_IOQUEUE_OP_RECV_FROM)) {500 if (read_op->op == PJ_IOQUEUE_OP_RECV_FROM) { 501 501 read_op->op = PJ_IOQUEUE_OP_NONE; 502 502 rc = pj_sock_recvfrom(h->fd, read_op->buf, &bytes_read, … … 504 504 read_op->rmt_addr, 505 505 read_op->rmt_addrlen); 506 } else if ( (read_op->op == PJ_IOQUEUE_OP_RECV)) {506 } else if (read_op->op == PJ_IOQUEUE_OP_RECV) { 507 507 read_op->op = PJ_IOQUEUE_OP_NONE; 508 508 rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read, -
pjproject/trunk/pjlib/src/pj/os_timestamp_posix.c
r3553 r4890 126 126 #include <errno.h> 127 127 128 #define NSEC_PER_SEC 1000000000 128 #ifndef NSEC_PER_SEC 129 # define NSEC_PER_SEC 1000000000 130 #endif 129 131 130 132 PJ_DEF(pj_status_t) pj_get_timestamp(pj_timestamp *ts) -
pjproject/trunk/pjlib/src/pj/pool.c
r4537 r4890 144 144 #if PJ_DEBUG 145 145 if (p == NULL) { 146 p = p;146 PJ_UNUSED_ARG(p); 147 147 } 148 148 #endif -
pjproject/trunk/pjlib/src/pjlib-test/exception.c
r3553 r4890 121 121 */ 122 122 PJ_TRY { 123 rc = rc;123 PJ_UNUSED_ARG(rc); 124 124 } 125 125 PJ_CATCH_ANY { -
pjproject/trunk/pjmedia/src/pjmedia/endpoint.c
r4739 r4890 35 35 #define THIS_FILE "endpoint.c" 36 36 37 static const pj_str_t STR_AUDIO = { "audio", 5};38 static const pj_str_t STR_VIDEO = { "video", 5};39 37 static const pj_str_t STR_IN = { "IN", 2 }; 40 38 static const pj_str_t STR_IP4 = { "IP4", 3}; -
pjproject/trunk/pjmedia/src/pjmedia/session.c
r3841 r4890 49 49 #endif 50 50 51 52 static const pj_str_t ID_AUDIO = { "audio", 5};53 static const pj_str_t ID_VIDEO = { "video", 5};54 static const pj_str_t ID_APPLICATION = { "application", 11};55 static const pj_str_t ID_IN = { "IN", 2 };56 static const pj_str_t ID_IP4 = { "IP4", 3};57 static const pj_str_t ID_IP6 = { "IP6", 3};58 static const pj_str_t ID_RTP_AVP = { "RTP/AVP", 7 };59 static const pj_str_t ID_RTP_SAVP = { "RTP/SAVP", 8 };60 //static const pj_str_t ID_SDP_NAME = { "pjmedia", 7 };61 static const pj_str_t ID_RTPMAP = { "rtpmap", 6 };62 static const pj_str_t ID_TELEPHONE_EVENT = { "telephone-event", 15 };63 64 static const pj_str_t STR_INACTIVE = { "inactive", 8 };65 static const pj_str_t STR_SENDRECV = { "sendrecv", 8 };66 static const pj_str_t STR_SENDONLY = { "sendonly", 8 };67 static const pj_str_t STR_RECVONLY = { "recvonly", 8 };68 69 51 /* 70 52 * Initialize session info from SDP session descriptors. -
pjproject/trunk/pjmedia/src/pjmedia/stream_info.c
r3982 r4890 33 33 static const pj_str_t ID_TELEPHONE_EVENT = { "telephone-event", 15 }; 34 34 35 static const pj_str_t STR_INACTIVE = { "inactive", 8 };36 static const pj_str_t STR_SENDRECV = { "sendrecv", 8 };37 static const pj_str_t STR_SENDONLY = { "sendonly", 8 };38 static const pj_str_t STR_RECVONLY = { "recvonly", 8 };39 40 41 35 /* 42 36 * Internal function for collecting codec info and param from the SDP media. … … 326 320 unsigned stream_idx) 327 321 { 322 const pj_str_t STR_INACTIVE = { "inactive", 8 }; 323 const pj_str_t STR_SENDONLY = { "sendonly", 8 }; 324 const pj_str_t STR_RECVONLY = { "recvonly", 8 }; 325 328 326 pjmedia_codec_mgr *mgr; 329 327 const pjmedia_sdp_attr *attr; -
pjproject/trunk/pjmedia/src/pjmedia/vid_stream_info.c
r4257 r4890 34 34 static const pj_str_t ID_RTPMAP = { "rtpmap", 6 }; 35 35 36 static const pj_str_t STR_INACTIVE = { "inactive", 8 };37 static const pj_str_t STR_SENDRECV = { "sendrecv", 8 };38 static const pj_str_t STR_SENDONLY = { "sendonly", 8 };39 static const pj_str_t STR_RECVONLY = { "recvonly", 8 };40 41 42 36 /* 43 37 * Internal function for collecting codec info and param from the SDP media. … … 191 185 unsigned stream_idx) 192 186 { 187 const pj_str_t STR_INACTIVE = { "inactive", 8 }; 188 const pj_str_t STR_SENDONLY = { "sendonly", 8 }; 189 const pj_str_t STR_RECVONLY = { "recvonly", 8 }; 190 193 191 const pjmedia_sdp_attr *attr; 194 192 const pjmedia_sdp_media *local_m; -
pjproject/trunk/pjnath/src/pjnath/stun_auth.c
r4537 r4890 150 150 151 151 152 PJ_INLINE(pj_uint16_t) GET_VAL16(const pj_uint8_t *pdu, unsigned pos)152 /*unused PJ_INLINE(pj_uint16_t) GET_VAL16(const pj_uint8_t *pdu, unsigned pos) 153 153 { 154 154 return (pj_uint16_t) ((pdu[pos] << 8) + pdu[pos+1]); 155 } 155 }*/ 156 156 157 157 -
pjproject/trunk/pjnath/src/pjnath/stun_msg.c
r4712 r4890 753 753 } 754 754 755 PJ_INLINE(pj_uint16_t) GETVAL16N(const pj_uint8_t *buf, unsigned pos)755 /*unused PJ_INLINE(pj_uint16_t) GETVAL16N(const pj_uint8_t *buf, unsigned pos) 756 756 { 757 757 return pj_htons(GETVAL16H(buf,pos)); 758 } 758 }*/ 759 759 760 760 static void PUTVAL16H(pj_uint8_t *buf, unsigned pos, pj_uint16_t hval) … … 772 772 } 773 773 774 PJ_INLINE(pj_uint32_t) GETVAL32N(const pj_uint8_t *buf, unsigned pos)774 /*unused PJ_INLINE(pj_uint32_t) GETVAL32N(const pj_uint8_t *buf, unsigned pos) 775 775 { 776 776 return pj_htonl(GETVAL32H(buf,pos)); 777 } 777 }*/ 778 778 779 779 static void PUTVAL32H(pj_uint8_t *buf, unsigned pos, pj_uint32_t hval) -
pjproject/trunk/pjsip/src/pjsip-ua/sip_xfer.c
r4713 r4890 80 80 static const pj_str_t STR_MESSAGE = { "message", 7 }; 81 81 static const pj_str_t STR_SIPFRAG = { "sipfrag", 7 }; 82 static const pj_str_t STR_SIPFRAG_VERSION = {";version=2.0", 12 };83 82 84 83 -
pjproject/trunk/pjsip/src/pjsua-lib/pjsua_im.c
r4712 r4890 69 69 static const pj_str_t STR_MIME_APP = { "application", 11 }; 70 70 static const pj_str_t STR_MIME_ISCOMPOSING = { "im-iscomposing+xml", 18 }; 71 static const pj_str_t STR_MIME_TEXT = { "text", 4 };72 static const pj_str_t STR_MIME_PLAIN = { "plain", 5 };73 71 74 72 … … 77 75 static pj_bool_t acceptable_message(const pjsip_media_type *mime) 78 76 { 77 const pj_str_t STR_MIME_TEXT = { "text", 4 }; 78 const pj_str_t STR_MIME_PLAIN = { "plain", 5 }; 79 79 return (pj_stricmp(&mime->type, &STR_MIME_TEXT)==0 && 80 80 pj_stricmp(&mime->subtype, &STR_MIME_PLAIN)==0)
Note: See TracChangeset
for help on using the changeset viewer.