Changeset 4263

Timestamp:

Sep 20, 2012 11:26:16 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1582: Transmit the last DTMF packet (containing the E bit) three times

File:

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

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

@@ -74 +74 @@
 #endif
 
+/* Number of DTMF E bit transmissions */
+#define DTMF_EBIT_RETRANSMIT_CNT        3
 
 /**
@@ -95 +97 @@
     int             event;
     pj_uint32_t     duration;
+    int             ebit_cnt;               /**< # of E bit transmissions   */
 };
 
@@ -897 +900 @@
 
     digit->duration += PJMEDIA_PIA_SPF(&stream->port.info);
+    if (digit->duration >= PJMEDIA_DTMF_DURATION)
+        digit->duration = PJMEDIA_DTMF_DURATION;
 
     event->event = (pj_uint8_t)digit->event;
@@ -902 +907 @@
     event->duration = pj_htons((pj_uint16_t)digit->duration);
 
-
-    if (forced_last || digit->duration >= PJMEDIA_DTMF_DURATION) {
+    if (forced_last) {
+        digit->duration = PJMEDIA_DTMF_DURATION;
+    }
+
+    if (digit->duration >= PJMEDIA_DTMF_DURATION) {
 
         event->e_vol |= 0x80;
-        *last = 1;
-
-        /* Prepare next digit. */
-        pj_mutex_lock(stream->jb_mutex);
-
-        pj_array_erase(stream->tx_dtmf_buf, sizeof(stream->tx_dtmf_buf[0]),
-                       stream->tx_dtmf_count, 0);
-        --stream->tx_dtmf_count;
-
-        pj_mutex_unlock(stream->jb_mutex);
+
+        if (++digit->ebit_cnt >= DTMF_EBIT_RETRANSMIT_CNT) {
+            *last = 1;
+
+            /* Prepare next digit. */
+            pj_mutex_lock(stream->jb_mutex);
+
+            pj_array_erase(stream->tx_dtmf_buf, sizeof(stream->tx_dtmf_buf[0]),
+                           stream->tx_dtmf_count, 0);
+            --stream->tx_dtmf_count;
+
+            pj_mutex_unlock(stream->jb_mutex);
+        }
     }
 
@@ -1236 +1247 @@
              * RTP packets.
              */
-            inc_timestamp = PJMEDIA_DTMF_DURATION - rtp_ts_len;
+            inc_timestamp = PJMEDIA_DTMF_DURATION +
+                            ((DTMF_EBIT_RETRANSMIT_CNT-1) * samples_per_frame)
+                            - rtp_ts_len;
         }
 
@@ -2742 +2755 @@
             stream->tx_dtmf_buf[stream->tx_dtmf_count+i].event = pt;
             stream->tx_dtmf_buf[stream->tx_dtmf_count+i].duration = 0;
+            stream->tx_dtmf_buf[stream->tx_dtmf_count+i].ebit_cnt = 0;
         }