From 0d3ecd11313ec88cce94fba21dc731a782d543e5 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Thu, 21 Dec 2023 12:25:46 +0100 Subject: [PATCH] fix: Fix min/max exposure range on Android (#2304) --- .../java/com/mrousavy/camera/core/CameraDeviceDetails.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/android/src/main/java/com/mrousavy/camera/core/CameraDeviceDetails.kt b/package/android/src/main/java/com/mrousavy/camera/core/CameraDeviceDetails.kt index 1c26608..c5f5921 100644 --- a/package/android/src/main/java/com/mrousavy/camera/core/CameraDeviceDetails.kt +++ b/package/android/src/main/java/com/mrousavy/camera/core/CameraDeviceDetails.kt @@ -6,7 +6,6 @@ import android.hardware.camera2.CameraManager import android.hardware.camera2.CameraMetadata import android.os.Build import android.util.Range -import android.util.Rational import android.util.Size import com.facebook.react.bridge.Arguments import com.facebook.react.bridge.ReadableArray @@ -70,7 +69,6 @@ class CameraDeviceDetails(private val cameraManager: CameraManager, private val private val cameraConfig = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)!! private val isoRange = characteristics.get(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE) ?: Range(0, 0) private val exposureRange = characteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE) ?: Range(0, 0) - private val exposureStep = characteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP) ?: Rational(1, 1) private val digitalStabilizationModes = characteristics.get(CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES) ?: IntArray(0) private val opticalStabilizationModes = @@ -207,8 +205,8 @@ class CameraDeviceDetails(private val cameraManager: CameraManager, private val map.putDouble("minZoom", minZoom) map.putDouble("maxZoom", maxZoom) map.putDouble("neutralZoom", 1.0) // Zoom is always relative to 1.0 on Android - map.putDouble("minExposure", exposureRange.lower.toDouble() / exposureStep.toDouble()) - map.putDouble("maxExposure", exposureRange.upper.toDouble() / exposureStep.toDouble()) + map.putDouble("minExposure", exposureRange.lower.toDouble()) + map.putDouble("maxExposure", exposureRange.upper.toDouble()) map.putString("hardwareLevel", hardwareLevel.unionValue) map.putString("sensorOrientation", Orientation.fromRotationDegrees(sensorOrientation).unionValue) map.putArray("formats", getFormats())