Initial conference implementation
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@205 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip/src/pjsua/pjsua.h b/pjsip/src/pjsua/pjsua.h
index 6bd19d5..3afde35 100644
--- a/pjsip/src/pjsua/pjsua.h
+++ b/pjsip/src/pjsua/pjsua.h
@@ -49,6 +49,12 @@
*/
#define PJSUA_MAX_BUDDIES 32
+/**
+ * Max simultaneous calls.
+ */
+#define PJSUA_MAX_CALLS 8
+
+
/**
* Structure to be attached to all dialog.
* Given a dialog "dlg", application can retrieve this structure
@@ -58,9 +64,10 @@
{
PJ_DECL_LIST_MEMBER(struct pjsua_inv_data);
- pjsip_inv_session *inv;
- pjmedia_session *session;
- void *mod_data[PJSIP_MAX_MODULE];
+ pjsip_inv_session *inv; /**< The invite session. */
+ pjmedia_session *session; /**< The media session. */
+ unsigned conf_slot; /**< Slot # in conference bridge. */
+ unsigned call_slot; /**< RTP media index in med_sock_use[] */
};
@@ -105,9 +112,16 @@
/* Media: */
- pjmedia_endpt *med_endpt; /**< Media endpoint. */
- pj_bool_t null_audio;
- pjmedia_sock_info med_skinfo;
+ pjmedia_endpt *med_endpt; /**< Media endpoint. */
+ pjmedia_conf *mconf; /**< Media conference. */
+ pj_bool_t null_audio; /**< Null audio flag. */
+
+
+ /* Since we support simultaneous calls, we need to have multiple
+ * RTP sockets.
+ */
+ pjmedia_sock_info med_sock_info[PJSUA_MAX_CALLS];
+ pj_bool_t med_sock_use[PJSUA_MAX_CALLS];
/* User info: */
@@ -137,7 +151,7 @@
pjsip_cred_info cred_info[4];
- /* Threading: */
+ /* Threading (optional): */
int thread_cnt; /**< Thread count. */
pj_thread_t *threads[8]; /**< Thread instances. */