railbird/react-native-vision-camera
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fix physical devices detection on Android (#2073)

Browse Source 
* fix: Fix physical devices detection on Android

* Update useCameraDevices.ts
This commit is contained in:
Marc Rousavy 2023-10-24 15:42:44 +02:00 committed by GitHub
parent e1f8e1bd2a
commit 8d65d1d53c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/android/src/main/java/com/mrousavy/camera/core/CameraDeviceDetails.kt
View File

@ -59,6 +59,11 @@ class CameraDeviceDetails(private val cameraManager: CameraManager, private val
null null
} }
) ?: Range(1f, characteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) ?: 1f) ) ?: Range(1f, characteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) ?: 1f)
private val physicalDevices = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && characteristics.physicalCameraIds.isNotEmpty()) {
characteristics.physicalCameraIds
} else {
setOf(cameraId)
}
private val minZoom = zoomRange.lower.toDouble() private val minZoom = zoomRange.lower.toDouble()
private val maxZoom = zoomRange.upper.toDouble() private val maxZoom = zoomRange.upper.toDouble()
@ -108,13 +113,14 @@ class CameraDeviceDetails(private val cameraManager: CameraManager, private val
} }
private fun getDeviceTypes(): List<DeviceType> { private fun getDeviceTypes(): List<DeviceType> {
val deviceTypes = focalLengths.map { focalLength -> val deviceTypes = physicalDevices.map { id ->
val fov = getFieldOfView(focalLength) val details = CameraDeviceDetails(cameraManager, id)
val fov = details.getMaxFieldOfView()
return@map when { return@map when {
fov > 94 -> DeviceType.ULTRA_WIDE_ANGLE fov > 94 -> DeviceType.ULTRA_WIDE_ANGLE
fov in 60f..94f -> DeviceType.WIDE_ANGLE fov in 60f..94f -> DeviceType.WIDE_ANGLE
fov < 60f -> DeviceType.TELEPHOTO fov < 60f -> DeviceType.TELEPHOTO
else -> throw Error("Invalid focal length! (${focalLength}mm)") else -> throw Error("Invalid Field Of View! ($fov)")
} }
} }
return deviceTypes return deviceTypes