Chromium Code Reviews| Index: media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java |
| diff --git a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java |
| index 5919ed1da303d5e3b7eacadf8b2b87f452515b56..1d5277c89545027361a0cafcb7ea8831923d29ae 100644 |
| --- a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java |
| +++ b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java |
| @@ -268,7 +268,10 @@ public class VideoCaptureCamera2 extends VideoCapture { |
| @Override |
| public void onCaptureCompleted(CameraCaptureSession session, |
| CaptureRequest request, TotalCaptureResult result) { |
| - mLastExposureTimeNs = result.get(CaptureResult.SENSOR_EXPOSURE_TIME); |
| + if (result.get(CaptureResult.SENSOR_EXPOSURE_TIME) != null) { |
| + mLastExposureTimeNs = |
| + result.get(CaptureResult.SENSOR_EXPOSURE_TIME); |
| + } |
| } |
| }, handler); |
| @@ -762,7 +765,9 @@ public class VideoCaptureCamera2 extends VideoCapture { |
| maxIso = iso_range.getUpper(); |
| } |
| builder.setMinIso(minIso).setMaxIso(maxIso).setStepIso(1); |
| - builder.setCurrentIso(mPreviewRequestBuilder.get(CaptureRequest.SENSOR_SENSITIVITY)); |
| + if (mPreviewRequestBuilder.get(CaptureRequest.SENSOR_SENSITIVITY) != null) { |
|
mcasas
2017/06/10 14:47:26
micro-nit: perhaps mention here in a comment the b
|
| + builder.setCurrentIso(mPreviewRequestBuilder.get(CaptureRequest.SENSOR_SENSITIVITY)); |
| + } |
| final StreamConfigurationMap streamMap = |
| cameraCharacteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); |