69540f4419
This is a propagation of upstream chromium change needed to resume DEPS autorolls into WebRTC. Original comment from upstream change: > This change is made in preparation for an ErrorProne > check to catch this at compile time. See bug for details. Bug: chromium:771683 Change-Id: I56aed15f73a633dcadae7ece6c645cd3596f9257 Reviewed-on: https://webrtc-review.googlesource.com/c/113505 Reviewed-by: Oleh Prypin <oprypin@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Commit-Queue: Artem Titarenko <artit@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25951}
39 lines
1.5 KiB
Java
39 lines
1.5 KiB
Java
/*
|
|
* Copyright 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
package org.webrtc;
|
|
|
|
import android.annotation.TargetApi;
|
|
import android.content.Context;
|
|
import android.hardware.camera2.CameraManager;
|
|
import android.support.annotation.Nullable;
|
|
|
|
@TargetApi(21)
|
|
public class Camera2Capturer extends CameraCapturer {
|
|
private final Context context;
|
|
@Nullable private final CameraManager cameraManager;
|
|
|
|
public Camera2Capturer(Context context, String cameraName, CameraEventsHandler eventsHandler) {
|
|
super(cameraName, eventsHandler, new Camera2Enumerator(context));
|
|
|
|
this.context = context;
|
|
cameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
|
|
}
|
|
|
|
@Override
|
|
protected void createCameraSession(CameraSession.CreateSessionCallback createSessionCallback,
|
|
CameraSession.Events events, Context applicationContext,
|
|
SurfaceTextureHelper surfaceTextureHelper, String cameraName, int width, int height,
|
|
int framerate) {
|
|
Camera2Session.create(createSessionCallback, events, applicationContext, cameraManager,
|
|
surfaceTextureHelper, cameraName, width, height, framerate);
|
|
}
|
|
}
|