Changeset 6138 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

Timestamp:

Jan 28, 2020 2:42:42 AM (4 years ago)

Author:

nanang

Message:

Misc (re #2210): Get rid of annoying persistent log lines due to video conference connection between active capturer and stopped/hidden renderer (thanks to Dmytrii Gonchar for the feedback).

File:

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

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

@@ -668 +668 @@
             }
 
+            status = pjsua_vid_conf_connect(w->cap_slot, w->rend_slot, NULL);
+            if (status != PJ_SUCCESS) {
+                PJ_PERROR(4, (THIS_FILE, status,
+                              "Ignored error on connecting video ports "
+                              "on wid=%d", wid));
+            }
+
             /* Done */
             *id = wid;
@@ -821 +828 @@
 
         /* For preview window, connect capturer & renderer (via conf) */
-        if (w->type == PJSUA_WND_TYPE_PREVIEW) {
+        if (w->type == PJSUA_WND_TYPE_PREVIEW && show) {
             status = pjsua_vid_conf_connect(w->cap_slot, w->rend_slot, NULL);
             if (status != PJ_SUCCESS)
@@ -1445 +1452 @@
                             &enabled);
         } else {
+            status = pjsua_vid_conf_disconnect(w->cap_slot, w->rend_slot);
+            if (status != PJ_SUCCESS) {
+                PJ_PERROR(4, (THIS_FILE, status,
+                              "Ignored error on disconnecting video ports "
+                              "on stopping preview wid=%d", wid));
+            }
             status = pjmedia_vid_port_stop(w->vp_rend);
         }