diff options
author | Liong Sauw Ming <ming@teluu.com> | 2011-10-24 09:28:13 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2011-10-24 09:28:13 +0000 |
commit | 2068f13bc42cf3a47374aa2765f82724a5782028 (patch) | |
tree | 29fbeaa152ab51e59b650c0d7cd83a38111e1ecc /pjsip/include/pjsua-lib/pjsua_internal.h | |
parent | 1c72a42676e7aa0c2ae0734549050f738f3bdf02 (diff) |
Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk
* Backport of r3557:r3832
TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3841 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/include/pjsua-lib/pjsua_internal.h')
-rw-r--r-- | pjsip/include/pjsua-lib/pjsua_internal.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pjsip/include/pjsua-lib/pjsua_internal.h b/pjsip/include/pjsua-lib/pjsua_internal.h index b15a102e..db566ed5 100644 --- a/pjsip/include/pjsua-lib/pjsua_internal.h +++ b/pjsip/include/pjsua-lib/pjsua_internal.h @@ -43,6 +43,7 @@ struct pjsua_call_media pjmedia_type type; /**< Media type. */ unsigned idx; /**< This media index in parent call. */ pjsua_call_media_status state; /**< Media state. */ + pjsua_call_media_status prev_state;/**< Previous media state. */ pjmedia_dir dir; /**< Media direction. */ /** The stream */ @@ -78,6 +79,7 @@ struct pjsua_call_media pjmedia_transport *tp_orig; /**< Original media transport */ pj_bool_t tp_auto_del; /**< May delete media transport */ pjsua_med_tp_st tp_st; /**< Media transport state */ + pj_bool_t use_custom_med_tp;/**< Use custom media transport? */ pj_sockaddr rtp_addr; /**< Current RTP source address (used to update ICE default address) */ @@ -130,6 +132,7 @@ struct pjsua_call int secure_level;/**< Signaling security level. */ pjsua_call_hold_type call_hold_type; /**< How to do call hold. */ pj_bool_t local_hold;/**< Flag for call-hold by local. */ + void *hold_msg; /**< Outgoing hold tx_data. */ unsigned med_cnt; /**< Number of media in SDP. */ pjsua_call_media media[PJSUA_MAX_CALL_MEDIA]; /**< Array of media */ @@ -580,7 +583,7 @@ void pjsua_pres_update_acc(int acc_id, pj_bool_t force); /* * Shutdown presence. */ -void pjsua_pres_shutdown(void); +void pjsua_pres_shutdown(unsigned flags); /** * Init presence for aoocunt. @@ -595,12 +598,12 @@ pj_status_t pjsua_pres_init_publish_acc(int acc_id); /** * Send un-PUBLISH */ -void pjsua_pres_unpublish(pjsua_acc *acc); +void pjsua_pres_unpublish(pjsua_acc *acc, unsigned flags); /** * Terminate server subscription for the account */ -void pjsua_pres_delete_acc(int acc_id); +void pjsua_pres_delete_acc(int acc_id, unsigned flags); /** * Init IM module handler to handle incoming MESSAGE outside dialog. @@ -635,7 +638,7 @@ pj_status_t pjsua_media_subsys_start(void); /** * Destroy pjsua media subsystem. */ -pj_status_t pjsua_media_subsys_destroy(void); +pj_status_t pjsua_media_subsys_destroy(unsigned flags); /** * Private: check if we can accept the message. |