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

Timestamp:

Jul 19, 2011 11:11:07 AM (13 years ago)

Author:

nanang

Message:

Fixed #1271: protected all video features with PJMEDIA_HAS_VIDEO macro setting.

File:

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

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

@@ -383 +383 @@
     PJ_ASSERT_RETURN(pjsua_var.tpdata[0].data.ptr != NULL, PJ_EINVALIDOP);
 
+    /* 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);
+
     PJSUA_LOCK();
 
@@ -641 +648 @@
     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);
+
 
     PJSUA_LOCK();