Changeset 6085

Timestamp:

Oct 4, 2019 4:26:39 AM (5 years ago)

Author:

nanang

Message:

Fixed #2239:

• Deinit OpenGL immediately when initialization fails, so video device start() and put_frame() will return immediately.
• Introduced new media event PJMEDIA_EVENT_VID_DEV_ERROR, used for notifying app when video device reinit (due to format change) fails.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/event.h (modified) (4 diffs)
• pjmedia/include/pjmedia/videodev.h (modified) (1 diff)
• pjmedia/src/pjmedia-videodev/android_opengl.c (modified) (7 diffs)
• pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (1 diff)
• pjmedia/src/pjmedia/vid_port.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/event.h

@@ -27 +27 @@
 #include <pjmedia/format.h>
 #include <pjmedia/signatures.h>
+#include <pjmedia/videodev.h>
 
 PJ_BEGIN_DECL
@@ -97 +98 @@
 
     /**
+     * Video device stopped on error.
+     */
+    PJMEDIA_EVENT_VID_DEV_ERROR = PJMEDIA_FOURCC('V', 'E', 'R', 'R'),
+
+    /**
      * Transport media error.
      */
@@ -159 +165 @@
     /** The error code */
     pj_status_t              status;
+
 } pjmedia_event_aud_dev_err_data;
+
+/**
+ * Additional data/parameters for video device error event.
+ */
+typedef struct pjmedia_event_vid_dev_err_data
+{
+    /** The media direction that fails */
+    pjmedia_dir              dir;
+
+    /** The video device ID */
+    pjmedia_vid_dev_index    id;
+
+    /** The error code */
+    pj_status_t              status;
+
+} pjmedia_event_vid_dev_err_data;
 
 /**
@@ -265 +288 @@
         /** Audio device error event data */
         pjmedia_event_aud_dev_err_data          aud_dev_err;
+
+        /** Video device error event data */
+        pjmedia_event_vid_dev_err_data          vid_dev_err;
 
         /** Storage for user event data */

pjproject/trunk/pjmedia/include/pjmedia/videodev.h

@@ -26 +26 @@
 #include <pjmedia-videodev/config.h>
 #include <pjmedia-videodev/errno.h>
-#include <pjmedia/event.h>
 #include <pjmedia/frame.h>
 #include <pjmedia/format.h>

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

@@ -115 +115 @@
 static pj_status_t andgl_stream_destroy(pjmedia_vid_dev_stream *strm);
 
+static pj_status_t init_opengl(void * data);
+static pj_status_t deinit_opengl(void * data);
+
 /* Job queue prototypes */
 static pj_status_t job_queue_create(pj_pool_t *pool, job_queue **pjq);
@@ -155 +158 @@
     { \
         PJ_LOG(3, (THIS_FILE, "Unable to %s %d", str, eglGetError())); \
-        return PJMEDIA_EVID_SYSERR; \
+        status = PJMEDIA_EVID_SYSERR; \
+        goto on_return; \
     }
 
@@ -173 +177 @@
     EGLint width;
     EGLint height;
+    pj_status_t status;
     
     strm->display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
@@ -220 +225 @@
     
     /* Init GL buffers */
-    return pjmedia_vid_dev_opengl_init_buffers(strm->gl_buf);
-}
+    status = pjmedia_vid_dev_opengl_init_buffers(strm->gl_buf);
+    
+on_return:
+    if (status != PJ_SUCCESS)
+        deinit_opengl(strm);
+
+    return status;
+}
+
+#undef EGL_ERR
 
 static pj_status_t render(void * data)
@@ -387 +400 @@
         pjmedia_format *fmt = (pjmedia_format *)pval;
         andgl_fmt_info *ifi;
+        pj_status_t status = PJ_SUCCESS;
         
         if (!(ifi = get_andgl_format_info(fmt->id)))
@@ -407 +421 @@
         
         if (strm->window)
-            job_queue_post_job(strm->jq, init_opengl, strm, 0, NULL);
+            job_queue_post_job(strm->jq, init_opengl, strm, 0, &status);
             
-        PJ_LOG(4, (THIS_FILE, "Re-initializing OpenGL due to format change"));
-        
-        return PJ_SUCCESS;
+        PJ_PERROR(4,(THIS_FILE, status,
+                     "Re-initializing OpenGL due to format change"));
+        return status;
+        
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW) {
         pj_status_t status = PJ_SUCCESS;
@@ -430 +445 @@
         }
 
-        PJ_LOG(4, (THIS_FILE, "Re-initializing OpenGL with native window"
-                              " %p: %s", strm->window,
-                              (status == PJ_SUCCESS? "success": "failed")));
-        
+        PJ_PERROR(4,(THIS_FILE, status,
+                     "Re-initializing OpenGL with native window %p",
+                     strm->window));
         return status;
     }

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

@@ -18 +18 @@
  */
 #include <pjmedia-videodev/videodev_imp.h>
+#include <pjmedia/event.h>
 #include <pj/assert.h>
 #include <pj/log.h>

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -1004 +1004 @@
                                                 &vp->conv.conv_param.dst);
             if (status != PJ_SUCCESS) {
+                pjmedia_event e;
+
                 PJ_PERROR(3,(THIS_FILE, status,
                     "failure in changing the format of the video device"));
@@ -1009 +1011 @@
                                       status != PJMEDIA_EVID_ERR ? "success" :
                                       "failure"));
+
+                pjmedia_event_init(&e, PJMEDIA_EVENT_VID_DEV_ERROR, NULL, vp);
+                e.data.vid_dev_err.dir = vp->dir;
+                e.data.vid_dev_err.status = status;
+                e.data.vid_dev_err.id = (vp->dir==PJMEDIA_DIR_ENCODING?
+                                         vid_param.cap_id : vid_param.rend_id);
+                pjmedia_event_publish(NULL, vp, &e,
+                                      PJMEDIA_EVENT_PUBLISH_POST_EVENT);
+
                 return status;
             }

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

@@ -1550 +1550 @@
                                            w->rend_slot, NULL);
                 }
+            }
+            break;
+
+        case PJMEDIA_EVENT_VID_DEV_ERROR:
+            {
+                PJ_PERROR(3,(THIS_FILE, event->data.vid_dev_err.status,
+                             "Video device id=%d error for call %d",
+                             event->data.vid_dev_err.id,
+                             call->index));
             }
             break;