From 8f741e953c1d712cbf79a96bf2f9afb73542154f Mon Sep 17 00:00:00 2001 From: sakal Date: Mon, 3 Oct 2016 08:05:58 -0700 Subject: [PATCH] Change Camera1Enumerator to create a Camera1Capturer instead of VideoCapturerAndroid. BUG=webrtc:6148 Review-Url: https://codereview.webrtc.org/2356073003 Cr-Commit-Position: refs/heads/master@{#14478} --- .../api/android/java/src/org/webrtc/Camera1Enumerator.java | 2 +- .../android/java/src/org/webrtc/VideoCapturerAndroid.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java b/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java index 518ca6caaa..239318ab89 100644 --- a/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java +++ b/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java @@ -72,7 +72,7 @@ public class Camera1Enumerator implements CameraEnumerator { @Override public CameraVideoCapturer createCapturer( String deviceName, CameraVideoCapturer.CameraEventsHandler eventsHandler) { - return new VideoCapturerAndroid(deviceName, eventsHandler, captureToTexture); + return new Camera1Capturer(deviceName, eventsHandler, captureToTexture); } private static android.hardware.Camera.CameraInfo getCameraInfo(int index) { diff --git a/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java index a019ff6afb..939c86992f 100644 --- a/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java +++ b/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java @@ -38,7 +38,10 @@ import java.util.concurrent.atomic.AtomicBoolean; // arbitrary Java threads. All public entry points are thread safe, and delegate the work to the // camera thread. The internal *OnCameraThread() methods must check |camera| for null to check if // the camera has been stopped. -// TODO(magjed): This class name is now confusing - rename to Camera1VideoCapturer. +// +// This class is deprecated and will only be used if you manually create it. Please use +// Camera1Capturer instead. +@Deprecated @SuppressWarnings("deprecation") public class VideoCapturerAndroid implements CameraVideoCapturer, android.hardware.Camera.PreviewCallback,