Changeset 5007 for pjproject/trunk

Timestamp:

Mar 21, 2015 4:23:07 AM (10 years ago)

Author:

ming

Message:

Re #1790: Reinitialize Android OpenGL renderer when there is format change.

File:

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

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

@@ -282 +282 @@
     }
     
-    if (stream->window) {
-        ANativeWindow_release(stream->window);
-        stream->window = NULL;
-    }
-    
     stream->display = EGL_NO_DISPLAY;
     stream->surface = EGL_NO_SURFACE;
@@ -427 +422 @@
             return PJMEDIA_EVID_BADFORMAT;
         
+        /* Re-init OpenGL */
+        if (strm->window)
+            job_queue_post_job(strm->jq, deinit_opengl, strm, 0, NULL);
+
         pjmedia_format_copy(&strm->param.fmt, fmt);
-        
+
         vfd = pjmedia_format_get_video_format_detail(fmt, PJ_TRUE);
         pj_memcpy(&strm->vid_size, &vfd->size, sizeof(vfd->size));
-        if (strm->param.disp_size.w == 0 || strm->param.disp_size.h == 0)
-            pj_memcpy(&strm->param.disp_size, &vfd->size, sizeof(vfd->size));
+        pj_memcpy(&strm->param.disp_size, &vfd->size, sizeof(vfd->size));
+        
+        if (strm->window)
+            job_queue_post_job(strm->jq, init_opengl, strm, 0, NULL);
+            
+        PJ_LOG(4, (THIS_FILE, "Re-initializing OpenGL due to format change"));
         
         return PJ_SUCCESS;
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW) {
-        pj_bool_t is_running = strm->is_running;
         pj_status_t status = PJ_SUCCESS;
         pjmedia_vid_dev_hwnd *wnd = (pjmedia_vid_dev_hwnd *)pval;
@@ -444 +446 @@
             return PJ_SUCCESS;
         
-        /* Stop the stream and re-init OpenGL */
-        andgl_stream_stop(s);
+        /* Re-init OpenGL */
         job_queue_post_job(strm->jq, deinit_opengl, strm, 0, NULL);
+        if (strm->window)
+            ANativeWindow_release(strm->window);
 
         strm->window = strm->param.window.info.android.window = native_wnd;
@@ -453 +456 @@
         }
 
-        PJ_LOG(3, (THIS_FILE, "Re-initializing OpenGL with window %p: %s",
+        PJ_LOG(4, (THIS_FILE, "Re-initializing OpenGL with window %p: %s",
                               strm->window,
                               (status == PJ_SUCCESS? "success": "failed")));
         
-        if (is_running)
-            andgl_stream_start(s);
-
         return status;
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE) {
@@ -526 +526 @@
     job_queue_post_job(stream->jq, deinit_opengl, strm, 0, NULL);
     
+    if (stream->window) {
+        ANativeWindow_release(stream->window);
+        stream->window = NULL;
+    }
+    
     if (stream->jq) {
         job_queue_destroy(stream->jq);