Changeset 3891 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Dec 1, 2011 9:06:14 AM (12 years ago)

Author:

nanang

Message:

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()

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -384 +384 @@
     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));
@@ -674 +666 @@
     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));
@@ -1064 +1049 @@
         }
     }
-
-    /* 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 */