Changeset 3891 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.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_vid.c (modified) (4 diffs)

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

@@ -1313 +1313 @@
     }
 
+    /* Make sure that renderer gets started before shown up */
+    if (show && !pjmedia_vid_port_is_running(w->vp_rend))
+        status = pjmedia_vid_port_start(w->vp_rend);
+
     hide = !show;
     status = pjmedia_vid_dev_stream_set_cap(s,
@@ -1541 +1545 @@
     pjmedia_sdp_media *sdp_m;
     pjmedia_transport_info tpinfo;
-    unsigned active_cnt;
     pj_status_t status;
 
     /* Verify media slot availability */
     if (call->med_cnt == PJSUA_MAX_CALL_MEDIA)
-        return PJ_ETOOMANY;
-
-    call_get_vid_strm_info(call, NULL, NULL, &active_cnt, NULL);
-    if (active_cnt == acc_cfg->max_video_cnt)
         return PJ_ETOOMANY;
 
@@ -1617 +1616 @@
     if (status != PJ_SUCCESS)
         goto on_error;
+
+    call->opt.video_cnt++;
 
     return PJ_SUCCESS;
@@ -1759 +1760 @@
         pjmedia_sdp_media_deactivate(pool, sdp->media[med_idx]);
 
+        call->opt.video_cnt--;
     }