Changeset 4997 for pjproject/trunk/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/CallActivity.java

Timestamp:

Mar 18, 2015 12:02:51 PM (9 years ago)

Author:

ming

Message:

Re #1823 (pjsua2 video api): sample usage of Video Window API in pjsua2 app for android

File:

• pjproject/trunk/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/CallActivity.java (modified) (6 diffs)

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

@@ -22 +22 @@
 import android.os.Handler;
 import android.os.Message;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
 import android.view.View;
 import android.widget.Button;
@@ -29 +31 @@
 import org.pjsip.pjsua2.*;
 
-public class CallActivity extends Activity implements Handler.Callback {
+public class CallActivity extends Activity
+        implements Handler.Callback, SurfaceHolder.Callback
+{
         
         public static Handler handler_;
@@ -40 +44 @@
                 super.onCreate(savedInstanceState);
                 setContentView(R.layout.activity_call);
+                
+                SurfaceView surfaceView = (SurfaceView)findViewById(R.id.surfaceIncomingVideo);
+                if (MainActivity.currentCall == null ||
+                        MainActivity.currentCall.vidWin == null)
+                {
+                        surfaceView.setVisibility(View.GONE);
+                }
+                surfaceView.getHolder().addCallback(this);
                 
                 handler_ = handler;
@@ -59 +71 @@
         handler_ = null;
     }
-        
+
+    private void updateVideoWindow(SurfaceHolder holder) {
+                if (MainActivity.currentCall != null &&
+                        MainActivity.currentCall.vidWin != null)
+                {
+                        VideoWindowHandle vidWH = new VideoWindowHandle();
+                        if (holder == null)
+                                vidWH.getHandle().setWindow(null);
+                        else
+                                vidWH.getHandle().setWindow(pjsua2.android_opengl_get_surface(holder.getSurface()));
+                        try {
+                                MainActivity.currentCall.vidWin.setWindow(vidWH);
+                        } catch (Exception e) {}
+                }
+    }
+    
+        public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
+                updateVideoWindow(holder);
+    }
+
+    public void surfaceCreated(SurfaceHolder holder) {
+    }
+
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        updateVideoWindow(null);
+    }
+    
         public void acceptCall(View view) {
                 CallOpParam prm = new CallOpParam();
@@ -87 +125 @@
         }
         
+        private void setupVideoSurface() {
+
+                SurfaceView surfaceView = (SurfaceView)findViewById(R.id.surfaceIncomingVideo);
+                surfaceView.setVisibility(View.VISIBLE);
+                updateVideoWindow(surfaceView.getHolder());
+                
+        }
+        
         @Override
         public boolean handleMessage(Message m) {
@@ -95 +141 @@
                         updateCallState(lastCallInfo);
                         
+                } else if (m.what == MainActivity.MSG_TYPE.CALL_MEDIA_STATE) {
+                        
+                        if (MainActivity.currentCall.vidWin != null) {
+                                /* If there's incoming video, display it. */
+                                setupVideoSurface();
+                        }
+
                 } else {