Changeset 5016 for pjproject/trunk

Timestamp:

Mar 22, 2015 9:39:31 AM (10 years ago)

Author:

ming

Message:

Re #1790: Misc fixes:

• Fixed crash when trying to set NULL surface
• Fixed race condition between setting surface and rendering
• Fixed crash due to GC of VideoWindow?

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-videodev/android_opengl.c (modified) (2 diffs)
• pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java (modified) (1 diff)
• pjsip-apps/src/swig/pjsua2.i (modified) (1 diff)

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

@@ -230 +230 @@
     struct andgl_stream *stream = (struct andgl_stream *)data;
     
-    if (!stream->window || stream->err_rend == 0)
+    if (stream->display == EGL_NO_DISPLAY || stream->err_rend == 0)
         return PJ_SUCCESS;
     
@@ -482 +482 @@
     pj_status_t status;
 
-    if (!stream->is_running || !stream->window)
+    if (!stream->is_running || stream->display == EGL_NO_DISPLAY)
         return PJ_EINVALIDOP;
     

pjproject/trunk/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java

@@ -96 +96 @@
                                        cmi.getVideoIncomingWindowId() != pjsua2.INVALID_ID)
                         {
-                                vidWin = cmi.getVideoWindow();
+                                vidWin = new VideoWindow(cmi.getVideoIncomingWindowId());
                         }
                 }

pjproject/trunk/pjsip-apps/src/swig/pjsua2.i

@@ -108 +108 @@
 %ignore pj::WindowHandle::window;
 %typemap(in) jobject surface {
-    $1 = (jobject)ANativeWindow_fromSurface(jenv, $input);
+    $1 = ($input? (jobject)ANativeWindow_fromSurface(jenv, $input): NULL);
 }
 %extend pj::WindowHandle {