@capgo/camera-preview 8.2.2 → 8.3.0

package/android/src/main/java/app/capgo/capacitor/camera/preview/CameraXView.java

@@ -96,11 +96,14 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
 import org.json.JSONObject;
 
 public class CameraXView implements LifecycleOwner, LifecycleObserver {
@@ -138,6 +141,8 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     private long focusIndicatorAnimationId = 0; // Incrementing token to invalidate previous animations
     private CameraSelector currentCameraSelector;
     private String currentDeviceId;
+    private String currentPhysicalDeviceId;
+    private String currentLogicalDeviceId;
     private int currentFlashMode = ImageCapture.FLASH_MODE_OFF;
     private CameraSessionConfiguration sessionConfig;
     private CameraXViewListener listener;
@@ -150,6 +155,10 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     private final LifecycleRegistry lifecycleRegistry;
     private final Executor mainExecutor;
     private ExecutorService cameraExecutor;
+    private static volatile Map<String, app.capgo.capacitor.camera.preview.model.CameraDevice> enumeratedDeviceCache =
+        new ConcurrentHashMap<>();
+    private static final Object enumeratedDeviceCacheLock = new Object();
+    private static volatile boolean enumeratedDeviceCacheRefreshInProgress = false;
     private boolean isRunning = false;
     private Size currentPreviewResolution = null;
     private ListenableFuture<FocusMeteringResult> currentFocusFuture = null; // Track current focus operation
@@ -213,6 +222,56 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
         }
     };
 
+    private static final class PhysicalCameraBindingTarget {
+
+        private final CameraInfo logicalCameraInfo;
+        private final String logicalCameraId;
+        private final int requiredFacing;
+
+        private PhysicalCameraBindingTarget(CameraInfo logicalCameraInfo, String logicalCameraId, int requiredFacing) {
+            this.logicalCameraInfo = logicalCameraInfo;
+            this.logicalCameraId = logicalCameraId;
+            this.requiredFacing = requiredFacing;
+        }
+    }
+
+    private static final class PhysicalDeviceMetadata {
+
+        private final String position;
+        private final float fallbackZoom;
+
+        private PhysicalDeviceMetadata(String position, float fallbackZoom) {
+            this.position = position;
+            this.fallbackZoom = fallbackZoom;
+        }
+    }
+
+    private static final class CameraBindingPlan {
+
+        private final CameraSelector selector;
+        private final String reportedDeviceId;
+        private final String logicalCameraId;
+        private final String physicalCameraId;
+        private final float fallbackZoom;
+        private final boolean usesPhysicalSelection;
+
+        private CameraBindingPlan(
+            CameraSelector selector,
+            String reportedDeviceId,
+            String logicalCameraId,
+            String physicalCameraId,
+            float fallbackZoom,
+            boolean usesPhysicalSelection
+        ) {
+            this.selector = selector;
+            this.reportedDeviceId = reportedDeviceId;
+            this.logicalCameraId = logicalCameraId;
+            this.physicalCameraId = physicalCameraId;
+            this.fallbackZoom = fallbackZoom;
+            this.usesPhysicalSelection = usesPhysicalSelection;
+        }
+    }
+
     private boolean IsOperationRunning(String name) {
         synchronized (operationLock) {
             if (stopPending) {
@@ -453,6 +512,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
 
             this.sessionConfig = config;
             cameraExecutor = Executors.newSingleThreadExecutor();
+            requestEnumeratedDeviceCacheRefresh();
 
             // Reset cached orientation so we don't reuse stale values across sessions
             synchronized (accelerometerLock) {
@@ -523,6 +583,9 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
 
     private void performImmediateStop() {
         isRunning = false;
+        currentDeviceId = null;
+        currentPhysicalDeviceId = null;
+        currentLogicalDeviceId = null;
         // Stop accelerometer and rotation vector sensor
         if (sensorManager != null && accelerometer != null) {
             sensorManager.unregisterListener(accelerometerListener);
@@ -744,6 +807,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
         int width = sessionConfig.getWidth();
         int height = sessionConfig.getHeight();
         String aspectRatio = sessionConfig.getAspectRatio();
+        String aspectMode = sessionConfig.getAspectMode();
 
         // Get comprehensive display information
         int screenWidthPx, screenHeightPx;
@@ -813,7 +877,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
         );
 
         // Apply aspect ratio if specified
-        if (aspectRatio != null && !aspectRatio.isEmpty() && sessionConfig.isCentered()) {
+        if (aspectRatio != null && !aspectRatio.isEmpty() && sessionConfig.isCentered() && !"cover".equals(aspectMode)) {
             String[] ratios = aspectRatio.split(":");
             if (ratios.length == 2) {
                 try {
@@ -928,7 +992,8 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                         " and position: " +
                         sessionConfig.getPosition()
                 );
-                currentCameraSelector = buildCameraSelector();
+                CameraBindingPlan bindingPlan = buildCameraBindingPlan(sessionConfig);
+                currentCameraSelector = bindingPlan.selector;
 
                 ResolutionSelector.Builder resolutionSelectorBuilder = new ResolutionSelector.Builder().setResolutionStrategy(
                     ResolutionStrategy.HIGHEST_AVAILABLE_STRATEGY
@@ -1006,17 +1071,24 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                 // is connected and video frames are captured correctly
                 preview.setSurfaceProvider(previewView.getSurfaceProvider());
 
-                // Bind with or without video capture based on enableVideoMode
-                if (sessionConfig.isVideoModeEnabled() && videoCapture != null) {
-                    camera = cameraProvider.bindToLifecycle(this, currentCameraSelector, preview, imageCapture, videoCapture);
-                    CameraInfo cameraInfo = camera.getCameraInfo();
-                    currentDeviceId = Camera2CameraInfo.from(cameraInfo).getCameraId();
-                    Log.d(TAG, "bindCameraUseCases: Camera successfully bound to device ID: " + currentDeviceId);
-                } else {
-                    camera = cameraProvider.bindToLifecycle(this, currentCameraSelector, preview, imageCapture);
-                    CameraInfo cameraInfo = camera.getCameraInfo();
-                    currentDeviceId = Camera2CameraInfo.from(cameraInfo).getCameraId();
-                    Log.d(TAG, "bindCameraUseCases: Camera successfully bound to device ID: " + currentDeviceId);
+                try {
+                    bindConfiguredUseCases(bindingPlan, preview);
+                } catch (Exception initialBindError) {
+                    if (!bindingPlan.usesPhysicalSelection) {
+                        throw initialBindError;
+                    }
+
+                    Log.w(
+                        TAG,
+                        "bindCameraUseCases: Physical camera binding failed for " +
+                            bindingPlan.physicalCameraId +
+                            ", falling back to logical camera behavior",
+                        initialBindError
+                    );
+
+                    bindingPlan = buildLogicalFallbackPlan(sessionConfig, bindingPlan);
+                    currentCameraSelector = bindingPlan.selector;
+                    bindConfiguredUseCases(bindingPlan, preview);
                 }
 
                 resetExposureCompensationToDefault();
@@ -1024,7 +1096,10 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                 // Log details about the active camera
                 Log.d(TAG, "Use cases bound. Inspecting active camera and use cases.");
                 CameraInfo cameraInfo = camera.getCameraInfo();
-                Log.d(TAG, "Bound Camera ID: " + Camera2CameraInfo.from(cameraInfo).getCameraId());
+                Log.d(TAG, "Bound Camera ID: " + currentLogicalDeviceId);
+                if (currentPhysicalDeviceId != null) {
+                    Log.d(TAG, "Bound Physical Camera ID: " + currentPhysicalDeviceId);
+                }
 
                 // Log zoom state
                 ZoomState zoomState = cameraInfo.getZoomState().getValue();
@@ -1100,7 +1175,11 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                 previewView.setScaleType("cover".equals(aspectMode) ? PreviewView.ScaleType.FILL_CENTER : PreviewView.ScaleType.FIT_CENTER);
 
                 // Set initial zoom if specified, prioritizing targetZoom over default zoomFactor
-                float initialZoom = sessionConfig.getTargetZoom() != 1.0f ? sessionConfig.getTargetZoom() : sessionConfig.getZoomFactor();
+                float initialZoom = !bindingPlan.usesPhysicalSelection &&
+                    bindingPlan.fallbackZoom != 1.0f &&
+                    sessionConfig.getTargetZoom() == 1.0f
+                    ? bindingPlan.fallbackZoom
+                    : (sessionConfig.getTargetZoom() != 1.0f ? sessionConfig.getTargetZoom() : sessionConfig.getZoomFactor());
                 if (initialZoom != 1.0f) {
                     Log.d(TAG, "Applying initial zoom of " + initialZoom);
 
@@ -1170,24 +1249,320 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
 
     @OptIn(markerClass = ExperimentalCamera2Interop.class)
     private CameraSelector buildCameraSelector() {
-        CameraSelector.Builder builder = new CameraSelector.Builder();
-        final String deviceId = sessionConfig.getDeviceId();
+        return buildCameraBindingPlan(sessionConfig).selector;
+    }
+
+    @OptIn(markerClass = ExperimentalCamera2Interop.class)
+    private CameraBindingPlan buildCameraBindingPlan(CameraSessionConfiguration config) {
+        final String deviceId = config.getDeviceId();
+        final String position = config.getPosition();
 
         if (deviceId != null && !deviceId.isEmpty()) {
-            builder.addCameraFilter((cameraInfos) -> {
-                for (CameraInfo cameraInfo : cameraInfos) {
-                    if (deviceId.equals(Camera2CameraInfo.from(cameraInfo).getCameraId())) {
-                        return Collections.singletonList(cameraInfo);
+            CameraInfo directCameraInfo = findAvailableCameraInfoById(deviceId);
+            if (directCameraInfo != null) {
+                CameraSelector.Builder directBuilder = new CameraSelector.Builder();
+                directBuilder.addCameraFilter((cameraInfos) -> {
+                    for (CameraInfo cameraInfo : cameraInfos) {
+                        if (deviceId.equals(Camera2CameraInfo.from(cameraInfo).getCameraId())) {
+                            return Collections.singletonList(cameraInfo);
+                        }
                     }
+                    return Collections.emptyList();
+                });
+
+                return new CameraBindingPlan(directBuilder.build(), deviceId, deviceId, null, 1.0f, false);
+            }
+
+            CameraBindingPlan logicalFallbackPlan = buildLogicalFallbackPlanForDeviceId(deviceId);
+            if (config.isPhysicalDeviceSelectionEnabled()) {
+                PhysicalCameraBindingTarget physicalTarget = findPhysicalCameraBindingTarget(deviceId);
+                if (physicalTarget != null) {
+                    CameraSelector.Builder physicalBuilder = new CameraSelector.Builder()
+                        .requireLensFacing(physicalTarget.requiredFacing)
+                        .setPhysicalCameraId(deviceId)
+                        .addCameraFilter((cameraInfos) -> {
+                            for (CameraInfo cameraInfo : cameraInfos) {
+                                if (physicalTarget.logicalCameraId.equals(Camera2CameraInfo.from(cameraInfo).getCameraId())) {
+                                    return Collections.singletonList(cameraInfo);
+                                }
+                            }
+                            return Collections.emptyList();
+                        });
+
+                    return new CameraBindingPlan(
+                        physicalBuilder.build(),
+                        deviceId,
+                        physicalTarget.logicalCameraId,
+                        deviceId,
+                        logicalFallbackPlan != null ? logicalFallbackPlan.fallbackZoom : getFallbackZoomForDeviceId(deviceId),
+                        true
+                    );
                 }
-                return Collections.emptyList();
-            });
+            }
+
+            if (logicalFallbackPlan != null) {
+                return logicalFallbackPlan;
+            }
+
+            throw invalidDeviceId(deviceId);
+        }
+
+        return buildPositionPlan(position);
+    }
+
+    private CameraBindingPlan buildLogicalFallbackPlan(CameraSessionConfiguration config, CameraBindingPlan failedPhysicalPlan) {
+        String fallbackPosition = config.getPosition();
+
+        if (failedPhysicalPlan.logicalCameraId != null) {
+            CameraInfo logicalCameraInfo = findAvailableCameraInfoById(failedPhysicalPlan.logicalCameraId);
+            if (logicalCameraInfo != null) {
+                fallbackPosition = isBackCamera(logicalCameraInfo) ? "rear" : "front";
+            }
+        }
+
+        CameraBindingPlan positionPlan = buildPositionPlan(fallbackPosition);
+        return new CameraBindingPlan(
+            positionPlan.selector,
+            failedPhysicalPlan.reportedDeviceId,
+            positionPlan.logicalCameraId,
+            null,
+            failedPhysicalPlan.fallbackZoom,
+            false
+        );
+    }
+
+    private CameraBindingPlan buildLogicalFallbackPlanForDeviceId(String deviceId) {
+        String fallbackPosition = resolveFallbackPositionForDeviceId(deviceId);
+        if (fallbackPosition == null) {
+            return null;
+        }
+
+        CameraBindingPlan positionPlan = buildPositionPlan(fallbackPosition);
+        return new CameraBindingPlan(
+            positionPlan.selector,
+            deviceId,
+            positionPlan.logicalCameraId,
+            null,
+            getFallbackZoomForDeviceId(deviceId),
+            false
+        );
+    }
+
+    private CameraBindingPlan buildPositionPlan(String position) {
+        int requiredFacing = "front".equals(position) ? CameraSelector.LENS_FACING_FRONT : CameraSelector.LENS_FACING_BACK;
+        CameraSelector selector = new CameraSelector.Builder().requireLensFacing(requiredFacing).build();
+        return new CameraBindingPlan(selector, null, null, null, 1.0f, false);
+    }
+
+    private IllegalArgumentException invalidDeviceId(String deviceId) {
+        return new IllegalArgumentException("Unknown or unsupported deviceId: " + deviceId);
+    }
+
+    private CameraInfo findAvailableCameraInfoById(String deviceId) {
+        if (cameraProvider == null || deviceId == null || deviceId.isEmpty()) {
+            return null;
+        }
+
+        for (CameraInfo cameraInfo : cameraProvider.getAvailableCameraInfos()) {
+            if (deviceId.equals(Camera2CameraInfo.from(cameraInfo).getCameraId())) {
+                return cameraInfo;
+            }
+        }
+
+        return null;
+    }
+
+    @OptIn(markerClass = ExperimentalCamera2Interop.class)
+    private PhysicalCameraBindingTarget findPhysicalCameraBindingTarget(String physicalDeviceId) {
+        if (
+            cameraProvider == null ||
+            physicalDeviceId == null ||
+            physicalDeviceId.isEmpty() ||
+            Build.VERSION.SDK_INT < Build.VERSION_CODES.P
+        ) {
+            return null;
+        }
+
+        CameraManager cameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+        if (cameraManager == null) {
+            return null;
+        }
+
+        for (CameraInfo cameraInfo : cameraProvider.getAvailableCameraInfos()) {
+            String logicalCameraId = Camera2CameraInfo.from(cameraInfo).getCameraId();
+            try {
+                CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(logicalCameraId);
+                if (characteristics.getPhysicalCameraIds().contains(physicalDeviceId)) {
+                    int requiredFacing = isBackCamera(cameraInfo) ? CameraSelector.LENS_FACING_BACK : CameraSelector.LENS_FACING_FRONT;
+                    return new PhysicalCameraBindingTarget(cameraInfo, logicalCameraId, requiredFacing);
+                }
+            } catch (CameraAccessException e) {
+                Log.w(TAG, "findPhysicalCameraBindingTarget: Failed to inspect logical camera " + logicalCameraId, e);
+            }
+        }
+
+        return null;
+    }
+
+    private PhysicalDeviceMetadata resolvePhysicalDeviceMetadata(String deviceId) {
+        if (deviceId == null || deviceId.isEmpty()) {
+            return null;
+        }
+
+        CameraManager cameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+        if (cameraManager == null) {
+            return null;
+        }
+
+        try {
+            CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(deviceId);
+            Integer lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING);
+            String position = lensFacing != null && lensFacing == CameraCharacteristics.LENS_FACING_FRONT ? "front" : "rear";
+            return new PhysicalDeviceMetadata(position, getFallbackZoomForCharacteristics(characteristics));
+        } catch (CameraAccessException | IllegalArgumentException e) {
+            Log.w(TAG, "resolvePhysicalDeviceMetadata: Failed to inspect camera " + deviceId, e);
+            return null;
+        }
+    }
+
+    private String resolveFallbackPositionForDeviceId(String deviceId) {
+        app.capgo.capacitor.camera.preview.model.CameraDevice device = findEnumeratedDeviceById(deviceId);
+        if (device != null) {
+            return device.getPosition();
+        }
+
+        PhysicalDeviceMetadata metadata = resolvePhysicalDeviceMetadata(deviceId);
+        return metadata != null ? metadata.position : null;
+    }
+
+    private app.capgo.capacitor.camera.preview.model.CameraDevice findEnumeratedDeviceById(String deviceId) {
+        if (deviceId == null || deviceId.isEmpty()) {
+            return null;
+        }
+
+        app.capgo.capacitor.camera.preview.model.CameraDevice cachedDevice = enumeratedDeviceCache.get(deviceId);
+        if (cachedDevice != null) {
+            return cachedDevice;
+        }
+
+        requestEnumeratedDeviceCacheRefresh();
+        return null;
+    }
+
+    private float getFallbackZoomForDeviceId(String deviceId) {
+        app.capgo.capacitor.camera.preview.model.CameraDevice device = findEnumeratedDeviceById(deviceId);
+        if (device != null) {
+            for (LensInfo lens : device.getLenses()) {
+                if ("ultraWide".equals(lens.getDeviceType())) {
+                    return 0.5f;
+                }
+                if ("telephoto".equals(lens.getDeviceType())) {
+                    return 2.0f;
+                }
+            }
+        }
+
+        PhysicalDeviceMetadata metadata = resolvePhysicalDeviceMetadata(deviceId);
+        if (metadata != null) {
+            return metadata.fallbackZoom;
+        }
+
+        return 1.0f;
+    }
+
+    private float getFallbackZoomForCharacteristics(CameraCharacteristics characteristics) {
+        float[] focalLengths = characteristics.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS);
+        android.util.SizeF sensorSize = characteristics.get(CameraCharacteristics.SENSOR_INFO_PHYSICAL_SIZE);
+
+        if (focalLengths != null && focalLengths.length > 0) {
+            float focalLength = focalLengths[0];
+            if (sensorSize != null && sensorSize.getWidth() > 0) {
+                double fov = 2 * Math.toDegrees(Math.atan(sensorSize.getWidth() / (2 * focalLength)));
+                if (fov > 90) {
+                    return 0.5f;
+                }
+                if (fov < 40) {
+                    return 2.0f;
+                }
+            } else {
+                if (focalLength < 3.0f) {
+                    return 0.5f;
+                }
+                if (focalLength > 5.0f) {
+                    return 2.0f;
+                }
+            }
+        }
+
+        return 1.0f;
+    }
+
+    private void bindConfiguredUseCases(CameraBindingPlan bindingPlan, Preview preview) {
+        if (sessionConfig.isVideoModeEnabled() && videoCapture != null) {
+            camera = cameraProvider.bindToLifecycle(this, bindingPlan.selector, preview, imageCapture, videoCapture);
         } else {
-            String position = sessionConfig.getPosition();
-            int requiredFacing = "front".equals(position) ? CameraSelector.LENS_FACING_FRONT : CameraSelector.LENS_FACING_BACK;
-            builder.requireLensFacing(requiredFacing);
+            camera = cameraProvider.bindToLifecycle(this, bindingPlan.selector, preview, imageCapture);
+        }
+
+        CameraInfo cameraInfo = camera.getCameraInfo();
+        currentLogicalDeviceId = Camera2CameraInfo.from(cameraInfo).getCameraId();
+        currentPhysicalDeviceId = bindingPlan.physicalCameraId;
+        currentDeviceId = currentPhysicalDeviceId != null ? currentPhysicalDeviceId : currentLogicalDeviceId;
+
+        Log.d(
+            TAG,
+            "bindConfiguredUseCases: Camera successfully bound. activeDeviceId=" +
+                currentDeviceId +
+                ", logicalCameraId=" +
+                currentLogicalDeviceId +
+                ", physicalCameraId=" +
+                currentPhysicalDeviceId
+        );
+    }
+
+    private void copyMutableSessionConfigState(CameraSessionConfiguration source, CameraSessionConfiguration target) {
+        target.setCentered(source.isCentered());
+        target.setTargetZoom(source.getTargetZoom());
+        target.setEnablePhysicalDeviceSelection(source.isPhysicalDeviceSelectionEnabled());
+    }
+
+    private void requestEnumeratedDeviceCacheRefresh() {
+        synchronized (enumeratedDeviceCacheLock) {
+            if (enumeratedDeviceCacheRefreshInProgress) {
+                return;
+            }
+            enumeratedDeviceCacheRefreshInProgress = true;
+        }
+
+        Runnable refreshTask = () -> {
+            try {
+                getAvailableDevicesStatic(context);
+            } finally {
+                synchronized (enumeratedDeviceCacheLock) {
+                    enumeratedDeviceCacheRefreshInProgress = false;
+                }
+            }
+        };
+
+        if (cameraExecutor != null && !cameraExecutor.isShutdown()) {
+            try {
+                cameraExecutor.execute(refreshTask);
+                return;
+            } catch (RejectedExecutionException e) {
+                Log.w(TAG, "requestEnumeratedDeviceCacheRefresh: cameraExecutor rejected refresh task", e);
+            }
+        }
+
+        try {
+            Thread refreshThread = new Thread(refreshTask, "CameraPreview-DeviceCacheRefresh");
+            refreshThread.setDaemon(true);
+            refreshThread.start();
+        } catch (RuntimeException e) {
+            synchronized (enumeratedDeviceCacheLock) {
+                enumeratedDeviceCacheRefreshInProgress = false;
+            }
+            throw e;
         }
-        return builder.build();
     }
 
     private static boolean isBackCamera(androidx.camera.core.CameraInfo cameraInfo) {
@@ -2273,6 +2648,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
             }
 
             Log.d(TAG, "=== Enumeration Complete: " + devices.size() + " cameras ===");
+            updateEnumeratedDeviceCache(devices);
             return devices;
         } catch (Exception e) {
             Log.e(TAG, "getAvailableDevicesStatic: Error getting devices", e);
@@ -2280,6 +2656,14 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
         }
     }
 
+    private static void updateEnumeratedDeviceCache(List<app.capgo.capacitor.camera.preview.model.CameraDevice> devices) {
+        Map<String, app.capgo.capacitor.camera.preview.model.CameraDevice> newCache = new ConcurrentHashMap<>();
+        for (app.capgo.capacitor.camera.preview.model.CameraDevice device : devices) {
+            newCache.put(device.getDeviceId(), device);
+        }
+        enumeratedDeviceCache = newCache;
+    }
+
     public static ZoomFactors getZoomFactorsStatic() {
         try {
             // For static method, return default zoom factors
@@ -2357,6 +2741,9 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
             }
 
             camera.getCameraControl().setZoomRatio(zoomRatio);
+            if (sessionConfig != null) {
+                sessionConfig.setTargetZoom(zoomRatio);
+            }
             // Note: autofocus is intentionally not triggered on zoom because it's done by CameraX
         } catch (Exception e) {
             Log.e(TAG, "Failed to set zoom: " + e.getMessage());
@@ -2880,53 +3267,52 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
 
         mainExecutor.execute(() -> {
             try {
-                // Standard physical device selection logic...
-                List<CameraInfo> cameraInfos = cameraProvider.getAvailableCameraInfos();
-
-                CameraInfo targetCameraInfo = null;
-                for (CameraInfo cameraInfo : cameraInfos) {
-                    String id = Camera2CameraInfo.from(cameraInfo).getCameraId();
-                    if (deviceId.equals(id)) {
-                        targetCameraInfo = cameraInfo;
-                        break;
+                CameraSessionConfiguration previousConfig = sessionConfig;
+                CameraInfo targetCameraInfo = findAvailableCameraInfoById(deviceId);
+                String fallbackPosition = resolveFallbackPositionForDeviceId(deviceId);
+                String position = fallbackPosition != null ? fallbackPosition : previousConfig.getPosition();
+                if (targetCameraInfo != null) {
+                    position = isBackCamera(targetCameraInfo) ? "rear" : "front";
+                } else if (previousConfig.isPhysicalDeviceSelectionEnabled()) {
+                    PhysicalCameraBindingTarget physicalTarget = findPhysicalCameraBindingTarget(deviceId);
+                    if (physicalTarget != null) {
+                        position = physicalTarget.requiredFacing == CameraSelector.LENS_FACING_FRONT ? "front" : "rear";
+                    } else if (fallbackPosition == null) {
+                        Log.e(TAG, "switchToDevice: Could not resolve deviceId: " + deviceId);
+                        return;
                     }
+                } else if (fallbackPosition == null) {
+                    Log.e(TAG, "switchToDevice: Could not find any CameraInfo matching deviceId: " + deviceId);
+                    return;
                 }
 
-                if (targetCameraInfo != null) {
-                    // Determine position from the target camera
-                    String position = isBackCamera(targetCameraInfo) ? "rear" : "front";
-                    boolean wasCentered = sessionConfig.isCentered();
-
-                    // Update sessionConfig with the new device ID
-                    sessionConfig = new CameraSessionConfiguration(
-                        deviceId,
-                        position,
-                        sessionConfig.getX(),
-                        sessionConfig.getY(),
-                        sessionConfig.getWidth(),
-                        sessionConfig.getHeight(),
-                        sessionConfig.getPaddingBottom(),
-                        sessionConfig.getToBack(),
-                        sessionConfig.getStoreToFile(),
-                        sessionConfig.getEnableOpacity(),
-                        sessionConfig.getDisableExifHeaderStripping(),
-                        sessionConfig.getDisableAudio(),
-                        sessionConfig.getZoomFactor(),
-                        sessionConfig.getAspectRatio(),
-                        sessionConfig.getAspectMode(),
-                        sessionConfig.getGridMode(),
-                        sessionConfig.getDisableFocusIndicator(),
-                        sessionConfig.isVideoModeEnabled(),
-                        sessionConfig.getVideoQuality()
-                    );
-
-                    sessionConfig.setCentered(wasCentered);
+                CameraSessionConfiguration updatedConfig = new CameraSessionConfiguration(
+                    deviceId,
+                    position,
+                    previousConfig.getX(),
+                    previousConfig.getY(),
+                    previousConfig.getWidth(),
+                    previousConfig.getHeight(),
+                    previousConfig.getPaddingBottom(),
+                    previousConfig.getToBack(),
+                    previousConfig.getStoreToFile(),
+                    previousConfig.getEnableOpacity(),
+                    previousConfig.getDisableExifHeaderStripping(),
+                    previousConfig.getDisableAudio(),
+                    previousConfig.getZoomFactor(),
+                    previousConfig.getAspectRatio(),
+                    previousConfig.getAspectMode(),
+                    previousConfig.getGridMode(),
+                    previousConfig.getDisableFocusIndicator(),
+                    previousConfig.isVideoModeEnabled(),
+                    previousConfig.getVideoQuality()
+                );
+                copyMutableSessionConfigState(previousConfig, updatedConfig);
+                updatedConfig.setTargetZoom(1.0f);
+                sessionConfig = updatedConfig;
 
-                    Log.d(TAG, "switchToDevice: Updated sessionConfig with deviceId: " + deviceId);
-                    bindCameraUseCases(); // Will now use deviceId from sessionConfig
-                } else {
-                    Log.e(TAG, "switchToDevice: Could not find any CameraInfo matching deviceId: " + deviceId);
-                }
+                Log.d(TAG, "switchToDevice: Updated sessionConfig with deviceId: " + deviceId);
+                bindCameraUseCases();
             } catch (Exception e) {
                 Log.e(TAG, "switchToDevice: Error switching camera", e);
             }
@@ -2944,38 +3330,39 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
         boolean wasCentered = sessionConfig.isCentered();
         Log.d(TAG, "flipCamera: Switching from " + currentPosition + " to " + newPosition);
 
+        CameraSessionConfiguration previousConfig = sessionConfig;
         sessionConfig = new CameraSessionConfiguration(
             null, // deviceId - clear device ID to force position-based selection
             newPosition, // position
-            sessionConfig.getX(), // x
-            sessionConfig.getY(), // y
-            sessionConfig.getWidth(), // width
-            sessionConfig.getHeight(), // height
-            sessionConfig.getPaddingBottom(), // paddingBottom
-            sessionConfig.isToBack(), // toBack
-            sessionConfig.isStoreToFile(), // storeToFile
-            sessionConfig.isEnableOpacity(), // enableOpacity
-            sessionConfig.isDisableExifHeaderStripping(), // disableExifHeaderStripping
-            sessionConfig.isDisableAudio(), // disableAudio
-            sessionConfig.getZoomFactor(), // zoomFactor
-            sessionConfig.getAspectRatio(), // aspectRatio
-            sessionConfig.getAspectMode(), // aspectMode
-            sessionConfig.getGridMode(), // gridMode
-            sessionConfig.getDisableFocusIndicator(), // disableFocusIndicator
-            sessionConfig.isVideoModeEnabled(), // enableVideoMode
-            sessionConfig.getVideoQuality() // videoQuality
+            previousConfig.getX(), // x
+            previousConfig.getY(), // y
+            previousConfig.getWidth(), // width
+            previousConfig.getHeight(), // height
+            previousConfig.getPaddingBottom(), // paddingBottom
+            previousConfig.isToBack(), // toBack
+            previousConfig.isStoreToFile(), // storeToFile
+            previousConfig.isEnableOpacity(), // enableOpacity
+            previousConfig.isDisableExifHeaderStripping(), // disableExifHeaderStripping
+            previousConfig.isDisableAudio(), // disableAudio
+            previousConfig.getZoomFactor(), // zoomFactor
+            previousConfig.getAspectRatio(), // aspectRatio
+            previousConfig.getAspectMode(), // aspectMode
+            previousConfig.getGridMode(), // gridMode
+            previousConfig.getDisableFocusIndicator(), // disableFocusIndicator
+            previousConfig.isVideoModeEnabled(), // enableVideoMode
+            previousConfig.getVideoQuality() // videoQuality
         );
-
+        copyMutableSessionConfigState(previousConfig, sessionConfig);
+        sessionConfig.setTargetZoom(1.0f);
         sessionConfig.setCentered(wasCentered);
 
-        // Clear current device ID to force position-based selection
+        // Clear current device IDs to force position-based selection
         currentDeviceId = null;
+        currentPhysicalDeviceId = null;
+        currentLogicalDeviceId = null;
 
-        // Camera operations must run on main thread
-        cameraExecutor.execute(() -> {
-            currentCameraSelector = buildCameraSelector();
-            bindCameraUseCases();
-        });
+        // Rebind camera with the new position
+        bindCameraUseCases();
     }
 
     public void setOpacity(float opacity) {
@@ -3059,32 +3446,34 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
             return;
         }
 
-        String currentGridMode = sessionConfig.getGridMode();
+        CameraSessionConfiguration previousConfig = sessionConfig;
+        String currentGridMode = previousConfig.getGridMode();
         Log.d(TAG, "Changing aspect ratio from " + currentAspectRatio + " to " + aspectRatio);
         Log.d(TAG, "Auto-centering will be applied (matching iOS behavior)");
 
         // Match iOS behavior: when aspect ratio changes, always auto-center
         sessionConfig = new CameraSessionConfiguration(
-            sessionConfig.getDeviceId(),
-            sessionConfig.getPosition(),
+            previousConfig.getDeviceId(),
+            previousConfig.getPosition(),
             -1, // Force auto-center X (iOS: self.posX = -1)
             -1, // Force auto-center Y (iOS: self.posY = -1)
-            sessionConfig.getWidth(),
-            sessionConfig.getHeight(),
-            sessionConfig.getPaddingBottom(),
-            sessionConfig.getToBack(),
-            sessionConfig.getStoreToFile(),
-            sessionConfig.getEnableOpacity(),
-            sessionConfig.getDisableExifHeaderStripping(),
-            sessionConfig.getDisableAudio(),
-            sessionConfig.getZoomFactor(),
+            previousConfig.getWidth(),
+            previousConfig.getHeight(),
+            previousConfig.getPaddingBottom(),
+            previousConfig.getToBack(),
+            previousConfig.getStoreToFile(),
+            previousConfig.getEnableOpacity(),
+            previousConfig.getDisableExifHeaderStripping(),
+            previousConfig.getDisableAudio(),
+            previousConfig.getZoomFactor(),
             aspectRatio,
-            sessionConfig.getAspectMode(),
+            previousConfig.getAspectMode(),
             currentGridMode,
-            sessionConfig.getDisableFocusIndicator(),
-            sessionConfig.isVideoModeEnabled(),
-            sessionConfig.getVideoQuality()
+            previousConfig.getDisableFocusIndicator(),
+            previousConfig.isVideoModeEnabled(),
+            previousConfig.getVideoQuality()
         );
+        copyMutableSessionConfigState(previousConfig, sessionConfig);
         sessionConfig.setCentered(true);
 
         // Update layout and rebind camera with new aspect ratio
@@ -3135,32 +3524,34 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
             return;
         }
 
-        String currentGridMode = sessionConfig.getGridMode();
+        CameraSessionConfiguration previousConfig = sessionConfig;
+        String currentGridMode = previousConfig.getGridMode();
         Log.d(TAG, "Forcing aspect ratio recalculation for: " + aspectRatio);
         Log.d(TAG, "Auto-centering will be applied (matching iOS behavior)");
 
         // Match iOS behavior: when aspect ratio changes, always auto-center
         sessionConfig = new CameraSessionConfiguration(
-            sessionConfig.getDeviceId(),
-            sessionConfig.getPosition(),
+            previousConfig.getDeviceId(),
+            previousConfig.getPosition(),
             -1, // Force auto-center X (iOS: self.posX = -1)
             -1, // Force auto-center Y (iOS: self.posY = -1)
-            sessionConfig.getWidth(),
-            sessionConfig.getHeight(),
-            sessionConfig.getPaddingBottom(),
-            sessionConfig.getToBack(),
-            sessionConfig.getStoreToFile(),
-            sessionConfig.getEnableOpacity(),
-            sessionConfig.getDisableExifHeaderStripping(),
-            sessionConfig.getDisableAudio(),
-            sessionConfig.getZoomFactor(),
+            previousConfig.getWidth(),
+            previousConfig.getHeight(),
+            previousConfig.getPaddingBottom(),
+            previousConfig.getToBack(),
+            previousConfig.getStoreToFile(),
+            previousConfig.getEnableOpacity(),
+            previousConfig.getDisableExifHeaderStripping(),
+            previousConfig.getDisableAudio(),
+            previousConfig.getZoomFactor(),
             aspectRatio,
-            sessionConfig.getAspectMode(),
+            previousConfig.getAspectMode(),
             currentGridMode,
-            sessionConfig.getDisableFocusIndicator(),
-            sessionConfig.isVideoModeEnabled(),
-            sessionConfig.getVideoQuality()
+            previousConfig.getDisableFocusIndicator(),
+            previousConfig.isVideoModeEnabled(),
+            previousConfig.getVideoQuality()
         );
+        copyMutableSessionConfigState(previousConfig, sessionConfig);
         sessionConfig.setCentered(true);
 
         // Update layout and rebind camera with new aspect ratio
@@ -3203,27 +3594,29 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     public void setGridMode(String gridMode) {
         if (sessionConfig != null) {
             Log.d(TAG, "setGridMode: Changing grid mode to: " + gridMode);
+            CameraSessionConfiguration previousConfig = sessionConfig;
             sessionConfig = new CameraSessionConfiguration(
-                sessionConfig.getDeviceId(),
-                sessionConfig.getPosition(),
-                sessionConfig.getX(),
-                sessionConfig.getY(),
-                sessionConfig.getWidth(),
-                sessionConfig.getHeight(),
-                sessionConfig.getPaddingBottom(),
-                sessionConfig.getToBack(),
-                sessionConfig.getStoreToFile(),
-                sessionConfig.getEnableOpacity(),
-                sessionConfig.getDisableExifHeaderStripping(),
-                sessionConfig.getDisableAudio(),
-                sessionConfig.getZoomFactor(),
-                sessionConfig.getAspectRatio(),
-                sessionConfig.getAspectMode(),
+                previousConfig.getDeviceId(),
+                previousConfig.getPosition(),
+                previousConfig.getX(),
+                previousConfig.getY(),
+                previousConfig.getWidth(),
+                previousConfig.getHeight(),
+                previousConfig.getPaddingBottom(),
+                previousConfig.getToBack(),
+                previousConfig.getStoreToFile(),
+                previousConfig.getEnableOpacity(),
+                previousConfig.getDisableExifHeaderStripping(),
+                previousConfig.getDisableAudio(),
+                previousConfig.getZoomFactor(),
+                previousConfig.getAspectRatio(),
+                previousConfig.getAspectMode(),
                 gridMode,
-                sessionConfig.getDisableFocusIndicator(),
-                sessionConfig.isVideoModeEnabled(),
-                sessionConfig.getVideoQuality()
+                previousConfig.getDisableFocusIndicator(),
+                previousConfig.isVideoModeEnabled(),
+                previousConfig.getVideoQuality()
             );
+            copyMutableSessionConfigState(previousConfig, sessionConfig);
 
             // Update the grid overlay immediately
             if (gridOverlayView != null) {
@@ -3543,27 +3936,29 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                         );
                     }
 
+                    CameraSessionConfiguration previousConfig = sessionConfig;
                     sessionConfig = new CameraSessionConfiguration(
-                        sessionConfig.getDeviceId(),
-                        sessionConfig.getPosition(),
+                        previousConfig.getDeviceId(),
+                        previousConfig.getPosition(),
                         params.leftMargin,
                         params.topMargin,
                         params.width,
                         params.height,
-                        sessionConfig.getPaddingBottom(),
-                        sessionConfig.getToBack(),
-                        sessionConfig.getStoreToFile(),
-                        sessionConfig.getEnableOpacity(),
-                        sessionConfig.getDisableExifHeaderStripping(),
-                        sessionConfig.getDisableAudio(),
-                        sessionConfig.getZoomFactor(),
+                        previousConfig.getPaddingBottom(),
+                        previousConfig.getToBack(),
+                        previousConfig.getStoreToFile(),
+                        previousConfig.getEnableOpacity(),
+                        previousConfig.getDisableExifHeaderStripping(),
+                        previousConfig.getDisableAudio(),
+                        previousConfig.getZoomFactor(),
                         calculatedAspectRatio,
-                        sessionConfig.getAspectMode(),
-                        sessionConfig.getGridMode(),
-                        sessionConfig.getDisableFocusIndicator(),
-                        sessionConfig.isVideoModeEnabled(),
-                        sessionConfig.getVideoQuality()
+                        previousConfig.getAspectMode(),
+                        previousConfig.getGridMode(),
+                        previousConfig.getDisableFocusIndicator(),
+                        previousConfig.isVideoModeEnabled(),
+                        previousConfig.getVideoQuality()
                     );
+                    copyMutableSessionConfigState(previousConfig, sessionConfig);
 
                     // If aspect ratio changed due to size update, rebind camera
                     if (isRunning && !Objects.equals(currentAspectRatio, calculatedAspectRatio)) {