Changeset 1240 for pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

Timestamp:

May 1, 2007 4:54:54 PM (16 years ago)

Author:

bennylp

Message:

PJSDP port to Symbian

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -84 +84 @@
 
     /* 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);
 
@@ -119 +119 @@
 
     /* 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);
 
@@ -564 +564 @@
                  */
                 const pjmedia_sdp_attr *a;
-                pjmedia_sdp_rtpmap or;
+                pjmedia_sdp_rtpmap or_;
 
                 /* Get the rtpmap for the payload type in the offer. */
@@ -572 +572 @@
                     return PJ_EBUG;
                 }
-                pjmedia_sdp_attr_get_rtpmap(a, &or);
+                pjmedia_sdp_attr_get_rtpmap(a, &or_);
 
                 /* Find paylaod in answer SDP with matching 
@@ -587 +587 @@
                          * 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')))
                         {
@@ -745 +745 @@
                  */
                 const pjmedia_sdp_attr *a;
-                pjmedia_sdp_rtpmap or;
+                pjmedia_sdp_rtpmap or_;
                 pj_bool_t is_codec;
 
@@ -755 +755 @@
                     return PJMEDIA_SDP_EMISSINGRTPMAP;
                 }
-                pjmedia_sdp_attr_get_rtpmap(a, &or);
-
-                if (!pj_strcmp2(&or.enc_name, "telephone-event")) {
+                pjmedia_sdp_attr_get_rtpmap(a, &or_);
+
+                if (!pj_strcmp2(&or_.enc_name, "telephone-event")) {
                     offer_has_telephone_event = 1;
                     if (found_matching_telephone_event)
@@ -782 +782 @@
                          * 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! */