zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change Camera1Enumerator to create a Camera1Capturer instead of VideoCapturerAndroid.

Browse Source 
BUG=webrtc:6148

Review-Url: https://codereview.webrtc.org/2356073003
Cr-Commit-Position: refs/heads/master@{#14478}
This commit is contained in:
sakal
2016-10-03 08:05:58 -07:00
committed by Commit bot
parent 0aabdac743
commit 8f741e953c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
View File

@ -72,7 +72,7 @@ public class Camera1Enumerator implements CameraEnumerator {
@Override @Override
public CameraVideoCapturer createCapturer( public CameraVideoCapturer createCapturer(
String deviceName, CameraVideoCapturer.CameraEventsHandler eventsHandler) { 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) { private static android.hardware.Camera.CameraInfo getCameraInfo(int index) {

5
webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java
View File

@ -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 // 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 // camera thread. The internal *OnCameraThread() methods must check |camera| for null to check if
// the camera has been stopped. // 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") @SuppressWarnings("deprecation")
public class VideoCapturerAndroid public class VideoCapturerAndroid
implements CameraVideoCapturer, android.hardware.Camera.PreviewCallback, implements CameraVideoCapturer, android.hardware.Camera.PreviewCallback,