Changeset 5786

Timestamp:

Apr 24, 2018 5:27:57 AM (7 years ago)

Author:

ming

Message:

Fixed #2111: Add compile-time setting to specify DTMF duration in ms

Location:

pjproject/trunk/pjmedia

Files:

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

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

@@ -413 +413 @@
 
 /**
- * DTMF/telephone-event duration, in timestamp.
+ * DTMF/telephone-event duration, in timestamp. To specify the duration in
+ * milliseconds, use the setting PJMEDIA_DTMF_DURATION_MSEC instead.
  */
 #ifndef PJMEDIA_DTMF_DURATION           
 #  define PJMEDIA_DTMF_DURATION                 1600    /* in timestamp */
+#endif
+
+
+/**
+ * DTMF/telephone-event duration, in milliseconds. If the value is greater
+ * than zero, than this setting will be used instead of PJMEDIA_DTMF_DURATION.
+ *
+ * Note that for a clockrate of 8 KHz, a dtmf duration of 1600 timestamp
+ * units (the default value of PJMEDIA_DTMF_DURATION) is equivalent to 200 ms. 
+ */
+#ifndef PJMEDIA_DTMF_DURATION_MSEC              
+#  define PJMEDIA_DTMF_DURATION_MSEC            0
 #endif
 

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

@@ -174 +174 @@
 
     /* RFC 2833 DTMF transmission queue: */
+    unsigned                 dtmf_duration; /**< DTMF duration(in timestamp)*/
     int                      tx_event_pt;   /**< Outgoing pt for dtmf.      */
     int                      tx_dtmf_count; /**< # of digits in tx dtmf buf.*/
@@ -956 +957 @@
 
     digit->duration += stream->rtp_tx_ts_len_per_pkt;
-    if (digit->duration >= PJMEDIA_DTMF_DURATION)
-        digit->duration = PJMEDIA_DTMF_DURATION;
+    if (digit->duration >= stream->dtmf_duration)
+        digit->duration = stream->dtmf_duration;
 
     event->event = (pj_uint8_t)digit->event;
@@ -964 +965 @@
 
     if (forced_last) {
-        digit->duration = PJMEDIA_DTMF_DURATION;
-    }
-
-    if (digit->duration >= PJMEDIA_DTMF_DURATION) {
+        digit->duration = stream->dtmf_duration;
+    }
+
+    if (digit->duration >= stream->dtmf_duration) {
 
         event->e_vol |= 0x80;
@@ -1304 +1305 @@
              * RTP packets.
              */
-            inc_timestamp = PJMEDIA_DTMF_DURATION +
+            inc_timestamp = stream->dtmf_duration +
                             ((DTMF_EBIT_RETRANSMIT_CNT-1) *
                              stream->rtp_tx_ts_len_per_pkt)
@@ -2361 +2362 @@
     stream->plc_cnt = stream->max_plc_cnt;
 
+#if defined(PJMEDIA_DTMF_DURATION_MSEC) && (PJMEDIA_DTMF_DURATION_MSEC > 0)
+    stream->dtmf_duration = PJMEDIA_DTMF_DURATION_MSEC *
+                            afd->clock_rate / 1000;
+#else
+    stream->dtmf_duration = PJMEDIA_DTMF_DURATION;
+#endif
+
 #if defined(PJMEDIA_HANDLE_G722_MPEG_BUG) && (PJMEDIA_HANDLE_G722_MPEG_BUG!=0)
     stream->rtp_rx_check_cnt = 50;
@@ -2376 +2384 @@
         /* RTP clock rate = 1/2 real clock rate */
         stream->rtp_tx_ts_len_per_pkt >>= 1;
+#if defined(PJMEDIA_DTMF_DURATION_MSEC) && (PJMEDIA_DTMF_DURATION_MSEC > 0)
+        stream->dtmf_duration >>= 1;
+#endif
     } else if (!pj_stricmp2(&info->fmt.encoding_name, "opus")) {
         unsigned opus_ts_modifier = 48000 / afd->clock_rate;
@@ -2383 +2394 @@
         stream->rtp_rx_ts_len_per_frame *= opus_ts_modifier;
         stream->detect_ptime_change = PJ_TRUE;
+#if defined(PJMEDIA_DTMF_DURATION_MSEC) && (PJMEDIA_DTMF_DURATION_MSEC > 0)
+        stream->dtmf_duration *= opus_ts_modifier;
+#endif
     }
 #endif