Changeset 6085 for pjproject/trunk/pjmedia/src/pjmedia-videodev/android_opengl.c

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.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/android_opengl.c (modified) (7 diffs)

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