Changeset 4997

Timestamp:

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

Author:

ming

Message:

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

Location:

pjproject/trunk/pjsip-apps/src

Files:

• pjsua/android/.classpath (modified) (1 diff)
• swig/java/android/AndroidManifest.xml (modified) (1 diff)
• swig/java/android/res/layout/activity_call.xml (modified) (1 diff)
• swig/java/android/src/org/pjsip/pjsua2/app/CallActivity.java (modified) (6 diffs)
• swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java (modified) (4 diffs)
• swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java (modified) (3 diffs)
• swig/java/sample.java (modified) (1 diff)

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

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-        <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="src" path="gen"/>
+        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
         <classpathentry kind="output" path="bin/classes"/>
 </classpath>

pjproject/trunk/pjsip-apps/src/swig/java/android/AndroidManifest.xml

@@ -10 +10 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />

pjproject/trunk/pjsip-apps/src/swig/java/android/res/layout/activity_call.xml

@@ -39 +39 @@
         android:text="Reject" />
 
+    <SurfaceView
+        android:id="@+id/surfaceIncomingVideo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
 </LinearLayout>

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 {
                         

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

@@ -62 +62 @@
                 public final static int REG_STATE = 3;
                 public final static int BUDDY_STATE = 4;
+                public final static int CALL_MEDIA_STATE = 5;
         }
 
@@ -171 +172 @@
                         if (CallActivity.handler_ != null) {
                                 Message m2 = Message.obtain(CallActivity.handler_, MSG_TYPE.CALL_STATE, ci);
+                                m2.sendToTarget();
+                        }
+                        
+                } else if (m.what == MSG_TYPE.CALL_MEDIA_STATE) {
+                        
+                        /* Forward the message to CallActivity */
+                        if (CallActivity.handler_ != null) {
+                                Message m2 = Message.obtain(CallActivity.handler_, MSG_TYPE.CALL_MEDIA_STATE, null);
                                 m2.sendToTarget();
                         }
@@ -333 +342 @@
                 
                 MyCall call = new MyCall(account, -1);
-                CallOpParam prm = new CallOpParam();
-                CallSetting opt = prm.getOpt();
-                opt.setAudioCount(1);
-                opt.setVideoCount(0);
+                CallOpParam prm = new CallOpParam(true);
 
                 try {
@@ -503 +509 @@
         }
         
+        public void notifyCallMediaState(MyCall call) {
+                Message m = Message.obtain(handler, MSG_TYPE.CALL_MEDIA_STATE, null);
+                m.sendToTarget();
+        }
+        
         public void notifyBuddyState(MyBuddy buddy) {
                 Message m = Message.obtain(handler, MSG_TYPE.BUDDY_STATE, buddy);

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

@@ -29 +29 @@
         abstract void notifyIncomingCall(MyCall call);
         abstract void notifyCallState(MyCall call);
+        abstract void notifyCallMediaState(MyCall call);
         abstract void notifyBuddyState(MyBuddy buddy);
 }
@@ -42 +43 @@
 
 class MyCall extends Call {
+        public VideoWindow vidWin;
+        
         MyCall(MyAccount acc, int call_id) {
                 super(acc, call_id);
+                vidWin = null;
         }
 
@@ -87 +91 @@
                                         continue;
                                 }
-                        }
-                }
+                        } else if (cmi.getType() == pjmedia_type.PJMEDIA_TYPE_VIDEO &&
+                                       cmi.getStatus() == pjsua_call_media_status.PJSUA_CALL_MEDIA_ACTIVE &&
+                                       cmi.getVideoIncomingWindowId() != pjsua2.INVALID_ID)
+                        {
+                                vidWin = cmi.getVideoWindow();
+                        }
+                }
+                
+                MyApp.observer.notifyCallMediaState(this);
         }
 }

pjproject/trunk/pjsip-apps/src/swig/java/sample.java

@@ -45 +45 @@
         
         @Override
+        public void notifyCallMediaState(MyCall call) {
+        }
+
         public void notifyCallState(MyCall call) {
                 if (currentCall == null || call.getId() != currentCall.getId())