Changeset 5102 for pjproject/trunk/pjsip-apps/src/swig/java/android/src/org/pjsip

Timestamp:

May 28, 2015 7:14:24 AM (9 years ago)

Author:

riza

Message:

Re #1855 (Pjsua2 Video Preview API): Add Pjsua2 Preview API and sample usage in pjsua2 app for android.

Location:

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

Files:

• CallActivity.java (modified) (6 diffs)
• MyApp.java (modified) (2 diffs)

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

@@ -31 +31 @@
 import org.pjsip.pjsua2.*;
 
+class VideoPreviewHandler implements SurfaceHolder.Callback
+{   
+    public boolean videoPreviewActive = false;
+        
+    public void updateVideoPreview(SurfaceHolder holder) 
+    {
+        if (MainActivity.currentCall != null &&
+            MainActivity.currentCall.vidWin != null &&
+            MainActivity.currentCall.vidPrev != null)
+        {       
+            if (videoPreviewActive) {
+                VideoWindowHandle vidWH = new VideoWindowHandle();
+                vidWH.getHandle().setWindow(holder.getSurface());
+                VideoPreviewOpParam vidPrevParam = new VideoPreviewOpParam();
+                vidPrevParam.setWindow(vidWH);          
+                try {
+                    MainActivity.currentCall.vidPrev.start(vidPrevParam);
+                } catch (Exception e) {
+                    System.out.println(e);
+                }
+            } else {
+                try {
+                    MainActivity.currentCall.vidPrev.stop();
+                } catch (Exception e) {
+                    System.out.println(e);
+                }       
+            }
+        }
+    }    
+    
+    @Override
+    public void surfaceChanged(SurfaceHolder holder, int format, int w, int h)
+    {
+        updateVideoPreview(holder);
+    }
+
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) 
+    {
+        
+    }
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) 
+    {
+        try {
+            MainActivity.currentCall.vidPrev.stop();
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+    }    
+}
+
 public class CallActivity extends Activity
                           implements Handler.Callback, SurfaceHolder.Callback
@@ -36 +89 @@
 
     public static Handler handler_;
+    private static VideoPreviewHandler previewHandler = 
+                                                      new VideoPreviewHandler();
 
     private final Handler handler = new Handler(this);
@@ -46 +101 @@
         setContentView(R.layout.activity_call);
 
-        SurfaceView surfaceView = (SurfaceView)
+        SurfaceView surfaceInVideo = (SurfaceView)
                                   findViewById(R.id.surfaceIncomingVideo);
+        SurfaceView surfacePreview = (SurfaceView)
+                                  findViewById(R.id.surfacePreviewCapture);     
+        Button buttonShowPreview = (Button) 
+                                  findViewById(R.id.buttonShowPreview); 
+        
         if (MainActivity.currentCall == null ||
             MainActivity.currentCall.vidWin == null)
         {
-            surfaceView.setVisibility(View.GONE);
-        }
-        surfaceView.getHolder().addCallback(this);
+            surfaceInVideo.setVisibility(View.GONE);        
+            buttonShowPreview.setVisibility(View.GONE);
+        }
+        setupVideoPreview(surfacePreview, buttonShowPreview);
+        surfaceInVideo.getHolder().addCallback(this);
+        surfacePreview.getHolder().addCallback(previewHandler);
 
         handler_ = handler;
@@ -74 +137 @@
         handler_ = null;
     }
-
-    private void updateVideoWindow(SurfaceHolder holder)
-    {
+    
+    private void updateVideoWindow(boolean show)
+    { 
         if (MainActivity.currentCall != null &&
-            MainActivity.currentCall.vidWin != null)
+            MainActivity.currentCall.vidWin != null &&
+            MainActivity.currentCall.vidPrev != null)
         {
-            VideoWindowHandle vidWH = new VideoWindowHandle();
-            if (holder == null)
+            SurfaceView surfaceInVideo = (SurfaceView) 
+                                  findViewById(R.id.surfaceIncomingVideo);
+            
+            VideoWindowHandle vidWH = new VideoWindowHandle();      
+            if (show) {
+                vidWH.getHandle().setWindow(
+                                       surfaceInVideo.getHolder().getSurface());
+            } else {
                 vidWH.getHandle().setWindow(null);
-            else
-                vidWH.getHandle().setWindow(holder.getSurface());
+            }
             try {
                 MainActivity.currentCall.vidWin.setWindow(vidWH);
-            } catch (Exception e) {}
-        }
-    }
-
+            } catch (Exception e) {
+                System.out.println(e);
+            }       
+        }
+    }
+     
     public void surfaceChanged(SurfaceHolder holder, int format, int w, int h)
     {
-        updateVideoWindow(holder);
+        updateVideoWindow(true);
     }
 
@@ -102 +173 @@
     public void surfaceDestroyed(SurfaceHolder holder)
     {
-        updateVideoWindow(null);
+        updateVideoWindow(false);
     }
 
@@ -133 +204 @@
         }
     }
+    
+    public void setupVideoPreview(SurfaceView surfacePreview, 
+                                  Button buttonShowPreview)
+    {
+        surfacePreview.setVisibility(previewHandler.videoPreviewActive?
+                                     View.VISIBLE:View.GONE);
+        
+        buttonShowPreview.setText(previewHandler.videoPreviewActive?
+                                  getString(R.string.hide_preview):
+                                  getString(R.string.show_preview));            
+    }
+    
+    public void showPreview(View view)
+    {
+        SurfaceView surfacePreview = (SurfaceView)
+                                  findViewById(R.id.surfacePreviewCapture);     
+
+        Button buttonShowPreview = (Button) 
+                                  findViewById(R.id.buttonShowPreview);
+        
+        
+        previewHandler.videoPreviewActive = !previewHandler.videoPreviewActive;
+        
+        setupVideoPreview(surfacePreview, buttonShowPreview);
+        
+        previewHandler.updateVideoPreview(surfacePreview.getHolder());
+    }
 
     private void setupVideoSurface()
     {
-        SurfaceView surfaceView = (SurfaceView)
+        SurfaceView surfaceInVideo = (SurfaceView)
                                   findViewById(R.id.surfaceIncomingVideo);
-        surfaceView.setVisibility(View.VISIBLE);
-        updateVideoWindow(surfaceView.getHolder());
+        SurfaceView surfacePreview = (SurfaceView)
+                                  findViewById(R.id.surfacePreviewCapture);
+        Button buttonShowPreview = (Button)
+                                  findViewById(R.id.buttonShowPreview); 
+        surfaceInVideo.setVisibility(View.VISIBLE);
+        buttonShowPreview.setVisibility(View.VISIBLE);
+        surfacePreview.setVisibility(View.GONE);        
     }
 

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

@@ -50 +50 @@
 {
     public VideoWindow vidWin;
+    public VideoPreview vidPrev;
 
     MyCall(MyAccount acc, int call_id)
@@ -113 +114 @@
             {
                 vidWin = new VideoWindow(cmi.getVideoIncomingWindowId());
+                vidPrev = new VideoPreview(cmi.getVideoCapDev());
             }
         }