| Index: webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
|
| diff --git a/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java b/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
|
| index d96595e7dd37c5c52350c4fde668858076eba793..518ca6caaa4a11b8c15be2eb9ad12266a69cf161 100644
|
| --- a/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
|
| +++ b/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
|
| @@ -70,8 +70,8 @@ public class Camera1Enumerator implements CameraEnumerator {
|
| }
|
|
|
| @Override
|
| - public CameraVideoCapturer createCapturer(String deviceName,
|
| - CameraVideoCapturer.CameraEventsHandler eventsHandler) {
|
| + public CameraVideoCapturer createCapturer(
|
| + String deviceName, CameraVideoCapturer.CameraEventsHandler eventsHandler) {
|
| return new VideoCapturerAndroid(deviceName, eventsHandler, captureToTexture);
|
| }
|
|
|
| @@ -135,7 +135,7 @@ public class Camera1Enumerator implements CameraEnumerator {
|
|
|
| final long endTimeMs = SystemClock.elapsedRealtime();
|
| Logging.d(TAG, "Get supported formats for camera index " + cameraId + " done."
|
| - + " Time spent: " + (endTimeMs - startTimeMs) + " ms.");
|
| + + " Time spent: " + (endTimeMs - startTimeMs) + " ms.");
|
| return formatList;
|
| }
|
|
|
| @@ -181,7 +181,6 @@ public class Camera1Enumerator implements CameraEnumerator {
|
|
|
| String facing =
|
| (info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT) ? "front" : "back";
|
| - return "Camera " + index + ", Facing " + facing
|
| - + ", Orientation " + info.orientation;
|
| + return "Camera " + index + ", Facing " + facing + ", Orientation " + info.orientation;
|
| }
|
| }
|
|
|