Changeset 527 for pjproject/trunk

Timestamp:

Jun 19, 2006 2:48:06 PM (18 years ago)

Author:

bennylp

Message:

Fixed bugs in negotiating SDP answer from remote for dynamic payload types

File:

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

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

@@ -492 +492 @@
         /* Remove all format in the offer that has no matching answer */
         for (i=0; i<offer->desc.fmt_count;) {
-            unsigned j;
+            unsigned pt;
+            pj_uint32_t j;
             pj_str_t *fmt = &offer->desc.fmt[i];
-
-            for (j=0; j<answer->desc.fmt_count; ++j) {
-                if (pj_strcmp(fmt, &answer->desc.fmt[j])==0)
-                    break;
+            
+
+            /* Find matching answer */
+            pt = pj_strtoul(fmt);
+
+            if (pt < 96) {
+                for (j=0; j<answer->desc.fmt_count; ++j) {
+                    if (pj_strcmp(fmt, &answer->desc.fmt[j])==0)
+                        break;
+                }
+            } else {
+                /* This is dynamic payload type.
+                 * For dynamic payload type, we must look the rtpmap and
+                 * compare the encoding name.
+                 */
+                const pjmedia_sdp_attr *a;
+                pjmedia_sdp_rtpmap or;
+
+                /* Get the rtpmap for the payload type in the offer. */
+                a = pjmedia_sdp_media_find_attr2(offer, "rtpmap", fmt);
+                if (!a) {
+                    pj_assert(!"Bug! Offer should have been validated");
+                    return PJ_EBUG;
+                }
+                pjmedia_sdp_attr_get_rtpmap(a, &or);
+
+                /* Find paylaod in answer SDP with matching 
+                 * encoding name and clock rate.
+                 */
+                for (j=0; j<answer->desc.fmt_count; ++j) {
+                    a = pjmedia_sdp_media_find_attr2(answer, "rtpmap", 
+                                                     &answer->desc.fmt[j]);
+                    if (a) {
+                        pjmedia_sdp_rtpmap ar;
+                        pjmedia_sdp_attr_get_rtpmap(a, &ar);
+
+                        /* See if encoding name, clock rate, and channel
+                         * count match 
+                         */
+                        if (!pj_strcmp(&or.enc_name, &ar.enc_name) &&
+                            or.clock_rate == ar.clock_rate &&
+                            pj_strcmp(&or.param, &ar.param)==0)
+                        {
+                            /* Match! */
+                            break;
+                        }
+                    }
+                }
             }
 
@@ -679 +724 @@
                         pjmedia_sdp_attr_get_rtpmap(a, &lr);
 
-                        /* See if encoding name and clock rate match */
+                        /* See if encoding name, clock rate, and
+                         * channel count  match 
+                         */
                         if (!pj_strcmp(&or.enc_name, &lr.enc_name) &&
-                            or.clock_rate == lr.clock_rate) 
+                            or.clock_rate == lr.clock_rate &&
+                            pj_strcmp(&or.param, &lr.param)==0) 
                         {
                             /* Match! */