Changeset 5490 for pjproject/trunk

Timestamp:

Dec 6, 2016 7:29:11 AM (7 years ago)

Author:

ming

Message:

Fixed #1982: Add option to reinitialize call media transports

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (3 diffs)
• src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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

@@ -4285 +4285 @@
      * PJSUA_CALL_UNHOLD will take precedence over this flag.
      */
-    PJSUA_CALL_NO_SDP_OFFER = 8
+    PJSUA_CALL_NO_SDP_OFFER = 8,
+
+    /**
+     * Deinitialize and recreate media, including media transport. This flag
+     * is useful in IP address change situation, if the media transport
+     * address (or address family) changes, for example during IPv4/IPv6
+     * network handover.
+     * This flag is only valid for #pjsua_call_reinvite()/reinvite2(), or
+     * #pjsua_call_update()/update2().
+     *
+     * Warning: If the re-INVITE/UPDATE fails, the old media will not be
+     * reverted.
+     */
+    PJSUA_CALL_REINIT_MEDIA = 16
 
 } pjsua_call_flag;

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

@@ -570 +570 @@
 {
     opt->flag &= ~(PJSUA_CALL_UNHOLD | PJSUA_CALL_UPDATE_CONTACT |
-                   PJSUA_CALL_NO_SDP_OFFER);
+                   PJSUA_CALL_NO_SDP_OFFER | PJSUA_CALL_REINIT_MEDIA);
 }
 
@@ -609 +609 @@
     call->opt = *opt;
 
+    if (call->opt.flag & PJSUA_CALL_REINIT_MEDIA) {
+        pjsua_media_channel_deinit(call->index);
+    }
+
     /* If call is established or media channel hasn't been initialized,
      * reinit media channel.
@@ -614 +618 @@
     if ((call->inv && call->inv->state == PJSIP_INV_STATE_CONNECTING &&
          call->med_cnt == 0) ||
-        (call->inv && call->inv->state == PJSIP_INV_STATE_CONFIRMED))
+        (call->inv && call->inv->state == PJSIP_INV_STATE_CONFIRMED) ||
+        (call->opt.flag & PJSUA_CALL_REINIT_MEDIA))
     {
         pjsip_role_e role = rem_sdp? PJSIP_ROLE_UAS : PJSIP_ROLE_UAC;

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

@@ -1976 +1976 @@
          * Otherwise, apply media count from the call setting directly.
          */
-        if (reinit) {
+        if (reinit && (call->opt.flag & PJSUA_CALL_REINIT_MEDIA) == 0) {
 
             /* We are sending reoffer, check media count for each media type