Changeset 4985

Timestamp:

Mar 2, 2015 3:04:19 AM (10 years ago)

Author:

nanang

Message:

Fixed #1816: Restart media transport on following forked media.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-ua/sip_inv.h (modified) (1 diff)
• src/pjsip-ua/sip_inv.c (modified) (2 diffs)
• src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h

@@ -411 +411 @@
     void                *mod_data[PJSIP_MAX_MODULE];/**< Modules data.      */
     struct pjsip_timer  *timer;                     /**< Session Timers.    */
+    pj_bool_t            following_fork;            /**< Internal, following
+                                                         forked media?      */
 };
 

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -1895 +1895 @@
     }
 
+    /* Initialize info that we are following forked media */
+    inv->following_fork = PJ_FALSE;
+
     /* MUST NOT do multiple SDP offer/answer in a single transaction,
      * EXCEPT if:
@@ -1947 +1950 @@
                 return status;
             }
+
+            inv->following_fork = PJ_TRUE;
 
         } else {

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

@@ -2691 +2691 @@
                 pjmedia_transport_info tp_info;
                 pjmedia_srtp_info *srtp_info;
+
+                if (call->inv->following_fork) {
+                    /* Normally media transport will automatically restart
+                     * itself (if needed, based on info from the SDP) in
+                     * pjmedia_transport_media_start(), however in "following
+                     * forked media" case (see #1644), we need to explicitly
+                     * restart it as it cannot detect fork scenario from
+                     * the SDP only.
+                     */
+                    status = pjmedia_transport_media_stop(call_med->tp);
+                    if (status != PJ_SUCCESS) {
+                        PJ_PERROR(1,(THIS_FILE, status,
+                                     "pjmedia_transport_media_stop() failed "
+                                     "for call_id %d media %d",
+                                     call_id, mi));
+                        continue;
+                    }
+                    status = pjmedia_transport_media_create(call_med->tp,
+                                                            tmp_pool,
+                                                            0, NULL, mi);
+                    if (status != PJ_SUCCESS) {
+                        PJ_PERROR(1,(THIS_FILE, status,
+                                     "pjmedia_transport_media_create() failed "
+                                     "for call_id %d media %d",
+                                     call_id, mi));
+                        continue;
+                    }
+                }
 
                 /* Start/restart media transport based on info in SDP */