Changeset 1798 for pjproject/trunk/pjmedia/src/pjmedia/stream.c

Timestamp:

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

Author:

bennylp

Message:

Ticket #478: Handle duplicated/misordered incoming DTMF packets

File:

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

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