Update SrsCameraView.java

camera2
thegobot 6 years ago committed by GitHub
parent 6e00e91d67
commit 707985f7d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -347,7 +347,7 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
} }
} }
private Camera openCamera() { protected Camera openCamera() {
Camera camera; Camera camera;
if (mCamId < 0) { if (mCamId < 0) {
Camera.CameraInfo info = new Camera.CameraInfo(); Camera.CameraInfo info = new Camera.CameraInfo();
@ -374,6 +374,15 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
try { try {
camera = Camera.open(mCamId); camera = Camera.open(mCamId);
camera.setErrorCallback(new Camera.ErrorCallback(){
@Override
public void onError(int error, Camera camera) {
//may be Camera.CAMERA_ERROR_EVICTED - Camera was disconnected due to use by higher priority user
stopCamera();
}
});
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
} }
@ -431,9 +440,13 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
public void stopTorch() { public void stopTorch() {
if (mCamera != null) { if (mCamera != null) {
try {
Camera.Parameters params = mCamera.getParameters(); Camera.Parameters params = mCamera.getParameters();
params.setFlashMode(Camera.Parameters.FLASH_MODE_OFF); params.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
mCamera.setParameters(params); mCamera.setParameters(params);
}catch (Exception e){
e.printStackTrace();
}
} }
} }

Loading…
Cancel
Save