Changeset 5114 for pjproject

Timestamp:

Jun 22, 2015 7:33:46 AM (9 years ago)

Author:

ming

Message:

Fixed #1860: Modify pjmedia_sdp_neg_fmt_match() to check for encoding parameters as well

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/sdp_neg.h (modified) (1 diff)
• src/pjmedia/sdp_neg.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/sdp_neg.h

@@ -789 +789 @@
 /**
  * Match format in the SDP media offer and answer. The matching mechanism
- * will be done by comparing the encoding name and clock rate, and if the
- * custom format matching callback for the specified format is registered,
- * see #pjmedia_sdp_neg_register_fmt_match_cb(), it will be called for more
- * detail verification, e.g: format parameters specified in SDP fmtp.
+ * will be done by comparing the encoding name, clock rate, and encoding
+ * parameters (if any), and if the custom format matching callback
+ * for the specified format is registered, see
+ * #pjmedia_sdp_neg_register_fmt_match_cb(), it will be called for
+ * more detail verification, e.g: format parameters specified in SDP fmtp.
  *
  * @param pool          The memory pool.

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

@@ -1600 +1600 @@
 
     if (pj_stricmp(&o_rtpmap.enc_name, &a_rtpmap.enc_name) != 0 ||
-        o_rtpmap.clock_rate != a_rtpmap.clock_rate)
+        (o_rtpmap.clock_rate != a_rtpmap.clock_rate) ||
+        (!(pj_stricmp(&o_rtpmap.param, &a_rtpmap.param) == 0 ||
+           (a_rtpmap.param.slen == 0 && o_rtpmap.param.slen == 1 &&
+            *o_rtpmap.param.ptr == '1') ||
+           (o_rtpmap.param.slen == 0 && a_rtpmap.param.slen == 1 &&
+            *a_rtpmap.param.ptr=='1'))))
     {
         return PJMEDIA_SDP_EFORMATNOTEQUAL;