Ticket #478: dtmf.patch

pjmedia/include/pjmedia/rtp.h

@@ -301 +301 @@
                                           pjmedia_rtp_status *seq_st);
 
 
+/**
+ * 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:
  */

pjmedia/src/pjmedia/rtp.c

@@ -161 +161 @@
                                          const pjmedia_rtp_hdr *hdr,
                                          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;
 
     /* Init status */
@@ -176 +184 @@
     }
 
     /* 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;
             p_seq_st->status.flag.bad = 1;
@@ -205 +213 @@
 }
 
 
+
 void pjmedia_rtp_seq_restart(pjmedia_rtp_seq_session *sess, pj_uint16_t seq)
 {
     sess->base_seq = seq;

pjmedia/src/pjmedia/stream.c

@@ -960 +960 @@
     if (channel->paused)
         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, 
                 "RTP status: badpt=%d, badssrc=%d, dup=%d, "
@@ -996 +991 @@
     if (payloadlen == 0)
         return;
 
+    /* Handle incoming DTMF. */
+    if (hdr->pt == stream->rx_event_pt) {
+        handle_incoming_dtmf(stream, payload, payloadlen);
+        return;
+    }
+
     /* Put "good" packet to jitter buffer, or reset the jitter buffer
      * when RTP session is restarted.
      */