Changeset 4694 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Dec 17, 2013 9:01:21 AM (11 years ago)

Author:

nanang

Message:

Fixed #1717: Destroy media subsystem after all pollings/busy_sleep() are done, but leave deallocating media transport (via pjsua_media_channel_deinit()) before the pollings to allow clean TURN destroy.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

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

@@ -180 +180 @@
 pj_status_t pjsua_media_subsys_destroy(unsigned flags)
 {
-    unsigned i;
+    PJ_UNUSED_ARG(flags);
 
     PJ_LOG(4,(THIS_FILE, "Shutting down media.."));
@@ -192 +192 @@
     }
 
+#if 0
+    // This part has been moved out to pjsua_destroy() (see also #1717).
     /* Close media transports */
     for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
@@ -200 +202 @@
         pjsua_media_channel_deinit(i);
     }
+#endif
 
     /* Destroy media endpoint. */