Changeset 5513 for pjproject/branches/projects/uwp/pjsip/src/pjsua-lib/pjsua_vid.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (7 diffs)

pjproject/branches/projects/uwp/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -911 +911 @@
         /* Set rate control config from account setting */
         si->rc_cfg = acc->cfg.vid_stream_rc_cfg;
+
+        /* Set send keyframe config from account setting */
+        si->sk_cfg = acc->cfg.vid_stream_sk_cfg;
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
@@ -1450 +1453 @@
 
     PJSUA_LOCK();
+
     w = &pjsua_var.win[wid];
-    if (w->vp_rend == NULL) {
-        /* Native window */
-        PJSUA_UNLOCK();
-        return PJ_EINVAL;
-    }
-
-    s = pjmedia_vid_port_get_stream(w->vp_rend);
+    s = pjmedia_vid_port_get_stream(w->vp_rend? w->vp_rend: w->vp_cap);
     if (s == NULL) {
         PJSUA_UNLOCK();
@@ -1489 +1487 @@
 
     PJSUA_LOCK();
+
     w = &pjsua_var.win[wid];
-    if (w->vp_rend == NULL) {
-        /* Native window */
-        PJSUA_UNLOCK();
-        return PJ_EINVAL;
-    }
-
-    s = pjmedia_vid_port_get_stream(w->vp_rend);
+    s = pjmedia_vid_port_get_stream(w->vp_rend? w->vp_rend: w->vp_cap);
     if (s == NULL) {
         PJSUA_UNLOCK();
@@ -1523 +1516 @@
 
     PJSUA_LOCK();
+
     w = &pjsua_var.win[wid];
-    if (w->vp_rend == NULL) {
-        /* Native window */
-        PJSUA_UNLOCK();
-        return PJ_EINVAL;
-    }
-
-    s = pjmedia_vid_port_get_stream(w->vp_rend);
+    s = pjmedia_vid_port_get_stream(w->vp_rend? w->vp_rend: w->vp_cap);
     if (s == NULL) {
         PJSUA_UNLOCK();
@@ -1557 +1545 @@
 
     PJSUA_LOCK();
+
     w = &pjsua_var.win[wid];
-    if (w->vp_rend == NULL) {
-        /* Native window */
-        PJSUA_UNLOCK();
-        return PJ_EINVAL;
-    }
-
-    s = pjmedia_vid_port_get_stream(w->vp_rend);
+    s = pjmedia_vid_port_get_stream(w->vp_rend? w->vp_rend: w->vp_cap);
     if (s == NULL) {
         PJSUA_UNLOCK();
@@ -1617 +1600 @@
 
     PJSUA_LOCK();
+
     w = &pjsua_var.win[wid];
-    if (w->vp_rend == NULL) {
-        /* Native window */
-        PJSUA_UNLOCK();
-        return PJ_EINVAL;
-    }
-
-    s = pjmedia_vid_port_get_stream(w->vp_rend);
+    s = pjmedia_vid_port_get_stream(w->vp_rend? w->vp_rend: w->vp_cap);
     if (s == NULL) {
         PJSUA_UNLOCK();
@@ -1823 +1801 @@
         call_med->tp = call_med->tp_orig = NULL;
     }
+    call->med_prov_cnt = 0;
 
     return status;