Changeset 5834 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_aud.c

Timestamp:

Jul 23, 2018 7:32:54 AM (6 years ago)

Author:

riza

Message:

Close #2036: Support DTMF via SIP INFO.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_aud.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_aud.c

@@ -557 +557 @@
     pj_log_push_indent();
 
-    /* For discussions about call mutex protection related to this
-     * callback, please see ticket #460:
-     *  http://trac.pjsip.org/repos/ticket/460#comment:4
-     */
-    if (pjsua_var.ua_cfg.cb.on_dtmf_digit) {
+    if (pjsua_var.ua_cfg.cb.on_dtmf_digit2) {
         pjsua_call_id call_id;
+        pjsua_dtmf_info info;
 
         call_id = (pjsua_call_id)(pj_ssize_t)user_data;
-        pjsua_var.ua_cfg.cb.on_dtmf_digit(call_id, digit);
+        info.method = PJSUA_DTMF_METHOD_RFC2833;
+        info.digit = digit;
+        (*pjsua_var.ua_cfg.cb.on_dtmf_digit2)(call_id, &info);
+    } else if (pjsua_var.ua_cfg.cb.on_dtmf_digit) {
+        /* For discussions about call mutex protection related to this
+         * callback, please see ticket #460:
+         *      http://trac.pjsip.org/repos/ticket/460#comment:4
+         */    
+        pjsua_call_id call_id;
+
+        call_id = (pjsua_call_id)(pj_ssize_t)user_data;
+        (*pjsua_var.ua_cfg.cb.on_dtmf_digit)(call_id, digit);
     }
 
@@ -645 +653 @@
          * callback to the session.
          */
-        if (pjsua_var.ua_cfg.cb.on_dtmf_digit) {
+        if (pjsua_var.ua_cfg.cb.on_dtmf_digit || 
+            pjsua_var.ua_cfg.cb.on_dtmf_digit2) 
+        {
             pjmedia_stream_set_dtmf_callback(call_med->strm.a.stream,
                                              &dtmf_callback,