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

Timestamp:

Sep 25, 2006 1:40:12 PM (16 years ago)

Author:

bennylp

Message:

Tests with other user agents revealed some bugs which
have been fixed below:

• some UAs sends "telephone-event/8000/1" instead of "telephone-event/8000", which caused SDP negotiation to fail. Fixed in sdp_neg.c.
• codec name was (incorrectly) compared case-sensitively, causing negotiation to fail. Fixed in sdp_neg.c.
• Also improved error reporting in SDP negotiation by introducing few more error codes.
• Added Warning header in Not Acceptable response sent by pjsip_inv_session when SDP negotiation fails.
• PJSUA-LIB will try to negotiate both SDPs before sending 100 response.
• Fixed bug in iLBC codec when setting the mode to 30.

Also:

• Echo cancellation by default is disabled now since it doesn't seem to work. Further investigation needed.

File:

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

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

@@ -534 +534 @@
                          * count match 
                          */
-                        if (!pj_strcmp(&or.enc_name, &ar.enc_name) &&
+                        if (!pj_stricmp(&or.enc_name, &ar.enc_name) &&
                             or.clock_rate == ar.clock_rate &&
-                            pj_strcmp(&or.param, &ar.param)==0)
+                            (pj_stricmp(&or.param, &ar.param)==0 ||
+                             ar.param.slen==1 && *ar.param.ptr=='1'))
                         {
                             /* Match! */
@@ -629 +630 @@
 
 /* Try to match offer with answer. */
-static pj_bool_t match_offer(pj_pool_t *pool,
-                             const pjmedia_sdp_media *offer,
-                             const pjmedia_sdp_media *local,
-                             pjmedia_sdp_media **p_answer)
+static pj_status_t match_offer(pj_pool_t *pool,
+                               const pjmedia_sdp_media *offer,
+                               const pjmedia_sdp_media *local,
+                               pjmedia_sdp_media **p_answer)
 {
     unsigned i;
@@ -698 +699 @@
                 if (!a) {
                     pj_assert(!"Bug! Offer should have been validated");
-                    return PJ_FALSE;
+                    return PJMEDIA_SDP_EMISSINGRTPMAP;
                 }
                 pjmedia_sdp_attr_get_rtpmap(a, &or);
@@ -727 +728 @@
                          * channel count  match 
                          */
-                        if (!pj_strcmp(&or.enc_name, &lr.enc_name) &&
+                        if (!pj_stricmp(&or.enc_name, &lr.enc_name) &&
                             or.clock_rate == lr.clock_rate &&
-                            pj_strcmp(&or.param, &lr.param)==0) 
+                            (pj_strcmp(&or.param, &lr.param)==0 ||
+                             or.param.slen==1 && *or.param.ptr=='1')) 
                         {
                             /* Match! */
@@ -767 +769 @@
     /* See if all types of offer can be matched. */
 #if 1
-    if ((offer_has_codec && !found_matching_codec) ||
-        (offer_has_telephone_event && !found_matching_telephone_event) ||
-        (offer_has_other && !found_matching_other))
-    {
-        /* Some of the payload in the offer has no matching local sdp */
-        return PJ_FALSE;
+    if (offer_has_codec && !found_matching_codec) {
+        return PJMEDIA_SDPNEG_NOANSCODEC;
+    }
+
+    if (offer_has_telephone_event && !found_matching_telephone_event) {
+        return PJMEDIA_SDPNEG_NOANSTELEVENT;
+    }
+
+    if (offer_has_other && !found_matching_other) {
+        return PJMEDIA_SDPNEG_NOANSUNKNOWN;
     }
 #else
@@ -828 +834 @@
 
     *p_answer = answer;
-    return PJ_TRUE;
+    return PJ_SUCCESS;
 }
 
@@ -837 +843 @@
                                   pjmedia_sdp_session **p_answer)
 {
-    pj_status_t status;
+    pj_status_t status = PJMEDIA_SDPNEG_ENOMEDIA;
     pj_bool_t has_active = PJ_FALSE;
     pjmedia_sdp_session *answer;
@@ -880 +886 @@
             {
                 /* See if it has matching codec. */
-                pj_bool_t match;
-
-                match = match_offer(pool, om, im, &am);
-                if (match) {
+                status = match_offer(pool, om, im, &am);
+                if (status == PJ_SUCCESS) {
                     /* Mark media as used. */
                     media_used[j] = 1;
@@ -926 +930 @@
     *p_answer = answer;
 
-    return has_active ? PJ_SUCCESS : PJMEDIA_SDPNEG_ENOMEDIA;
-    //return PJ_SUCCESS;
+    return has_active ? PJ_SUCCESS : status;
 }