Camera2 in AppRTC Android Demo.

webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 11 matching lines @@
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager.LayoutParams;
 import android.widget.Toast;
 
 import org.appspot.apprtc.AppRTCClient.RoomConnectionParameters;
 import org.appspot.apprtc.AppRTCClient.SignalingParameters;
 import org.appspot.apprtc.PeerConnectionClient.PeerConnectionParameters;
 import org.appspot.apprtc.util.LooperExecutor;
+import org.webrtc.Camera2Enumerator;
 import org.webrtc.EglBase;
 import org.webrtc.IceCandidate;
 import org.webrtc.PeerConnectionFactory;
 import org.webrtc.RendererCommon.ScalingType;
 import org.webrtc.SessionDescription;
 import org.webrtc.StatsReport;
 import org.webrtc.SurfaceViewRenderer;
 
 /**
  * Activity for peer connection call setup, call waiting
  * and call view.
  */
 public class CallActivity extends Activity
     implements AppRTCClient.SignalingEvents,
       PeerConnectionClient.PeerConnectionEvents,
       CallFragment.OnCallEvents {
 
   public static final String EXTRA_ROOMID =
       "org.appspot.apprtc.ROOMID";
   public static final String EXTRA_LOOPBACK =
       "org.appspot.apprtc.LOOPBACK";
   public static final String EXTRA_VIDEO_CALL =
       "org.appspot.apprtc.VIDEO_CALL";
+  public static final String EXTRA_CAMERA2 =
+      "org.appspot.apprtc.CAMERA2";
   public static final String EXTRA_VIDEO_WIDTH =
       "org.appspot.apprtc.VIDEO_WIDTH";
   public static final String EXTRA_VIDEO_HEIGHT =
       "org.appspot.apprtc.VIDEO_HEIGHT";
   public static final String EXTRA_VIDEO_FPS =
       "org.appspot.apprtc.VIDEO_FPS";
   public static final String EXTRA_VIDEO_CAPTUREQUALITYSLIDER_ENABLED =
       "org.appsopt.apprtc.VIDEO_CAPTUREQUALITYSLIDER";
   public static final String EXTRA_VIDEO_BITRATE =
       "org.appspot.apprtc.VIDEO_BITRATE";
@@ skipping 147 matching lines @@
       return;
     }
     String roomId = intent.getStringExtra(EXTRA_ROOMID);
     if (roomId == null || roomId.length() == 0) {
       logAndToast(getString(R.string.missing_url));
       Log.e(TAG, "Incorrect room ID in intent!");
       setResult(RESULT_CANCELED);
       finish();
       return;
     }
+    String camera2Option = intent.getStringExtra(EXTRA_CAMERA2);
+    boolean camera2Enabled = camera2Option.equals("true") || camera2Option.equals("force");
+    boolean camera1Enabled = !Camera2Enumerator.isSupported() || !camera2Option.equals("force");

[magjed_webrtc, 2016/06/29 13:36:45]

Shouldn't this be just:
boolean camera1Enabled = !camera2Option.equals("force");
?

Otherwise it looks like we just need one boolean. The purpose with "force" is
that we shouldn't fall back to camera1, right?

[sakal, 2016/06/30 09:14:52]

The option in the settings is disabled if Camera2Enumerator.isSupported returns
false. Since changing the option is impossible when it's disabled, we should
ignore it's value. Maybe this logic would be better conveyed by something like:

if (!Camera2Enumerator.isSupported()) {
  camera2Option = "default";
}

What do you think?

[magjed_webrtc, 2016/06/30 11:21:47]

I think it's an overkill for this demo app to have fallback logic to camera1 if
camera2 fails. We would like to detect camera2 failures anyway so it's better if
they are obvious. So I think it's more straightforward to just:
* Have a true/false "use camera2" checkbox in settings.
* Disable the camera2 option in settings if camera2 is not supported.
* Only have one boolean here "useCamera2 = Camera2Enumerator.isSupported() &&
intent.getBooleanExtra(EXTRA_CAMERA2, true);"
 * Remove the fallback logic and crash instead.

+
     boolean loopback = intent.getBooleanExtra(EXTRA_LOOPBACK, false);
     boolean tracing = intent.getBooleanExtra(EXTRA_TRACING, false);
     peerConnectionParameters = new PeerConnectionParameters(
         intent.getBooleanExtra(EXTRA_VIDEO_CALL, true),
         loopback,
         tracing,
+        camera2Enabled,
+        camera1Enabled,
         intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0),
         intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0),
         intent.getIntExtra(EXTRA_VIDEO_FPS, 0),
         intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0),
         intent.getStringExtra(EXTRA_VIDEOCODEC),
         intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true),
         intent.getBooleanExtra(EXTRA_CAPTURETOTEXTURE_ENABLED, false),
         intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0),
         intent.getStringExtra(EXTRA_AUDIOCODEC),
         intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false),
@@ skipping 469 matching lines @@
         }
       }
     });
   }
 
   @Override
   public void onPeerConnectionError(final String description) {
     reportError(description);
   }
 }