| Index: talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
|
| diff --git a/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java b/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
|
| index 136c232b7f98e92d962eb029870aacfe5ce08af2..11bdb6abb19dc3bff7fc700af377cc7d20d1a2ee 100644
|
| --- a/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
|
| +++ b/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
|
| @@ -160,33 +160,13 @@ public class CameraEnumerationAndroid {
|
| // Returns the name of the front facing camera. Returns null if the
|
| // camera can not be used or does not exist.
|
| public static String getNameOfFrontFacingDevice() {
|
| - for (int i = 0; i < Camera.getNumberOfCameras(); ++i) {
|
| - Camera.CameraInfo info = new Camera.CameraInfo();
|
| - try {
|
| - Camera.getCameraInfo(i, info);
|
| - if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT)
|
| - return getDeviceName(i);
|
| - } catch (Exception e) {
|
| - Log.e(TAG, "getCameraInfo failed on index " + i, e);
|
| - }
|
| - }
|
| - return null;
|
| + return getNameOfDevice(Camera.CameraInfo.CAMERA_FACING_FRONT);
|
| }
|
|
|
| // Returns the name of the back facing camera. Returns null if the
|
| // camera can not be used or does not exist.
|
| public static String getNameOfBackFacingDevice() {
|
| - for (int i = 0; i < Camera.getNumberOfCameras(); ++i) {
|
| - Camera.CameraInfo info = new Camera.CameraInfo();
|
| - try {
|
| - Camera.getCameraInfo(i, info);
|
| - if (info.facing == Camera.CameraInfo.CAMERA_FACING_BACK)
|
| - return getDeviceName(i);
|
| - } catch (Exception e) {
|
| - Log.e(TAG, "getCameraInfo failed on index " + i, e);
|
| - }
|
| - }
|
| - return null;
|
| + return getNameOfDevice(Camera.CameraInfo.CAMERA_FACING_BACK);
|
| }
|
|
|
| public static String getSupportedFormatsAsJson(int id) throws JSONException {
|
| @@ -239,4 +219,19 @@ public class CameraEnumerationAndroid {
|
| }
|
| });
|
| }
|
| +
|
| + private static String getNameOfDevice(int facing) {
|
| + final Camera.CameraInfo info = new Camera.CameraInfo();
|
| + for (int i = 0; i < Camera.getNumberOfCameras(); ++i) {
|
| + try {
|
| + Camera.getCameraInfo(i, info);
|
| + if (info.facing == facing) {
|
| + return getDeviceName(i);
|
| + }
|
| + } catch (Exception e) {
|
| + Log.e(TAG, "getCameraInfo() failed on index " + i, e);
|
| + }
|
| + }
|
| + return null;
|
| + }
|
| }
|
|
|