diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-05-01 16:54:54 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-05-01 16:54:54 +0000 |
commit | 682ee6718afa661df775bd44b4fdf89344ec67b2 (patch) | |
tree | 5949acca77d1ff14c50b1fc3b6d3a996539fe7d6 /pjmedia | |
parent | b93717c9a39a0755f65df6b252b1e3506d7a42c8 (diff) |
PJSDP port to Symbian
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1240 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/src/pjmedia/sdp.c | 32 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/sdp_neg.c | 28 |
2 files changed, 30 insertions, 30 deletions
diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c index d9cc8289..e0a66fc3 100644 --- a/pjmedia/src/pjmedia/sdp.c +++ b/pjmedia/src/pjmedia/sdp.c @@ -103,7 +103,7 @@ PJ_DEF(pjmedia_sdp_attr*) pjmedia_sdp_attr_create( pj_pool_t *pool, PJ_ASSERT_RETURN(pool && name, NULL); - attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr)); + attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr); pj_strdup2(pool, &attr->name, name); if (value) @@ -123,7 +123,7 @@ PJ_DEF(pjmedia_sdp_attr*) pjmedia_sdp_attr_clone(pj_pool_t *pool, PJ_ASSERT_RETURN(pool && rhs, NULL); - attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr)); + attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr); pj_strdup(pool, &attr->name, &rhs->name); pj_strdup_with_null(pool, &attr->value, &rhs->value); @@ -307,7 +307,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtpmap( const pjmedia_sdp_attr *attr, status = PJ_SUCCESS; } - PJ_CATCH(SYNTAX_ERROR) { + PJ_CATCH_ANY { status = PJMEDIA_SDP_EINRTPMAP; } PJ_END; @@ -402,7 +402,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtcp(const pjmedia_sdp_attr *attr, status = PJ_SUCCESS; } - PJ_CATCH(SYNTAX_ERROR) { + PJ_CATCH_ANY { status = PJMEDIA_SDP_EINRTCP; } PJ_END; @@ -419,7 +419,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_to_rtpmap(pj_pool_t *pool, { PJ_ASSERT_RETURN(pool && attr && p_rtpmap, PJ_EINVAL); - *p_rtpmap = pj_pool_alloc(pool, sizeof(pjmedia_sdp_rtpmap)); + *p_rtpmap = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_rtpmap); PJ_ASSERT_RETURN(*p_rtpmap, PJ_ENOMEM); return pjmedia_sdp_attr_get_rtpmap(attr, *p_rtpmap); @@ -442,7 +442,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_rtpmap_to_attr(pj_pool_t *pool, PJMEDIA_SDP_EINRTPMAP); - attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr)); + attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr); PJ_ASSERT_RETURN(attr != NULL, PJ_ENOMEM); attr->name.ptr = "rtpmap"; @@ -464,7 +464,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_rtpmap_to_attr(pj_pool_t *pool, return PJMEDIA_SDP_ERTPMAPTOOLONG; attr->value.slen = len; - attr->value.ptr = pj_pool_alloc(pool, attr->value.slen); + attr->value.ptr = (char*) pj_pool_alloc(pool, attr->value.slen); pj_memcpy(attr->value.ptr, tempbuf, attr->value.slen); *p_attr = attr; @@ -493,7 +493,7 @@ static int print_connection_info( pjmedia_sdp_conn *c, char *buf, int len) PJ_DEF(pjmedia_sdp_conn*) pjmedia_sdp_conn_clone (pj_pool_t *pool, const pjmedia_sdp_conn *rhs) { - pjmedia_sdp_conn *c = pj_pool_alloc (pool, sizeof(pjmedia_sdp_conn)); + pjmedia_sdp_conn *c = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_conn); if (!c) return NULL; if (!pj_strdup (pool, &c->net_type, &rhs->net_type)) return NULL; @@ -588,7 +588,7 @@ PJ_DEF(pjmedia_sdp_media*) pjmedia_sdp_media_clone( const pjmedia_sdp_media *rhs) { unsigned int i; - pjmedia_sdp_media *m = pj_pool_alloc (pool, sizeof(pjmedia_sdp_media)); + pjmedia_sdp_media *m = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_media); PJ_ASSERT_RETURN(m != NULL, NULL); pj_strdup (pool, &m->desc.media, &rhs->desc.media); @@ -967,7 +967,7 @@ static pjmedia_sdp_attr *parse_attr( pj_pool_t *pool, pj_scanner *scanner, ctx->last_error = PJMEDIA_SDP_EINATTR; - attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr)); + attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr); /* check equal sign */ if (*(scanner->curptr+1) != '=') { @@ -1015,7 +1015,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_parse( pj_pool_t *pool, pj_scanner scanner; pjmedia_sdp_session *session; pjmedia_sdp_media *media = NULL; - void *attr; + pjmedia_sdp_attr *attr; pjmedia_sdp_conn *conn; pj_str_t dummy; int cur_name = 254; @@ -1027,7 +1027,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_parse( pj_pool_t *pool, init_sdp_parser(); pj_scan_init(&scanner, buf, len, 0, &on_scanner_error); - session = pj_pool_calloc(pool, 1, sizeof(pjmedia_sdp_session)); + session = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session); PJ_ASSERT_RETURN(session != NULL, PJ_ENOMEM); PJ_TRY { @@ -1051,7 +1051,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_parse( pj_pool_t *pool, parse_generic_line(&scanner, &session->name, &ctx); break; case 'c': - conn = pj_pool_calloc(pool, 1, sizeof(*conn)); + conn = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_conn); parse_connection_info(&scanner, conn, &ctx); if (media) { media->conn = conn; @@ -1063,7 +1063,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_parse( pj_pool_t *pool, parse_time(&scanner, session, &ctx); break; case 'm': - media = pj_pool_calloc(pool, 1, sizeof(*media)); + media = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media); parse_media(&scanner, media, &ctx); session->media[ session->media_count++ ] = media; break; @@ -1094,7 +1094,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_parse( pj_pool_t *pool, ctx.last_error = PJ_SUCCESS; } - PJ_CATCH(SYNTAX_ERROR) { + PJ_CATCH_ANY { char errmsg[PJ_ERR_MSG_SIZE]; pj_strerror(ctx.last_error, errmsg, sizeof(errmsg)); @@ -1137,7 +1137,7 @@ pjmedia_sdp_session_clone( pj_pool_t *pool, PJ_ASSERT_RETURN(pool && rhs, NULL); - sess = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_session)); + sess = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session); PJ_ASSERT_RETURN(sess != NULL, NULL); /* Clone origin line. */ diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c index 612941b1..5975eca4 100644 --- a/pjmedia/src/pjmedia/sdp_neg.c +++ b/pjmedia/src/pjmedia/sdp_neg.c @@ -83,7 +83,7 @@ pjmedia_sdp_neg_create_w_local_offer( pj_pool_t *pool, PJ_ASSERT_RETURN((status=pjmedia_sdp_validate(local))==PJ_SUCCESS, status); /* Create and initialize negotiator. */ - neg = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_neg)); + neg = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_neg); PJ_ASSERT_RETURN(neg != NULL, PJ_ENOMEM); neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER; @@ -118,7 +118,7 @@ pjmedia_sdp_neg_create_w_remote_offer(pj_pool_t *pool, return status; /* Create and initialize negotiator. */ - neg = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_neg)); + neg = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_neg); PJ_ASSERT_RETURN(neg != NULL, PJ_ENOMEM); neg->prefer_remote_codec_order = PJMEDIA_SDP_NEG_PREFER_REMOTE_CODEC_ORDER; @@ -563,7 +563,7 @@ static pj_status_t process_m_answer( pj_pool_t *pool, * compare the encoding name. */ const pjmedia_sdp_attr *a; - pjmedia_sdp_rtpmap or; + pjmedia_sdp_rtpmap or_; /* Get the rtpmap for the payload type in the offer. */ a = pjmedia_sdp_media_find_attr2(offer, "rtpmap", fmt); @@ -571,7 +571,7 @@ static pj_status_t process_m_answer( pj_pool_t *pool, pj_assert(!"Bug! Offer should have been validated"); return PJ_EBUG; } - pjmedia_sdp_attr_get_rtpmap(a, &or); + pjmedia_sdp_attr_get_rtpmap(a, &or_); /* Find paylaod in answer SDP with matching * encoding name and clock rate. @@ -586,9 +586,9 @@ static pj_status_t process_m_answer( pj_pool_t *pool, /* See if encoding name, clock rate, and channel * count match */ - if (!pj_stricmp(&or.enc_name, &ar.enc_name) && - or.clock_rate == ar.clock_rate && - (pj_stricmp(&or.param, &ar.param)==0 || + if (!pj_stricmp(&or_.enc_name, &ar.enc_name) && + or_.clock_rate == ar.clock_rate && + (pj_stricmp(&or_.param, &ar.param)==0 || (ar.param.slen==1 && *ar.param.ptr=='1'))) { /* Match! */ @@ -744,7 +744,7 @@ static pj_status_t match_offer(pj_pool_t *pool, * compare the encoding name. */ const pjmedia_sdp_attr *a; - pjmedia_sdp_rtpmap or; + pjmedia_sdp_rtpmap or_; pj_bool_t is_codec; /* Get the rtpmap for the payload type in the offer. */ @@ -754,9 +754,9 @@ static pj_status_t match_offer(pj_pool_t *pool, pj_assert(!"Bug! Offer should have been validated"); return PJMEDIA_SDP_EMISSINGRTPMAP; } - pjmedia_sdp_attr_get_rtpmap(a, &or); + pjmedia_sdp_attr_get_rtpmap(a, &or_); - if (!pj_strcmp2(&or.enc_name, "telephone-event")) { + if (!pj_strcmp2(&or_.enc_name, "telephone-event")) { offer_has_telephone_event = 1; if (found_matching_telephone_event) continue; @@ -781,10 +781,10 @@ static pj_status_t match_offer(pj_pool_t *pool, /* See if encoding name, clock rate, and * channel count match */ - if (!pj_stricmp(&or.enc_name, &lr.enc_name) && - or.clock_rate == lr.clock_rate && - (pj_strcmp(&or.param, &lr.param)==0 || - (or.param.slen==1 && *or.param.ptr=='1'))) + if (!pj_stricmp(&or_.enc_name, &lr.enc_name) && + or_.clock_rate == lr.clock_rate && + (pj_strcmp(&or_.param, &lr.param)==0 || + (or_.param.slen==1 && *or_.param.ptr=='1'))) { /* Match! */ if (is_codec) |