Changeset 3869 for pjproject/trunk

Timestamp:

Oct 27, 2011 3:33:31 PM (13 years ago)

Author:

nanang

Message:

Close #1404: handle static payload types match in pjmedia_sdp_neg_fmt_match().

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)

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

@@ -1738 +1738 @@
 
 /* Match format in the SDP media offer and answer. */
-PJ_DEF(pj_bool_t) pjmedia_sdp_neg_fmt_match( pj_pool_t *pool,
-                                             pjmedia_sdp_media *offer,
-                                             unsigned o_fmt_idx,
-                                             pjmedia_sdp_media *answer,
-                                             unsigned a_fmt_idx,
-                                             unsigned option)
+PJ_DEF(pj_status_t) pjmedia_sdp_neg_fmt_match(pj_pool_t *pool,
+                                              pjmedia_sdp_media *offer,
+                                              unsigned o_fmt_idx,
+                                              pjmedia_sdp_media *answer,
+                                              unsigned a_fmt_idx,
+                                              unsigned option)
 {
     const pjmedia_sdp_attr *attr;
     pjmedia_sdp_rtpmap o_rtpmap, a_rtpmap;
+    unsigned o_pt;
+    unsigned a_pt;
+
+    o_pt = pj_strtoul(&offer->desc.fmt[o_fmt_idx]);
+    a_pt = pj_strtoul(&answer->desc.fmt[a_fmt_idx]);
+
+    if (o_pt < 96 || a_pt < 96) {
+        if (o_pt == a_pt)
+            return PJ_SUCCESS;
+        else
+            return PJMEDIA_SDP_EFORMATNOTEQUAL;
+    }
 
     /* Get the format rtpmap from the offer. */