Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1515,6 +1515,8 @@ private fun Preview.Builder.updateCameraStateWithCaptureResults(
): Preview.Builder {
val isFirstFrameTimestampUpdated = atomic(false)
val targetCameraLogicalId = Camera2CameraInfo.from(targetCameraInfo).cameraId
// Read once per bound camera, since reading zoomState can be expensive for camera extensions.
var zoomRange: ClosedFloatingPointRange<Float>? = null
Camera2Interop.Extender(this).setSessionCaptureCallback(
object : CameraCaptureSession.CaptureCallback() {
override fun onCaptureCompleted(
Expand Down Expand Up @@ -1558,10 +1560,11 @@ private fun Preview.Builder.updateCameraStateWithCaptureResults(
val targetZoomRatio =
transientSettings.value?.zoomRatios?.get(targetCameraInfo.appLensFacing)
?: 1.0f
val zoomState = targetCameraInfo.zoomState.value
val minZoom = zoomState?.minZoomRatio ?: 1.0f
val maxZoom = zoomState?.maxZoomRatio ?: 1.0f
val clampedTarget = targetZoomRatio.coerceIn(minZoom, maxZoom)
val range = zoomRange
?: targetCameraInfo.zoomState.value
?.let { it.minZoomRatio..it.maxZoomRatio }
?.also { zoomRange = it }
val clampedTarget = range?.let { targetZoomRatio.coerceIn(it) } ?: 1.0f
val isTargetEssentiallyOne = abs(clampedTarget - 1.0f) < 0.01f
currentCameraState.update { old ->
val currentZoomRatio = old.zoomRatios[targetCameraInfo.appLensFacing]
Expand Down
Loading