Changeset 280 for pjproject/trunk

Timestamp:

Mar 5, 2006 11:50:11 AM (19 years ago)

Author:

bennylp

Message:

Fixed SDP negotiation to include clock rate

File:

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

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

@@ -368 +368 @@
         pjmedia_sdp_media_add_attr(local, a);
 
-    } else if (pjmedia_sdp_media_find_attr2(remote, "sendonly", NULL) != NULL) {
+    } else if(pjmedia_sdp_media_find_attr2(remote, "sendonly", NULL) != NULL) {
         /* If remote has "a=sendonly", then set local to "recvonly" if
          * it is currently "sendrecv".
@@ -380 +380 @@
         pjmedia_sdp_media_add_attr(local, a);
 
-    } else if (pjmedia_sdp_media_find_attr2(remote, "recvonly", NULL) != NULL) {
+    } else if(pjmedia_sdp_media_find_attr2(remote, "recvonly", NULL) != NULL) {
         /* If remote has "a=recvonly", then set local to "sendonly" if
          * it is currently "sendrecv".
@@ -392 +392 @@
         pjmedia_sdp_media_add_attr(local, a);
 
-    } else if (pjmedia_sdp_media_find_attr2(remote, "sendrecv", NULL) != NULL) {
+    } else if(pjmedia_sdp_media_find_attr2(remote, "sendrecv", NULL) != NULL) {
 
         pjmedia_sdp_attr *a;
@@ -638 +638 @@
 
                 /* Get the rtpmap for the payload type in the offer. */
-                a = pjmedia_sdp_media_find_attr2(offer, "rtpmap", &offer->desc.fmt[i]);
+                a = pjmedia_sdp_media_find_attr2(offer, "rtpmap", 
+                                                 &offer->desc.fmt[i]);
                 if (!a) {
                     pj_assert(!"Bug! Offer should have been validated");
@@ -658 +659 @@
                 
                 /* Find paylaod in our initial SDP with matching 
-                 * encoding name.
+                 * encoding name and clock rate.
                  */
                 for (j=0; j<local->desc.fmt_count; ++j) {
-                    a = pjmedia_sdp_media_find_attr2(local, "rtpmap", &local->desc.fmt[j]);
+                    a = pjmedia_sdp_media_find_attr2(local, "rtpmap", 
+                                                     &local->desc.fmt[j]);
                     if (a) {
                         pjmedia_sdp_rtpmap lr;
                         pjmedia_sdp_attr_get_rtpmap(a, &lr);
-                        if (!pj_strcmp(&or.enc_name, &lr.enc_name)) {
+
+                        /* See if encoding name and clock rate match */
+                        if (!pj_strcmp(&or.enc_name, &lr.enc_name) &&
+                            or.clock_rate == lr.clock_rate) 
+                        {
                             /* Match! */
                             if (is_codec)