added onPause and onResume behavior

pchab · pchab · commit f91e3ef05be9 · 2015-03-27T17:47:33.000+01:00
diff --git a/src/fr/pchab/AndroidRTC/RTCActivity.java b/src/fr/pchab/AndroidRTC/RTCActivity.java
@@ -38,6 +38,7 @@ public class RTCActivity extends Activity implements WebRtcClient.RTCListener {
   private static final int REMOTE_WIDTH = 100;
   private static final int REMOTE_HEIGHT = 100;
   private VideoRendererGui.ScalingType scalingType = VideoRendererGui.ScalingType.SCALE_ASPECT_FILL;
+  private GLSurfaceView vsv;
   private VideoRenderer.Callbacks localRender;
   private VideoRenderer.Callbacks remoteRender;
   private WebRtcClient client;
@@ -52,7 +53,9 @@ public void onCreate(Bundle savedInstanceState) {
     mSocketAddress = "http://" + getResources().getString(R.string.host);
     mSocketAddress += (":" + getResources().getString(R.string.port) + "/");
 
-    GLSurfaceView vsv = (GLSurfaceView) findViewById(R.id.glview_call);
+    vsv = (GLSurfaceView) findViewById(R.id.glview_call);
+    vsv.setPreserveEGLContextOnPause(true);
+    vsv.setKeepScreenOn(true);
     VideoRendererGui.setView(vsv, new Runnable() {
       @Override
       public void run() {
@@ -95,16 +98,23 @@ public void onConfigurationChanged(Configuration newConfig) {
   @Override
   public void onPause() {
     super.onPause();
+    vsv.onPause();
+    if(client != null) {
+      client.stopVideoSource();
+    }
   }
 
   @Override
   public void onResume() {
     super.onResume();
+    vsv.onResume();
+    if(client != null) {
+      client.restartVideoSource();
+    }
   }
 
   @Override
   public void onCallReady(String callId) {
-    Log.d("POUET", callId);
     if (callerId != null) {
       try {
         answer(callerId);
diff --git a/src/fr/pchab/AndroidRTC/WebRtcClient.java b/src/fr/pchab/AndroidRTC/WebRtcClient.java
@@ -21,6 +21,7 @@ class WebRtcClient {
   private LinkedList<PeerConnection.IceServer> iceServers = new LinkedList<>();
   private MediaConstraints pcConstraints = new MediaConstraints();
   private MediaStream localMS;
+  private VideoSource videoSource;
   private RTCListener mListener;
   private Socket client;
   private final static String TAG = WebRtcClient.class.getCanonicalName();
@@ -111,7 +112,6 @@ private MessageHandler() {
     public Emitter.Listener onMessage = new Emitter.Listener() {
       @Override
       public void call(Object... args) {
-        Log.d("POUET", "receive message "+args[0].toString());
         JSONObject data = (JSONObject) args[0];
         try {
           String from = data.getString("from");
@@ -262,7 +262,7 @@ public void setCamera(String height, String width){
     videoConstraints.mandatory.add(new MediaConstraints.KeyValuePair("maxHeight", height));
     videoConstraints.mandatory.add(new MediaConstraints.KeyValuePair("maxWidth", width));
 
-    VideoSource videoSource = factory.createVideoSource(getVideoCapturer(), videoConstraints);
+    videoSource = factory.createVideoSource(getVideoCapturer(), videoConstraints);
     AudioSource audioSource = factory.createAudioSource(new MediaConstraints());
     localMS = factory.createLocalMediaStream("ARDAMS");
     localMS.addTrack(factory.createVideoTrack("ARDAMSv0", videoSource));
@@ -271,6 +271,18 @@ public void setCamera(String height, String width){
     mListener.onLocalStream(localMS);
   }
 
+  public void stopVideoSource() {
+    if(videoSource != null) {
+      videoSource.stop();
+    }
+  }
+
+  public void restartVideoSource() {
+    if(videoSource != null) {
+      videoSource.restart();
+    }
+  }
+
   private int findEndPoint() {
     for(int i = 0; i < MAX_PEER; i++) {
       if(!endPoints[i]) return i;
