Changeset 6138

Timestamp:

Jan 28, 2020 2:42:42 AM (5 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).

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-videodev/android_opengl.c (modified) (1 diff)
• pjmedia/src/pjmedia-videodev/darwin_dev.m (modified) (1 diff)
• pjmedia/src/pjmedia-videodev/ios_opengl_dev.m (modified) (1 diff)
• pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia-videodev/android_opengl.c

@@ -474 +474 @@
     pj_status_t status;
 
+    /* Video conference just trying to send heart beat for updating timestamp
+     * or keep-alive, this port doesn't need any, just ignore.
+     */
+    if (frame->size==0 || frame->buf==NULL)
+        return PJ_SUCCESS;
+        
     if (!stream->is_running || stream->display == EGL_NO_DISPLAY)
         return PJ_EINVALIDOP;

pjproject/trunk/pjmedia/src/pjmedia-videodev/darwin_dev.m

@@ -1331 +1331 @@
     struct darwin_stream *stream = (struct darwin_stream*)strm;
 
+    /* Video conference just trying to send heart beat for updating timestamp
+     * or keep-alive, this port doesn't need any, just ignore.
+     */
+    if (frame->size==0 || frame->buf==NULL)
+        return PJ_SUCCESS;
+        
     if (stream->frame_size >= frame->size)
         pj_memcpy(stream->render_buf, frame->buf, frame->size);

pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_opengl_dev.m

@@ -472 +472 @@
     struct iosgl_stream *stream = (struct iosgl_stream*)strm;
     
+    /* Video conference just trying to send heart beat for updating timestamp
+     * or keep-alive, this port doesn't need any, just ignore.
+     */
+    if (frame->size==0 || frame->buf==NULL)
+        return PJ_SUCCESS;
+        
     if (!stream->is_running)
         return PJ_EINVALIDOP;

pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -926 +926 @@
     stream->last_ts.u64 = frame->timestamp.u64;
 
+    /* Video conference just trying to send heart beat for updating timestamp
+     * or keep-alive, this port doesn't need any, just ignore.
+     */
+    if (frame->size==0 || frame->buf==NULL)
+        return PJ_SUCCESS;
+
+    if (frame->size < stream->vafp.framebytes)
+        return PJ_ETOOSMALL;
+
     if (!stream->is_running)
         return PJ_EINVALIDOP;
-
-    if (frame->size==0 || frame->buf==NULL ||
-        frame->size < stream->vafp.framebytes)
-        return PJ_SUCCESS;
 
     stream->frame = frame;

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);
         }