diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-12-01 09:06:14 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-12-01 09:06:14 +0000 |
| commit | fb7ffe37b9ca728f0d3f6bf57b937e114d2f9161 (patch) | |
| tree | bf3d2bd71b21ee29d72fd4bb99af186d8b18f064 /pjsip/src/pjsua-lib/pjsua_acc.c | |
| parent | 9ad8beaa148c78e04a2aac3c5ad6d85567d31b01 (diff) | |
Re #1419, implement media count manipulation per call basis:
- moved the media count setting from account setting to call setting
- introduced pjsua_call_setting, to be used by pjsua_call_make_call() and some new APIs: pjsua_call_answer2(), pjsua_call_reinvite2(), pjsua_call_update2()
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3891 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_acc.c')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_acc.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index 24df6e01..b8f0dd8e 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -383,14 +383,6 @@ PJ_DEF(pj_status_t) pjsua_acc_add( const pjsua_acc_config *cfg, /* Must have a transport */ PJ_ASSERT_RETURN(pjsua_var.tpdata[0].data.ptr != NULL, PJ_EINVALIDOP); - /* Verify media count */ -#if !defined(PJMEDIA_HAS_VIDEO) || (PJMEDIA_HAS_VIDEO == 0) - /* Enable PJMEDIA_HAS_VIDEO in your config_site.h! */ - PJ_ASSERT_RETURN(cfg->max_video_cnt == 0, PJ_EINVAL); -#endif - PJ_ASSERT_RETURN(cfg->max_audio_cnt + cfg->max_video_cnt <= - PJSUA_MAX_CALL_MEDIA, PJ_ETOOMANY); - PJ_LOG(4,(THIS_FILE, "Adding account: id=%.*s", (int)cfg->id.slen, cfg->id.ptr)); pj_log_push_indent(); @@ -674,13 +666,6 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id, PJ_ASSERT_RETURN(acc_id>=0 && acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc), PJ_EINVAL); - /* Verify media count */ -#if !defined(PJMEDIA_HAS_VIDEO) || (PJMEDIA_HAS_VIDEO == 0) - PJ_ASSERT_RETURN(cfg->max_video_cnt == 0, PJ_EINVAL); -#endif - PJ_ASSERT_RETURN(cfg->max_audio_cnt + cfg->max_video_cnt <= - PJSUA_MAX_CALL_MEDIA, PJ_ETOOMANY); - PJ_LOG(4,(THIS_FILE, "Modifying accunt %d", acc_id)); pj_log_push_indent(); @@ -1064,10 +1049,6 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id, } } - /* Max number of audio and video stream in a call */ - acc->cfg.max_audio_cnt = cfg->max_audio_cnt; - acc->cfg.max_video_cnt = cfg->max_video_cnt; - /* Video settings */ acc->cfg.vid_in_auto_show = cfg->vid_in_auto_show; acc->cfg.vid_out_auto_transmit = cfg->vid_out_auto_transmit; |