| Index: webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
|
| diff --git a/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java b/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
|
| index b055f8bb837b5c7af945ab3207fcccd484650da5..78d1f04a4365bc619604143d33959f01cc7e9dde 100644
|
| --- a/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
|
| +++ b/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
|
| @@ -10,14 +10,9 @@
|
|
|
| package org.webrtc;
|
|
|
| -import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
|
| -
|
| import android.annotation.TargetApi;
|
| import android.content.Context;
|
| import android.hardware.camera2.CameraManager;
|
| -import android.os.Handler;
|
| -
|
| -import java.util.List;
|
|
|
| @TargetApi(21)
|
| public class Camera2Capturer extends CameraCapturer {
|
| @@ -33,17 +28,13 @@ public class Camera2Capturer extends CameraCapturer {
|
|
|
| @Override
|
| protected void createCameraSession(
|
| - CameraSession.CreateSessionCallback createSessionCallback,
|
| - CameraEventsHandler eventsHandler, Context applicationContext,
|
| - CameraVideoCapturer.CapturerObserver capturerObserver,
|
| - SurfaceTextureHelper surfaceTextureHelper,
|
| + CameraSession.CreateSessionCallback createSessionCallback, CameraSession.Events events,
|
| + Context applicationContext, SurfaceTextureHelper surfaceTextureHelper,
|
| String cameraName, int width, int height, int framerate) {
|
| Camera2Session.create(
|
| - cameraManager,
|
| - createSessionCallback,
|
| - eventsHandler, applicationContext,
|
| - capturerObserver,
|
| - surfaceTextureHelper,
|
| - cameraName, width, height, framerate);
|
| + createSessionCallback, events,
|
| + applicationContext, cameraManager,
|
| + surfaceTextureHelper,
|
| + cameraName, width, height, framerate);
|
| }
|
| }
|
|
|