| 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..6bd40b1b6cf59d71f1c4d64e8f6aa54ca552c542 100644
|
| --- a/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
|
| +++ b/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
|
| @@ -31,13 +31,14 @@ import static java.lang.Math.abs;
|
| import static java.lang.Math.ceil;
|
|
|
| import android.hardware.Camera;
|
| -import android.util.Log;
|
| import android.graphics.ImageFormat;
|
|
|
| import org.json.JSONArray;
|
| import org.json.JSONException;
|
| import org.json.JSONObject;
|
|
|
| +import org.webrtc.Logging;
|
| +
|
| import java.util.ArrayList;
|
| import java.util.Collections;
|
| import java.util.Comparator;
|
| @@ -147,7 +148,7 @@ public class CameraEnumerationAndroid {
|
| try {
|
| Camera.getCameraInfo(index, info);
|
| } catch (Exception e) {
|
| - Log.e(TAG, "getCameraInfo failed on index " + index,e);
|
| + Logging.e(TAG, "getCameraInfo failed on index " + index,e);
|
| return null;
|
| }
|
|
|
| @@ -167,7 +168,7 @@ public class CameraEnumerationAndroid {
|
| if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT)
|
| return getDeviceName(i);
|
| } catch (Exception e) {
|
| - Log.e(TAG, "getCameraInfo failed on index " + i, e);
|
| + Logging.e(TAG, "getCameraInfo failed on index " + i, e);
|
| }
|
| }
|
| return null;
|
| @@ -183,7 +184,7 @@ public class CameraEnumerationAndroid {
|
| if (info.facing == Camera.CameraInfo.CAMERA_FACING_BACK)
|
| return getDeviceName(i);
|
| } catch (Exception e) {
|
| - Log.e(TAG, "getCameraInfo failed on index " + i, e);
|
| + Logging.e(TAG, "getCameraInfo failed on index " + i, e);
|
| }
|
| }
|
| return null;
|
| @@ -199,7 +200,7 @@ public class CameraEnumerationAndroid {
|
| json_format.put("framerate", (format.maxFramerate + 999) / 1000);
|
| json_formats.put(json_format);
|
| }
|
| - Log.d(TAG, "Supported formats for camera " + id + ": "
|
| + Logging.d(TAG, "Supported formats for camera " + id + ": "
|
| + json_formats.toString(2));
|
| return json_formats.toString();
|
| }
|
| @@ -218,7 +219,7 @@ public class CameraEnumerationAndroid {
|
| public static int[] getFramerateRange(Camera.Parameters parameters, final int framerate) {
|
| List<int[]> listFpsRange = parameters.getSupportedPreviewFpsRange();
|
| if (listFpsRange.isEmpty()) {
|
| - Log.w(TAG, "No supported preview fps range");
|
| + Logging.w(TAG, "No supported preview fps range");
|
| return new int[]{0, 0};
|
| }
|
| return Collections.min(listFpsRange,
|
|
|