diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2012-04-24 05:40:32 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2012-04-24 05:40:32 +0000 |
| commit | 603594518c4cbe3c564df98e3cd86f34b89e5971 (patch) | |
| tree | 37acdb3307a94d23e1d834b304570a7cad3b4757 /pjsip/include/pjsua-lib | |
| parent | d73368a020b5723e58b529f0ed6401459b7750b3 (diff) | |
Fix #1423:
- Added provisional media in call for generating initial and subsequent SDP offer/answer. If a reoffer is rejected by peer, the main call media will remain unchanged and the provisional media will be cleaned up (the cleanup is currently delayed until call gets destroyed or another reoffer/answer occurs).
- Reenabled media transport dump in pjsua_core.c.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4071 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/include/pjsua-lib')
| -rw-r--r-- | pjsip/include/pjsua-lib/pjsua_internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pjsip/include/pjsua-lib/pjsua_internal.h b/pjsip/include/pjsua-lib/pjsua_internal.h index 646c8d7c..61007d8a 100644 --- a/pjsip/include/pjsua-lib/pjsua_internal.h +++ b/pjsip/include/pjsua-lib/pjsua_internal.h @@ -136,6 +136,10 @@ struct pjsua_call unsigned med_cnt; /**< Number of media in SDP. */ pjsua_call_media media[PJSUA_MAX_CALL_MEDIA]; /**< Array of media */ + unsigned med_prov_cnt;/**< Number of provisional media. */ + pjsua_call_media media_prov[PJSUA_MAX_CALL_MEDIA]; + /**< Array of provisional media. */ + int audio_idx; /**< First active audio media. */ pj_mutex_t *med_ch_mutex;/**< Media channel callback's mutex. */ pjsua_med_tp_state_cb med_ch_cb;/**< Media channel callback. */ @@ -603,6 +607,8 @@ pj_status_t pjsua_call_media_init(pjsua_call_media *call_med, pjsua_med_tp_state_cb cb); void pjsua_set_media_tp_state(pjsua_call_media *call_med, pjsua_med_tp_st tp_st); +void pjsua_media_prov_clean_up(pjsua_call_id call_id); + /* Callback to receive media events */ pj_status_t call_media_on_event(pjmedia_event *event, void *user_data); |