37adc5e81e
Reason for revert: Revert "Revert of Support adding and removing MediaRecorder to camera 2 session. (patchset #5 id:80001 of https://codereview.webrtc.org/2833773003/ )" Will fix external bots by cherry picking this CL and updating external functions which depend on CameraVideoCapturer interface Original issue's description: > Revert of Support adding and removing MediaRecorder to camera 2 session. (patchset #5 id:80001 of https://codereview.webrtc.org/2833773003/ ) > > Reason for revert: > Breaks external bot > > Original issue's description: > > Support adding and removing MediaRecorder to camera 2 session. > > > > Camera 1 API is not supported. > > > > BUG=b/36684011 > > > > Review-Url: https://codereview.webrtc.org/2833773003 > > Cr-Commit-Position: refs/heads/master@{#17901} > > Committed:2fc04769fa> > TBR=sakal@webrtc.org,glaznev@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=b/36684011 > > Review-Url: https://codereview.webrtc.org/2844233002 > Cr-Commit-Position: refs/heads/master@{#17905} > Committed:6702739862TBR=sakal@webrtc.org,magjed@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=b/36684011 Review-Url: https://codereview.webrtc.org/2844393002 Cr-Commit-Position: refs/heads/master@{#17915}
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.media.MediaRecorder;
|
|
|
|
@TargetApi(21)
|
|
public class Camera2Capturer extends CameraCapturer {
|
|
private final Context context;
|
|
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, MediaRecorder mediaRecoder, String cameraName,
|
|
int width, int height, int framerate) {
|
|
Camera2Session.create(createSessionCallback, events, applicationContext, cameraManager,
|
|
surfaceTextureHelper, mediaRecoder, cameraName, width, height, framerate);
|
|
}
|
|
}
|