From 95a309808e25b59575739e2adf28d5f4835ad989 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Sun, 19 Nov 2023 15:38:36 +0100 Subject: [PATCH] fix: Remove exposure TODOs (#2177) * fix: Remove exposure TODOs * fix: Make `exposure` a Double --- package/android/src/main/java/com/mrousavy/camera/CameraView.kt | 2 +- .../src/main/java/com/mrousavy/camera/CameraViewManager.kt | 2 +- .../main/java/com/mrousavy/camera/core/CameraConfiguration.kt | 2 +- .../main/java/com/mrousavy/camera/core/CameraDeviceDetails.kt | 1 - .../src/main/java/com/mrousavy/camera/core/CameraSession.kt | 1 + 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/android/src/main/java/com/mrousavy/camera/CameraView.kt b/package/android/src/main/java/com/mrousavy/camera/CameraView.kt index 123a8c6..0aa8932 100644 --- a/package/android/src/main/java/com/mrousavy/camera/CameraView.kt +++ b/package/android/src/main/java/com/mrousavy/camera/CameraView.kt @@ -78,7 +78,7 @@ class CameraView(context: Context) : var isActive = false var torch: Torch = Torch.OFF var zoom: Float = 1f // in "factor" - var exposure: Float = 1f // TODO: Implement exposure bias + var exposure: Double = 1.0 var orientation: Orientation = Orientation.PORTRAIT var enableZoomGesture: Boolean = false set(value) { diff --git a/package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt b/package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt index 222f464..e6e013b 100644 --- a/package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt +++ b/package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt @@ -145,7 +145,7 @@ class CameraViewManager : ViewGroupManager() { @ReactProp(name = "exposure") fun setExposure(view: CameraView, exposure: Double) { - view.exposure = exposure.toFloat() + view.exposure = exposure } @ReactProp(name = "orientation") diff --git a/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt b/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt index a0c2769..8b27508 100644 --- a/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt +++ b/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt @@ -33,7 +33,7 @@ data class CameraConfiguration( var enableLowLightBoost: Boolean = false, var torch: Torch = Torch.OFF, var videoStabilizationMode: VideoStabilizationMode = VideoStabilizationMode.OFF, - var exposure: Float? = null, + var exposure: Double? = null, // Zoom var zoom: Float = 1f, 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 89a8692..4f584af 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 @@ -177,7 +177,6 @@ class CameraDeviceDetails(private val cameraManager: CameraManager, private val map.putInt("videoWidth", videoSize.width) map.putInt("minISO", isoRange.lower) map.putInt("maxISO", isoRange.upper) - // TODO: Implement minExposureBias map.putDouble("minExposure", exposureRange.lower.toDouble() / exposureStep.toDouble()) map.putDouble("maxExposure", exposureRange.upper.toDouble() / exposureStep.toDouble()) map.putInt("minFps", fpsRange.lower) diff --git a/package/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt b/package/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt index 1e0c8b2..8ad60cc 100644 --- a/package/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt +++ b/package/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt @@ -435,6 +435,7 @@ class CameraSession(private val context: Context, private val cameraManager: Cam } // Set Exposure Bias + // TODO: Check if that exposure value is even supported val exposure = config.exposure?.toInt() if (exposure != null) { captureRequest.set(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION, exposure)