Changeset 2060 for pjproject/trunk

Timestamp:

Jun 26, 2008 3:46:52 PM (16 years ago)

Author:

bennylp

Message:

Fixed bug: media got deactivated when SDP negotiation fails on re-INVITE or UPDATE while it should be unaffected

File:

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

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

@@ -2522 +2522 @@
         pjsua_perror(THIS_FILE, "SDP negotiation has failed", status);
 
+        /* Do not deinitialize media since this may be a re-INVITE or
+         * UPDATE (which in this case the media should not get affected
+         * by the failed re-INVITE/UPDATE). The media will be shutdown
+         * when call is disconnected anyway.
+         */
         /* Stop/destroy media, if any */
-        pjsua_media_channel_deinit(call->index);
+        /*pjsua_media_channel_deinit(call->index);*/
 
         /* Disconnect call if we're not in the middle of initializing an
@@ -2571 +2576 @@
                      status);
         call_disconnect(inv, PJSIP_SC_NOT_ACCEPTABLE_HERE);
-        pjsua_media_channel_deinit(call->index);
+        /* No need to deinitialize; media will be shutdown when call
+         * state is disconnected anyway.
+         */
+        /*pjsua_media_channel_deinit(call->index);*/
         PJSUA_UNLOCK();
         return;