Fixed #1813: Problem with media reinitialisation when using ICE

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4980 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Sauw Ming 2015-02-11 02:13:04 +00:00
parent dff6489f6b
commit 59c9efa175
1 changed files with 6 additions and 5 deletions

View File

@ -1360,6 +1360,12 @@ pj_status_t pjsua_call_media_init(pjsua_call_media *call_med,
* the unused transport of a disabled media.
*/
if (call_med->tp == NULL) {
/* Initializations. If media transport creation completes immediately,
* we don't need to call the callbacks.
*/
call_med->med_init_cb = NULL;
call_med->med_create_cb = NULL;
#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
/* While in initial call, set default video devices */
if (type == PJMEDIA_TYPE_VIDEO) {
@ -1393,11 +1399,6 @@ pj_status_t pjsua_call_media_init(pjsua_call_media *call_med,
return status;
}
/* Media transport creation completed immediately, so
* we don't need to call the callback.
*/
call_med->med_init_cb = NULL;
} else if (call_med->tp_st == PJSUA_MED_TP_DISABLED) {
/* Media is being reenabled. */
//pjsua_set_media_tp_state(call_med, PJSUA_MED_TP_IDLE);