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

Fix retry opening camera if there is an exception during getParameters in Camera1Session

Browse Source 
Bug: webrtc:8258
Change-Id: I27190bc57d9e80df3a40aac9e7114554289c2563
Reviewed-on: https://webrtc-review.googlesource.com/47820
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23210}
This commit is contained in:
Gustavo Garcia
2018-05-09 11:23:18 +02:00
committed by Commit Bot
parent 5f2bb62f71
commit df3630d65d
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sdk/android/src/java/org/webrtc/Camera1Session.java
View File

@ -86,12 +86,17 @@ class Camera1Session implements CameraSession {
final android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo(); final android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
android.hardware.Camera.getCameraInfo(cameraId, info); android.hardware.Camera.getCameraInfo(cameraId, info);
final android.hardware.Camera.Parameters parameters = camera.getParameters(); final CaptureFormat captureFormat;
final CaptureFormat captureFormat = try {
findClosestCaptureFormat(parameters, width, height, framerate); final android.hardware.Camera.Parameters parameters = camera.getParameters();
final Size pictureSize = findClosestPictureSize(parameters, width, height); captureFormat = findClosestCaptureFormat(parameters, width, height, framerate);
final Size pictureSize = findClosestPictureSize(parameters, width, height);
updateCameraParameters(camera, parameters, captureFormat, pictureSize, captureToTexture); updateCameraParameters(camera, parameters, captureFormat, pictureSize, captureToTexture);
} catch (RuntimeException e) {
camera.release();
callback.onFailure(FailureType.ERROR, e.getMessage());
return;
}
if (!captureToTexture) { if (!captureToTexture) {
final int frameSize = captureFormat.frameSize(); final int frameSize = captureFormat.frameSize();