Changeset 5525

Timestamp:

Jan 17, 2017 4:28:39 AM (8 years ago)

Author:

ming

Message:

Re #1945 (misc): Fixed occasional crash in pjsua Android sample app when initializing OpenGL renderer (crash in init_opengl()->ANativeWindow_setBuffersGeometry()). It doesn't happen in pjsua2 sample app.

Location:

pjproject/trunk/pjsip-apps/src/pjsua/android

Files:

• app/src/main/java/MainActivity.java (modified) (2 diffs)
• app/src/main/java/org/pjsip/pjsua (modified) (1 prop)
• jni/pjsua.i (modified) (1 diff)
• jni/pjsua_app_callback.cpp (modified) (3 diffs)
• jni/pjsua_app_callback.h (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/android/app/src/main/java/MainActivity.java

@@ -139 +139 @@
             }
         }
+
+        @Override
+        public void onCallVideoStart() {
+            MainActivity ma = ((MyHandler)ui_handler.get()).mTarget.get();
+            SurfaceView surfaceView = (SurfaceView)
+                ma.findViewById(R.id.surfaceViewIncomingCall);
+
+            WindowHandle wh = new WindowHandle();
+            wh.setWindow(surfaceView.getHolder().getSurface());
+            pjsua.setVideoWindow(wh);
+        }
     }
 
@@ -262 +273 @@
     public void surfaceChanged(SurfaceHolder holder, int format, int w, int h)
     {
-        pjsua.setIncomingVideoRenderer(holder.getSurface());
+        WindowHandle wh = new WindowHandle();
+        wh.setWindow(holder.getSurface());
+        pjsua.setVideoWindow(wh);
     }
 
     public void surfaceCreated(SurfaceHolder holder)
     {
-        pjsua.setIncomingVideoRenderer(holder.getSurface());
+
     }
 
     public void surfaceDestroyed(SurfaceHolder holder)
     {
-        pjsua.setIncomingVideoRenderer(null);
+        WindowHandle wh = new WindowHandle();
+        wh.setWindow(null);
+        pjsua.setVideoWindow(wh);
     }
     

pjproject/trunk/pjsip-apps/src/pjsua/android/app/src/main/java/org/pjsip/pjsua

@@ -1 +1 @@
 Pjsua*.java
 pjsua*.java
+SWIG*.java
+WindowHandle.java
+

@@ -1 +1 @@
 Pjsua*.java
 pjsua*.java
+SWIG*.java
+WindowHandle.java
+

pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua.i

@@ -15 +15 @@
 %feature("director") PjsuaAppCallback;
 
-/* Convert Surface object to ANativeWindow for setIncomingVideoRenderer() */
+/* Convert Surface object to ANativeWindow */
 %typemap(in) jobject surface {
     $1 = $input? (jobject)ANativeWindow_fromSurface(jenv, $input) : NULL;
 }
 
+%extend WindowHandle {
+    void setWindow(jobject surface) { $self->window = surface; }
+}
+
 %include "pjsua_app_callback.h"

pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.cpp

@@ -31 +31 @@
 static char **restart_argv;
 static pjsua_callback pjsua_cb_orig;
-static jobject callVideoSurface;
+static pjsua_vid_win_id winId = PJSUA_INVALID_ID;
+
+void setVideoWindow(const WindowHandle& win)
+{
+    pjmedia_vid_dev_hwnd vhwnd;
+   
+    vhwnd.info.window = win.window;
+    if (winId != PJSUA_INVALID_ID)
+        pjsua_vid_win_set_win(winId, &vhwnd);
+}
 
 extern const char *pjsua_app_def_argv[];
@@ -58 +67 @@
             med_info->stream.vid.win_in != PJSUA_INVALID_ID)
         {
-            pjmedia_vid_dev_hwnd vhwnd;
-
-            /* Setup renderer surface */
-            pj_bzero(&vhwnd, sizeof(vhwnd));
-            vhwnd.type = PJMEDIA_VID_DEV_HWND_TYPE_ANDROID;
-            vhwnd.info.window = callVideoSurface;
-            pjsua_vid_win_set_win(med_info->stream.vid.win_in, &vhwnd);
+            winId = med_info->stream.vid.win_in;
+            registeredCallbackObject->onCallVideoStart();
             break;
         }
@@ -163 +167 @@
 }
 
-
-void setIncomingVideoRenderer(jobject surface)
-{
-    callVideoSurface = surface;
-}
-
 #endif

pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.h

@@ -20 +20 @@
 #define __PJSUA_APP_CALLBACK_H__
 
-#include <jni.h>
-
 class PjsuaAppCallback {
 public:
@@ -27 +25 @@
     virtual void onStarted(const char *msg) {}
     virtual void onStopped(int restart) {}
+    virtual void onCallVideoStart() {}
 };
+
+typedef struct WindowHandle {
+    void        *window;
+} WindowHandle;
+
+void setVideoWindow(const WindowHandle& win);
 
 extern "C" {
@@ -34 +39 @@
 int pjsuaRestart();
 void setCallbackObject(PjsuaAppCallback* callback);
-void setIncomingVideoRenderer(jobject surface);
 }
 

@@ -1 +1 @@
 Pjsua*.java
 pjsua*.java
+SWIG*.java
+WindowHandle.java
+