Changeset 4739

Timestamp:

Feb 11, 2014 4:46:49 AM (11 years ago)

Author:

riza

Message:

Re #1734: Add flash support for DTMF rfc 2833.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/stream.h (modified) (1 diff)
• pjmedia/src/pjmedia/endpoint.c (modified) (1 diff)
• pjmedia/src/pjmedia/stream.c (modified) (3 diffs)
• pjsip-apps/src/pjsua/pjsua_app_legacy.c (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/stream.h

@@ -342 +342 @@
  *
  * @param stream        The media stream.
- * @param ascii_digit   String containing digits to be sent to remote.
+ * @param ascii_digit   String containing digits to be sent to remote as 
+ *                      described on RFC 2833 section 3.10. Character 'R' is 
+ *                      used to represent the event type 16 (flash) as stated 
+ *                      in RFC 4730.
  *                      Currently the maximum number of digits are 32.
  *

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -559 +559 @@
         attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
         attr->name = pj_str("fmtp");
-        attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR " 0-15");
+        attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR " 0-16");
         m->attr[m->attr_count++] = attr;
     }

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

@@ -231 +231 @@
 
 /* RFC 2833 digit */
-static const char digitmap[16] = { '0', '1', '2', '3',
+static const char digitmap[17] = { '0', '1', '2', '3',
                                    '4', '5', '6', '7',
                                    '8', '9', '*', '#',
-                                   'A', 'B', 'C', 'D'};
+                                   'A', 'B', 'C', 'D', 
+                                   'R'};
 
 /* Zero audio frame samples */
@@ -1569 +1570 @@
 
     /* Ignore unknown event. */
-    if (event->event > 15) {
+    if (event->event > 16) {
         PJ_LOG(5,(stream->port.info.name.ptr,
                   "Ignored RTP pkt with bad DTMF event %d",
@@ -2755 +2756 @@
                 pt = 11;
             }
+            else if (dig == 'r')
+            {
+                pt = 16;
+            }
             else
             {

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.c

@@ -1202 +1202 @@
         char buf[128];
 
-        if (!simple_input("DTMF strings to send (0-9*#A-B)", buf,
+        if (!simple_input("DTMF strings to send (0-9*R#A-B)", buf,
             sizeof(buf)))
         {

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -4694 +4694 @@
 
 /**
- * Send DTMF digits to remote using RFC 2833 payload formats.
+ * Send DTMF digits to remote using RFC 2833 payload formats. 
  *
  * @param call_id       Call identification.
- * @param digits        DTMF string digits to be sent.
+ * @param digits        DTMF string digits to be sent as described on RFC 2833 
+ *                      section 3.10. Character 'R' is used to represent the 
+ *                      event type 16 (flash) as stated in RFC 4730.
  *
  * @return              PJ_SUCCESS on success, or the appropriate error code.