Changeset 5242 for pjproject

Timestamp:

Feb 18, 2016 3:15:19 AM (8 years ago)

Author:

riza

Message:

Misc (Re #1882): Add compile time option (PJMEDIA_HAS_DTMF_FLASH) to enable/disable DTMF flash as specified in rfc2833.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/config.h (modified) (2 diffs)
• pjmedia/include/pjmedia/stream.h (modified) (1 diff)
• pjmedia/src/pjmedia/endpoint.c (modified) (1 diff)
• pjmedia/src/pjmedia/stream.c (modified) (2 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/config.h

@@ -1322 +1322 @@
 #endif
 
+
 /**
  * Specify if libyuv is available.
@@ -1331 +1332 @@
 #endif
 
+
+/**
+ * Specify if dtmf flash in RFC 2833 is available.
+ */
+#ifndef PJMEDIA_HAS_DTMF_FLASH
+#   define PJMEDIA_HAS_DTMF_FLASH                       1
+#endif
+
+
 /**
  * @}

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

@@ -343 +343 @@
  * @param stream        The media stream.
  * @param ascii_digit   String containing digits to be sent to remote as 
- *                      described on RFC 2833 section 3.10. Character 'R' is 
+ *                      described on RFC 2833 section 3.10. 
+ *                      If PJMEDIA_HAS_DTMF_FLASH is enabled, character 'R' is
  *                      used to represent the event type 16 (flash) as stated 
  *                      in RFC 4730.

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

@@ -557 +557 @@
         attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
         attr->name = pj_str("fmtp");
+#if defined(PJMEDIA_HAS_DTMF_FLASH) && PJMEDIA_HAS_DTMF_FLASH!= 0
         attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR " 0-16");
+#else
+        attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR " 0-15");
+#endif
         m->attr[m->attr_count++] = attr;
     }

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

@@ -1567 +1567 @@
 
     /* Ignore unknown event. */
+#if defined(PJMEDIA_HAS_DTMF_FLASH) && PJMEDIA_HAS_DTMF_FLASH!= 0
     if (event->event > 16) {
+#else
+    if (event->event > 15) {
+#endif    
         PJ_LOG(5,(stream->port.info.name.ptr,
                   "Ignored RTP pkt with bad DTMF event %d",
@@ -2787 +2791 @@
                 pt = 11;
             }
+#if defined(PJMEDIA_HAS_DTMF_FLASH) && PJMEDIA_HAS_DTMF_FLASH!= 0           
             else if (dig == 'r')
             {
                 pt = 16;
             }
+#endif
             else
             {

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

@@ -1216 +1216 @@
         char buf[128];
 
+#if defined(PJMEDIA_HAS_DTMF_FLASH) && PJMEDIA_HAS_DTMF_FLASH!= 0               
         if (!simple_input("DTMF strings to send (0-9*R#A-B)", buf,
             sizeof(buf)))
+#else
+        if (!simple_input("DTMF strings to send (0-9*#A-B)", buf,
+            sizeof(buf)))
+#endif
         {
             return;

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

@@ -4812 +4812 @@
 
 /**
- * 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 as described on RFC 2833 
- *                      section 3.10. Character 'R' is used to represent the 
+ *                      section 3.10. If PJMEDIA_HAS_DTMF_FLASH is enabled, 
+ *                      character 'R' is used to represent the 
  *                      event type 16 (flash) as stated in RFC 4730.
  *