Changeset 3387 for pjproject

Timestamp:

Dec 6, 2010 4:25:44 AM (14 years ago)

Author:

bennylp

Message:

Fixed #1160: Option to bypass RTP payload type verification in the stream (thanks Johan Lantz for the suggestion)

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/config.h (modified) (1 diff)
• src/pjmedia/stream.c (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -503 +503 @@
 #endif
 
+/**
+ * Perform RTP payload type checking in the stream. Normally the peer
+ * MUST send RTP with payload type as we specified in our SDP. Certain
+ * agents may not be able to follow this hence the only way to have
+ * communication is to disable this check.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_STREAM_CHECK_RTP_PT
+#   define PJMEDIA_STREAM_CHECK_RTP_PT          1
+#endif
 
 /**

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -1574 +1574 @@
     unsigned payloadlen;
     pjmedia_rtp_status seq_st;
+    pj_bool_t check_pt;
     pj_status_t status;
     pj_bool_t pkt_discarded = PJ_FALSE;
@@ -1603 +1604 @@
      * the incoming packet.
      */
-    pjmedia_rtp_session_update2(&channel->rtp, hdr, &seq_st,
-                                hdr->pt != stream->rx_event_pt);
+    check_pt = (hdr->pt != stream->rx_event_pt) && PJMEDIA_STREAM_CHECK_RTP_PT;
+    pjmedia_rtp_session_update2(&channel->rtp, hdr, &seq_st, check_pt);
+#if !PJMEDIA_STREAM_CHECK_RTP_PT
+    if (!check_pt && hdr->pt != channel->rtp.out_pt &&
+        hdr->pt != stream->rx_event_pt)
+    {
+        seq_st.status.flag.badpt = 1;
+    }
+#endif
     if (seq_st.status.value) {
         TRC_  ((stream->port.info.name.ptr,