diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2013-12-17 09:01:21 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2013-12-17 09:01:21 +0000 |
| commit | 105a9eab72acf4d61613f5e7fb0c064dd54c4a25 (patch) | |
| tree | 2ab6f892881e7e7a64aff310ae4ef689aee4ffa9 /pjsip/src/pjsua-lib/pjsua_media.c | |
| parent | 4f0ca973884029e8462d7f3c836f426d3ff634df (diff) | |
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.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4694 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_media.c')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index acaa0e1f..ce7722c9 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -179,7 +179,7 @@ pj_status_t pjsua_media_subsys_start(void) */ pj_status_t pjsua_media_subsys_destroy(unsigned flags) { - unsigned i; + PJ_UNUSED_ARG(flags); PJ_LOG(4,(THIS_FILE, "Shutting down media..")); pj_log_push_indent(); @@ -191,6 +191,8 @@ pj_status_t pjsua_media_subsys_destroy(unsigned flags) pjsua_aud_subsys_destroy(); } +#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) { /* TODO: check if we're not allowed to send to network in the @@ -199,6 +201,7 @@ pj_status_t pjsua_media_subsys_destroy(unsigned flags) PJ_UNUSED_ARG(flags); pjsua_media_channel_deinit(i); } +#endif /* Destroy media endpoint. */ if (pjsua_var.med_endpt) { |