Changeset 1798

Timestamp:

Feb 14, 2008 7:45:47 PM (16 years ago)

Author:

bennylp

Message:

Ticket #478: Handle duplicated/misordered incoming DTMF packets

Location:

pjproject/trunk/pjmedia

Files:

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

pjproject/trunk/pjmedia/include/pjmedia/rtp.h

@@ -302 +302 @@
 
 
+/**
+ * Call this function everytime an RTP packet is received to check whether 
+ * the packet can be received and to let the RTP session performs its internal
+ * calculations.
+ *
+ * @param ses       The session.
+ * @param hdr       The RTP header of the incoming packet. The header must
+ *                  be given with fields in network byte order.
+ * @param seq_st    Optional structure to receive the status of the RTP packet
+ *                  processing.
+ * @param check_pt  Flag to indicate whether payload type needs to be validate.
+ *
+ * @see pjmedia_rtp_session_update()
+ */
+PJ_DECL(void) pjmedia_rtp_session_update2(pjmedia_rtp_session *ses, 
+                                          const pjmedia_rtp_hdr *hdr,
+                                          pjmedia_rtp_status *seq_st,
+                                          pj_bool_t check_pt);
+
+
 /*
  * INTERNAL:

pjproject/trunk/pjmedia/src/pjmedia/rtp.c

@@ -162 +162 @@
                                          pjmedia_rtp_status *p_seq_st)
 {
+    pjmedia_rtp_session_update2(ses, hdr, p_seq_st, PJ_TRUE);
+}
+
+PJ_DEF(void) pjmedia_rtp_session_update2( pjmedia_rtp_session *ses, 
+                                          const pjmedia_rtp_hdr *hdr,
+                                          pjmedia_rtp_status *p_seq_st,
+                                          pj_bool_t check_pt)
+{
     pjmedia_rtp_status seq_st;
+
+    /* for now check_pt MUST be either PJ_TRUE or PJ_FALSE.
+     * In the future we might change check_pt from boolean to 
+     * unsigned integer to accommodate more flags.
+     */
+    pj_assert(check_pt==PJ_TRUE || check_pt==PJ_FALSE);
 
     /* Init status */
@@ -177 +191 @@
 
     /* Check payload type. */
-    if (hdr->pt != ses->out_pt) {
+    if (check_pt && hdr->pt != ses->out_pt) {
         if (p_seq_st) {
             p_seq_st->status.value = seq_st.status.value;
@@ -204 +218 @@
     }
 }
+
 
 

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

@@ -961 +961 @@
         return;
 
-    /* Handle incoming DTMF. */
-    if (hdr->pt == stream->rx_event_pt) {
-        handle_incoming_dtmf(stream, payload, payloadlen);
-        return;
-    }
-
     /* Update RTP session (also checks if RTP session can accept
      * the incoming packet.
      */
-    pjmedia_rtp_session_update(&channel->rtp, hdr, &seq_st);
+    pjmedia_rtp_session_update2(&channel->rtp, hdr, &seq_st,
+                                hdr->pt != stream->rx_event_pt);
     if (seq_st.status.value) {
         TRC_  ((stream->port.info.name.ptr, 
@@ -996 +991 @@
     if (payloadlen == 0)
         return;
+
+    /* Handle incoming DTMF. */
+    if (hdr->pt == stream->rx_event_pt) {
+        /* Ignore out-of-order packet as it will be detected as new
+         * digit. Also ignore duplicate packet as it serves no use.
+         */
+        if (seq_st.status.flag.outorder || seq_st.status.flag.dup) {
+            return;
+        }
+
+        handle_incoming_dtmf(stream, payload, payloadlen);
+        return;
+    }
 
     /* Put "good" packet to jitter buffer, or reset the jitter buffer