@capgo/camera-preview 7.4.0-beta.2 → 7.4.0-beta.20

package/ios/Sources/CapgoCameraPreview/CameraController.swift

@@ -8,6 +8,7 @@
 
 import AVFoundation
 import UIKit
+import CoreLocation
 
 class CameraController: NSObject {
     var captureSession: AVCaptureSession?
@@ -23,25 +24,37 @@ class CameraController: NSObject {
     var rearCamera: AVCaptureDevice?
     var rearCameraInput: AVCaptureDeviceInput?
 
+    var allDiscoveredDevices: [AVCaptureDevice] = []
+
     var fileVideoOutput: AVCaptureMovieFileOutput?
 
     var previewLayer: AVCaptureVideoPreviewLayer?
+    var gridOverlayView: GridOverlayView?
+    var focusIndicatorView: UIView?
 
     var flashMode = AVCaptureDevice.FlashMode.off
     var photoCaptureCompletionBlock: ((UIImage?, Error?) -> Void)?
 
     var sampleBufferCaptureCompletionBlock: ((UIImage?, Error?) -> Void)?
-
-    var highResolutionOutput: Bool = false
+    
+    // Add callback for detecting when first frame is ready
+    var firstFrameReadyCallback: (() -> Void)?
+    var hasReceivedFirstFrame = false
 
     var audioDevice: AVCaptureDevice?
     var audioInput: AVCaptureDeviceInput?
 
     var zoomFactor: CGFloat = 1.0
+    private var lastZoomUpdateTime: TimeInterval = 0
+    private let zoomUpdateThrottle: TimeInterval = 1.0 / 60.0 // 60 FPS max
 
     var videoFileURL: URL?
     private let saneMaxZoomFactor: CGFloat = 25.5
 
+    // Track output preparation status
+    private var outputsPrepared: Bool = false
+    private let outputPreparationQueue = DispatchQueue(label: "camera.output.preparation", qos: .utility)
+
     var isUsingMultiLensVirtualCamera: Bool {
         guard let device = (currentCameraPosition == .rear) ? rearCamera : frontCamera else { return false }
         // A rear multi-lens virtual camera will have a min zoom of 1.0 but support wider angles
@@ -50,215 +63,458 @@ class CameraController: NSObject {
 }
 
 extension CameraController {
-    func prepare(cameraPosition: String, deviceId: String? = nil, disableAudio: Bool, cameraMode: Bool, completionHandler: @escaping (Error?) -> Void) {
-        func createCaptureSession() {
-            self.captureSession = AVCaptureSession()
-        }
-
-        func configureCaptureDevices() throws {
-            // Expanded device types to support more camera configurations
-            let deviceTypes: [AVCaptureDevice.DeviceType] = [
-                .builtInWideAngleCamera,
-                .builtInUltraWideCamera,
-                .builtInTelephotoCamera,
-                .builtInDualCamera,
-                .builtInDualWideCamera,
-                .builtInTripleCamera,
-                .builtInTrueDepthCamera
-            ]
-
-            let session = AVCaptureDevice.DiscoverySession(deviceTypes: deviceTypes, mediaType: AVMediaType.video, position: .unspecified)
-
-            let cameras = session.devices.compactMap { $0 }
-
-            // Log all found devices for debugging
-            print("[CameraPreview] Found \(cameras.count) devices:")
-            for camera in cameras {
-                let constituentCount = camera.isVirtualDevice ? camera.constituentDevices.count : 1
-                print("[CameraPreview] - \(camera.localizedName) (Position: \(camera.position.rawValue), Virtual: \(camera.isVirtualDevice), Lenses: \(constituentCount), Zoom: \(camera.minAvailableVideoZoomFactor)-\(camera.maxAvailableVideoZoomFactor))")
+    func prepareFullSession() {
+        // Only prepare if we don't already have a session
+        guard self.captureSession == nil else { return }
+
+        print("[CameraPreview] Preparing full camera session in background")
+
+        // 1. Create and configure session
+        self.captureSession = AVCaptureSession()
+
+        // 2. Pre-configure session preset (can be changed later) - use medium for faster startup
+        if captureSession!.canSetSessionPreset(.medium) {
+            captureSession!.sessionPreset = .medium // Start with medium, upgrade later if needed
+        } else if captureSession!.canSetSessionPreset(.high) {
+            captureSession!.sessionPreset = .high
+        }
+
+        // 3. Discover cameras on-demand (only when needed for better startup performance)
+        // discoverAndConfigureCameras() - moved to lazy loading
+
+        // // 4. Pre-create outputs asynchronously to avoid blocking camera opening
+        // outputPreparationQueue.async { [weak self] in
+        //     self?.prepareOutputs()
+        // }
+
+        print("[CameraPreview] Full session preparation complete - cameras will be discovered on-demand, outputs being prepared asynchronously")
+    }
+
+    private func ensureCamerasDiscovered() {
+        // Rediscover cameras if the array is empty OR if the camera pointers are nil
+        guard allDiscoveredDevices.isEmpty || (rearCamera == nil && frontCamera == nil) else { return }
+        discoverAndConfigureCameras()
+    }
+
+    private func discoverAndConfigureCameras() {
+        let deviceTypes: [AVCaptureDevice.DeviceType] = [
+            .builtInWideAngleCamera,
+            .builtInUltraWideCamera,
+            .builtInTelephotoCamera,
+            .builtInDualCamera,
+            .builtInDualWideCamera,
+            .builtInTripleCamera,
+            .builtInTrueDepthCamera
+        ]
+
+        let session = AVCaptureDevice.DiscoverySession(deviceTypes: deviceTypes, mediaType: AVMediaType.video, position: .unspecified)
+        let cameras = session.devices.compactMap { $0 }
+
+        // Store all discovered devices for fast lookup later
+        self.allDiscoveredDevices = cameras
+
+        // Log all found devices for debugging
+        print("[CameraPreview] Found \(cameras.count) devices:")
+        for camera in cameras {
+            let constituentCount = camera.isVirtualDevice ? camera.constituentDevices.count : 1
+            print("[CameraPreview] - \(camera.localizedName) (Position: \(camera.position.rawValue), Virtual: \(camera.isVirtualDevice), Lenses: \(constituentCount))")
+        }
+
+        // Find best cameras
+        let rearVirtualDevices = cameras.filter { $0.position == .back && $0.isVirtualDevice }
+        let bestRearVirtualDevice = rearVirtualDevices.max { $0.constituentDevices.count < $1.constituentDevices.count }
+
+        self.frontCamera = cameras.first(where: { $0.position == .front })
+
+        if let bestCamera = bestRearVirtualDevice {
+            self.rearCamera = bestCamera
+            print("[CameraPreview] Selected best virtual rear camera: \(bestCamera.localizedName) with \(bestCamera.constituentDevices.count) physical cameras.")
+        } else if let firstRearCamera = cameras.first(where: { $0.position == .back }) {
+            self.rearCamera = firstRearCamera
+            print("[CameraPreview] WARN: No virtual rear camera found. Selected first available: \(firstRearCamera.localizedName)")
+        }
+
+        // Pre-configure focus modes
+        configureCameraFocus(camera: self.rearCamera)
+        configureCameraFocus(camera: self.frontCamera)
+    }
+
+    private func configureCameraFocus(camera: AVCaptureDevice?) {
+        guard let camera = camera else { return }
+
+        do {
+            try camera.lockForConfiguration()
+            if camera.isFocusModeSupported(.continuousAutoFocus) {
+                camera.focusMode = .continuousAutoFocus
             }
+            camera.unlockForConfiguration()
+        } catch {
+            print("[CameraPreview] Could not configure focus for \(camera.localizedName): \(error)")
+        }
+    }
 
-            guard !cameras.isEmpty else {
-                print("[CameraPreview] ERROR: No cameras found.")
-                throw CameraControllerError.noCamerasAvailable
+    private func prepareOutputs() {
+        // Pre-create photo output with optimized settings
+        self.photoOutput = AVCapturePhotoOutput()
+        self.photoOutput?.isHighResolutionCaptureEnabled = false // Start with lower resolution for speed
+
+        // Configure photo output for better performance
+        if #available(iOS 13.0, *) {
+            self.photoOutput?.maxPhotoQualityPrioritization = .speed // Prioritize speed over quality initially
+        }
+
+        // Pre-create video output
+        self.fileVideoOutput = AVCaptureMovieFileOutput()
+
+        // Pre-create data output with optimized settings
+        self.dataOutput = AVCaptureVideoDataOutput()
+        self.dataOutput?.videoSettings = [
+            (kCVPixelBufferPixelFormatTypeKey as String): NSNumber(value: kCVPixelFormatType_32BGRA as UInt32)
+        ]
+        self.dataOutput?.alwaysDiscardsLateVideoFrames = true
+
+        // Use a background queue for sample buffer processing to avoid blocking main thread
+        let dataOutputQueue = DispatchQueue(label: "camera.data.output", qos: .userInitiated)
+        self.dataOutput?.setSampleBufferDelegate(nil, queue: dataOutputQueue) // Will be set later
+
+        // Mark outputs as prepared
+        self.outputsPrepared = true
+
+        print("[CameraPreview] Outputs pre-created with performance optimizations")
+    }
+
+    private func waitForOutputsToBeReady() {
+        // If outputs are already prepared, return immediately
+        if outputsPrepared {
+            return
+        }
+
+        // Wait for outputs to be prepared with a timeout
+        let semaphore = DispatchSemaphore(value: 0)
+        var outputsReady = false
+
+        // Check for outputs readiness periodically
+        let timer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
+            if self.outputsPrepared {
+                outputsReady = true
+                timer.invalidate()
+                semaphore.signal()
             }
+        }
 
-            // --- Corrected Device Selection Logic ---
-            // Find the virtual device with the most constituent cameras (this is the most capable one)
-            let rearVirtualDevices = cameras.filter { $0.position == .back && $0.isVirtualDevice }
-            let bestRearVirtualDevice = rearVirtualDevices.max { $0.constituentDevices.count < $1.constituentDevices.count }
+        // Wait for outputs to be ready or timeout after 2 seconds
+        let timeout = DispatchTime.now() + .seconds(2)
+        let result = semaphore.wait(timeout: timeout)
 
-            self.frontCamera = cameras.first(where: { $0.position == .front })
+        timer.invalidate()
 
-            if let bestCamera = bestRearVirtualDevice {
-                self.rearCamera = bestCamera
-                print("[CameraPreview] Selected best virtual rear camera: \(bestCamera.localizedName) with \(bestCamera.constituentDevices.count) physical cameras.")
-            } else if let firstRearCamera = cameras.first(where: { $0.position == .back }) {
-                // Fallback for devices without a virtual camera system
-                self.rearCamera = firstRearCamera
-                print("[CameraPreview] WARN: No virtual rear camera found. Selected first available: \(firstRearCamera.localizedName)")
+        if result == .timedOut && !outputsReady {
+            print("[CameraPreview] Warning: Timed out waiting for outputs to be prepared, proceeding anyway")
+            // Fallback: prepare outputs synchronously if async preparation failed
+            if !outputsPrepared {
+                prepareOutputs()
             }
-            // --- End of Correction ---
+        } else {
+            print("[CameraPreview] Outputs ready, proceeding with camera preparation")
+        }
+    }
 
-            if let rearCamera = self.rearCamera {
-                do {
-                    try rearCamera.lockForConfiguration()
-                    if rearCamera.isFocusModeSupported(.continuousAutoFocus) {
-                        rearCamera.focusMode = .continuousAutoFocus
-                    }
-                    rearCamera.unlockForConfiguration()
-                } catch {
-                    print("[CameraPreview] WARN: Could not set focus mode on rear camera. \(error)")
-                }
+    func upgradeQualitySettings() {
+        guard let captureSession = self.captureSession else { return }
+
+        // Upgrade session preset to high quality after initial startup
+        DispatchQueue.global(qos: .utility).async { [weak self] in
+            guard let self = self else { return }
+
+            captureSession.beginConfiguration()
+
+            // Upgrade to high quality preset
+            if captureSession.canSetSessionPreset(.high) && captureSession.sessionPreset != .high {
+                captureSession.sessionPreset = .high
+                print("[CameraPreview] Upgraded session preset to high quality")
             }
 
-            if disableAudio == false {
-                self.audioDevice = AVCaptureDevice.default(for: AVMediaType.audio)
+            // Upgrade photo output quality
+            if let photoOutput = self.photoOutput {
+                photoOutput.isHighResolutionCaptureEnabled = true
+                if #available(iOS 13.0, *) {
+                    photoOutput.maxPhotoQualityPrioritization = .quality
+                }
+                print("[CameraPreview] Upgraded photo output to high resolution")
             }
+
+            captureSession.commitConfiguration()
         }
+    }
 
-        func configureDeviceInputs() throws {
-            guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
+    func prepare(cameraPosition: String, deviceId: String? = nil, disableAudio: Bool, cameraMode: Bool, aspectRatio: String? = nil, initialZoomLevel: Float = 1.0, completionHandler: @escaping (Error?) -> Void) {
+        // Use background queue for preparation to avoid blocking main thread
+        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+            guard let self = self else {
+                DispatchQueue.main.async {
+                    completionHandler(CameraControllerError.unknown)
+                }
+                return
+            }
 
-            var selectedDevice: AVCaptureDevice?
+            do {
+                // Session and outputs already created in load(), just configure user-specific settings
+                if self.captureSession == nil {
+                    // Fallback if prepareFullSession() wasn't called
+                    self.prepareFullSession()
+                }
 
-            // If deviceId is specified, use that specific device
-            if let deviceId = deviceId {
-                let allDevices = AVCaptureDevice.DiscoverySession(
-                    deviceTypes: [.builtInWideAngleCamera, .builtInUltraWideCamera, .builtInTelephotoCamera, .builtInDualCamera, .builtInDualWideCamera, .builtInTripleCamera, .builtInTrueDepthCamera],
-                    mediaType: .video,
-                    position: .unspecified
-                ).devices
+                guard let captureSession = self.captureSession else {
+                    throw CameraControllerError.captureSessionIsMissing
+                }
 
-                selectedDevice = allDevices.first(where: { $0.uniqueID == deviceId })
-                guard selectedDevice != nil else {
-                    throw CameraControllerError.noCamerasAvailable
+                print("[CameraPreview] Fast prepare - using pre-initialized session")
+
+                // Ensure outputs are prepared synchronously before starting session
+                self.prepareOutputs()
+                self.waitForOutputsToBeReady()
+
+                // Configure device inputs for the requested camera
+                try self.configureDeviceInputs(cameraPosition: cameraPosition, deviceId: deviceId, disableAudio: disableAudio)
+                
+                // Add data output early to detect first frame
+                captureSession.beginConfiguration()
+                if let dataOutput = self.dataOutput, captureSession.canAddOutput(dataOutput) {
+                    captureSession.addOutput(dataOutput)
+                    // Set delegate to detect first frame
+                    dataOutput.setSampleBufferDelegate(self, queue: DispatchQueue.main)
                 }
-            } else {
-                // Use position-based selection
-                if cameraPosition == "rear" {
-                    selectedDevice = self.rearCamera
-                } else if cameraPosition == "front" {
-                    selectedDevice = self.frontCamera
+                captureSession.commitConfiguration()
+                
+                // Reset first frame detection
+                self.hasReceivedFirstFrame = false
+
+                // Start the session on background thread (AVCaptureSession.startRunning() is thread-safe)
+                captureSession.startRunning()
+                print("[CameraPreview] Session started")
+
+                // Validate and set initial zoom level asynchronously
+                if initialZoomLevel != 1.0 {
+                    DispatchQueue.main.async { [weak self] in
+                        self?.setInitialZoom(level: initialZoomLevel)
+                    }
+                }
+
+                // Call completion on main thread
+                DispatchQueue.main.async {
+                    completionHandler(nil)
+
+                    // Upgrade quality settings after a short delay for better user experience
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
+                        guard let self = self else { return }
+
+                        // Add remaining outputs to session and apply user settings
+                        do {
+                            try self.addRemainingOutputsToSession(cameraMode: cameraMode, aspectRatio: aspectRatio)
+                            print("[CameraPreview] Remaining outputs successfully added to session")
+                        } catch {
+                            print("[CameraPreview] Error adding outputs to session: \(error)")
+                        }
+
+                        self.upgradeQualitySettings()
+                    }
+                }
+            } catch {
+                DispatchQueue.main.async {
+                    completionHandler(error)
                 }
             }
+        }
+    }
+
+    private func setInitialZoom(level: Float) {
+        let device = (currentCameraPosition == .rear) ? rearCamera : frontCamera
+        guard let device = device else { return }
 
-            guard let finalDevice = selectedDevice else {
-                print("[CameraPreview] ERROR: No camera device selected for position: \(cameraPosition)")
+        let minZoom = device.minAvailableVideoZoomFactor
+        let maxZoom = min(device.maxAvailableVideoZoomFactor, saneMaxZoomFactor)
+
+        guard CGFloat(level) >= minZoom && CGFloat(level) <= maxZoom else {
+            print("[CameraPreview] Initial zoom level \(level) out of range (\(minZoom)-\(maxZoom))")
+            return
+        }
+
+        do {
+            try device.lockForConfiguration()
+            device.videoZoomFactor = CGFloat(level)
+            device.unlockForConfiguration()
+            self.zoomFactor = CGFloat(level)
+            print("[CameraPreview] Set initial zoom to \(level)")
+        } catch {
+            print("[CameraPreview] Failed to set initial zoom: \(error)")
+        }
+    }
+
+    private func configureDeviceInputs(cameraPosition: String, deviceId: String?, disableAudio: Bool) throws {
+        guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
+
+        // Ensure cameras are discovered before configuring inputs
+        ensureCamerasDiscovered()
+
+        var selectedDevice: AVCaptureDevice?
+
+        // If deviceId is specified, find that specific device from discovered devices
+        if let deviceId = deviceId {
+            selectedDevice = self.allDiscoveredDevices.first(where: { $0.uniqueID == deviceId })
+            guard selectedDevice != nil else {
+                print("[CameraPreview] ERROR: Device with ID \(deviceId) not found in discovered devices")
                 throw CameraControllerError.noCamerasAvailable
             }
+        } else {
+            // Use position-based selection from discovered cameras
+            if cameraPosition == "rear" {
+                selectedDevice = self.rearCamera
+            } else if cameraPosition == "front" {
+                selectedDevice = self.frontCamera
+            }
+        }
 
-            print("[CameraPreview] Configuring device: \(finalDevice.localizedName)")
-            let deviceInput = try AVCaptureDeviceInput(device: finalDevice)
+        guard let finalDevice = selectedDevice else {
+            print("[CameraPreview] ERROR: No camera device selected for position: \(cameraPosition)")
+            throw CameraControllerError.noCamerasAvailable
+        }
 
-            if captureSession.canAddInput(deviceInput) {
-                captureSession.addInput(deviceInput)
+        print("[CameraPreview] Configuring device: \(finalDevice.localizedName)")
+        let deviceInput = try AVCaptureDeviceInput(device: finalDevice)
 
-                if finalDevice.position == .front {
-                    self.frontCameraInput = deviceInput
-                    self.frontCamera = finalDevice
-                    self.currentCameraPosition = .front
-                } else {
-                    self.rearCameraInput = deviceInput
-                    self.rearCamera = finalDevice
-                    self.currentCameraPosition = .rear
+        if captureSession.canAddInput(deviceInput) {
+            captureSession.addInput(deviceInput)
 
-                    // --- Corrected Initial Zoom Logic ---
-                    try finalDevice.lockForConfiguration()
-                    if finalDevice.isFocusModeSupported(.continuousAutoFocus) {
-                        finalDevice.focusMode = .continuousAutoFocus
-                    }
+            if finalDevice.position == .front {
+                self.frontCameraInput = deviceInput
+                self.currentCameraPosition = .front
+            } else {
+                self.rearCameraInput = deviceInput
+                self.currentCameraPosition = .rear
 
-                    // On a multi-camera system, a zoom factor of 2.0 often corresponds to the standard "1x" wide-angle lens.
-                    // We set this as the default to provide a familiar starting point for users.
-                    let defaultWideAngleZoom: CGFloat = 2.0
-                    if finalDevice.isVirtualDevice && finalDevice.constituentDevices.count > 1 && finalDevice.videoZoomFactor != defaultWideAngleZoom {
-                        // Check if 2.0 is a valid zoom factor before setting it.
-                        if defaultWideAngleZoom >= finalDevice.minAvailableVideoZoomFactor && defaultWideAngleZoom <= finalDevice.maxAvailableVideoZoomFactor {
-                             print("[CameraPreview] Multi-camera system detected. Setting initial zoom to \(defaultWideAngleZoom) (standard wide-angle).")
-                             finalDevice.videoZoomFactor = defaultWideAngleZoom
-                        }
+                // Configure zoom for multi-camera systems - simplified and faster
+                if finalDevice.isVirtualDevice && finalDevice.constituentDevices.count > 1 {
+                    try finalDevice.lockForConfiguration()
+                    let defaultWideAngleZoom: CGFloat = 1.0 // Changed from 2.0 to 1.0 for faster startup
+                    if defaultWideAngleZoom >= finalDevice.minAvailableVideoZoomFactor && defaultWideAngleZoom <= finalDevice.maxAvailableVideoZoomFactor {
+                        print("[CameraPreview] Setting initial zoom to \(defaultWideAngleZoom)")
+                        finalDevice.videoZoomFactor = defaultWideAngleZoom
                     }
                     finalDevice.unlockForConfiguration()
-                    // --- End of Correction ---
                 }
-            } else {
-                print("[CameraPreview] ERROR: Cannot add device input to session.")
-                throw CameraControllerError.inputsAreInvalid
             }
+        } else {
+            throw CameraControllerError.inputsAreInvalid
+        }
 
-            // Add audio input
-            if disableAudio == false {
-                if let audioDevice = self.audioDevice {
-                    self.audioInput = try AVCaptureDeviceInput(device: audioDevice)
-                    if captureSession.canAddInput(self.audioInput!) {
-                        captureSession.addInput(self.audioInput!)
-                    } else {
-                        throw CameraControllerError.inputsAreInvalid
-                    }
+        // Add audio input if needed
+        if !disableAudio {
+            if self.audioDevice == nil {
+                self.audioDevice = AVCaptureDevice.default(for: AVMediaType.audio)
+            }
+            if let audioDevice = self.audioDevice {
+                self.audioInput = try AVCaptureDeviceInput(device: audioDevice)
+                if captureSession.canAddInput(self.audioInput!) {
+                    captureSession.addInput(self.audioInput!)
+                } else {
+                    throw CameraControllerError.inputsAreInvalid
                 }
             }
         }
+    }
 
-        func configurePhotoOutput(cameraMode: Bool) throws {
-            guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
+        private func addRemainingOutputsToSession(cameraMode: Bool, aspectRatio: String?) throws {
+        guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
 
-            //  TODO: check if that really useful
-            if !cameraMode && self.highResolutionOutput && captureSession.canSetSessionPreset(.photo) {
-                captureSession.sessionPreset = .photo
-            } else if cameraMode && self.highResolutionOutput && captureSession.canSetSessionPreset(.high) {
-                captureSession.sessionPreset = .high
-            }
+        // Begin configuration to batch all changes
+        captureSession.beginConfiguration()
+        defer { captureSession.commitConfiguration() }
 
-            self.photoOutput = AVCapturePhotoOutput()
-            self.photoOutput!.setPreparedPhotoSettingsArray([AVCapturePhotoSettings(format: [AVVideoCodecKey: AVVideoCodecType.jpeg])], completionHandler: nil)
-            self.photoOutput?.isHighResolutionCaptureEnabled = self.highResolutionOutput
-            if captureSession.canAddOutput(self.photoOutput!) { captureSession.addOutput(self.photoOutput!) }
+        // Update session preset based on aspect ratio if needed
+        var targetPreset: AVCaptureSession.Preset = .high // Default to high quality
 
-            let fileVideoOutput = AVCaptureMovieFileOutput()
-            if captureSession.canAddOutput(fileVideoOutput) {
-                captureSession.addOutput(fileVideoOutput)
-                self.fileVideoOutput = fileVideoOutput
+        if let aspectRatio = aspectRatio {
+            switch aspectRatio {
+            case "16:9":
+                targetPreset = captureSession.canSetSessionPreset(.hd1920x1080) ? .hd1920x1080 : .high
+            case "4:3":
+                targetPreset = captureSession.canSetSessionPreset(.photo) ? .photo : .high
+            default:
+                targetPreset = .high
             }
-            captureSession.startRunning()
         }
 
-        func configureDataOutput() throws {
-            guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
-
-            self.dataOutput = AVCaptureVideoDataOutput()
-            self.dataOutput?.videoSettings = [
-                (kCVPixelBufferPixelFormatTypeKey as String): NSNumber(value: kCVPixelFormatType_32BGRA as UInt32)
-            ]
-            self.dataOutput?.alwaysDiscardsLateVideoFrames = true
-            if captureSession.canAddOutput(self.dataOutput!) {
-                captureSession.addOutput(self.dataOutput!)
-            }
+        // Always try to set the best preset available
+        if captureSession.canSetSessionPreset(targetPreset) {
+            captureSession.sessionPreset = targetPreset
+            print("[CameraPreview] Updated preset to \(targetPreset) for aspect ratio: \(aspectRatio ?? "default")")
+        } else if captureSession.canSetSessionPreset(.high) {
+            // Fallback to high if target preset not available
+            captureSession.sessionPreset = .high
+            print("[CameraPreview] Fallback to high preset")
+        }
 
-            captureSession.commitConfiguration()
+        // Add photo output (already created in prepareOutputs)
+        if let photoOutput = self.photoOutput, captureSession.canAddOutput(photoOutput) {
+            photoOutput.isHighResolutionCaptureEnabled = true
+            captureSession.addOutput(photoOutput)
+        }
 
-            let queue = DispatchQueue(label: "DataOutput", attributes: [])
-            self.dataOutput?.setSampleBufferDelegate(self, queue: queue)
+        // Add video output only if camera mode is enabled
+        if cameraMode, let videoOutput = self.fileVideoOutput, captureSession.canAddOutput(videoOutput) {
+            captureSession.addOutput(videoOutput)
         }
+        // Data output was already added in prepare() to detect first frame
+    }
+    
+    private func addOutputsToSession(cameraMode: Bool, aspectRatio: String?) throws {
+        guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
 
-        DispatchQueue(label: "prepare").async {
-            do {
-                createCaptureSession()
-                try configureCaptureDevices()
-                try configureDeviceInputs()
-                try configurePhotoOutput(cameraMode: cameraMode)
-                try configureDataOutput()
-                // try configureVideoOutput()
-            } catch {
-                DispatchQueue.main.async {
-                    completionHandler(error)
-                }
+        // Begin configuration to batch all changes
+        captureSession.beginConfiguration()
+        defer { captureSession.commitConfiguration() }
 
-                return
+        // Update session preset based on aspect ratio if needed
+        var targetPreset: AVCaptureSession.Preset = .high // Default to high quality
+
+        if let aspectRatio = aspectRatio {
+            switch aspectRatio {
+            case "16:9":
+                targetPreset = captureSession.canSetSessionPreset(.hd1920x1080) ? .hd1920x1080 : .high
+            case "4:3":
+                targetPreset = captureSession.canSetSessionPreset(.photo) ? .photo : .high
+            default:
+                targetPreset = .high
             }
+        }
 
+        // Always try to set the best preset available
+        if captureSession.canSetSessionPreset(targetPreset) {
+            captureSession.sessionPreset = targetPreset
+            print("[CameraPreview] Updated preset to \(targetPreset) for aspect ratio: \(aspectRatio ?? "default")")
+        } else if captureSession.canSetSessionPreset(.high) {
+            // Fallback to high if target preset not available
+            captureSession.sessionPreset = .high
+            print("[CameraPreview] Fallback to high preset")
+        }
+
+        // Add photo output (already created in prepareOutputs)
+        if let photoOutput = self.photoOutput, captureSession.canAddOutput(photoOutput) {
+            photoOutput.isHighResolutionCaptureEnabled = true
+            captureSession.addOutput(photoOutput)
+        }
+
+        // Add video output only if camera mode is enabled
+        if cameraMode, let videoOutput = self.fileVideoOutput, captureSession.canAddOutput(videoOutput) {
+captureSession.addOutput(videoOutput)
+        }
+
+        // Add data output
+        if let dataOutput = self.dataOutput, captureSession.canAddOutput(dataOutput) {
+            captureSession.addOutput(dataOutput)
+            // Set delegate after outputs are added for better performance
             DispatchQueue.main.async {
-                completionHandler(nil)
+                dataOutput.setSampleBufferDelegate(self, queue: DispatchQueue.main)
             }
         }
     }
@@ -266,13 +522,51 @@ extension CameraController {
     func displayPreview(on view: UIView) throws {
         guard let captureSession = self.captureSession, captureSession.isRunning else { throw CameraControllerError.captureSessionIsMissing }
 
-        self.previewLayer = AVCaptureVideoPreviewLayer(session: captureSession)
-        self.previewLayer?.videoGravity = AVLayerVideoGravity.resizeAspectFill
+        print("[CameraPreview] displayPreview called with view frame: \(view.frame)")
+
+        // Create and configure preview layer in one go
+        let previewLayer = AVCaptureVideoPreviewLayer(session: captureSession)
+
+        // Batch all layer configuration to avoid multiple redraws
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+
+        previewLayer.videoGravity = AVLayerVideoGravity.resizeAspectFill
+        previewLayer.connection?.videoOrientation = .portrait
+        previewLayer.isOpaque = true
+        previewLayer.contentsScale = UIScreen.main.scale
+        previewLayer.frame = view.bounds
+
+        // Insert layer and store reference
+        view.layer.insertSublayer(previewLayer, at: 0)
+        self.previewLayer = previewLayer
+
+        CATransaction.commit()
+
+        print("[CameraPreview] Set preview layer frame to view bounds: \(view.bounds)")
+        print("[CameraPreview] Session preset: \(captureSession.sessionPreset.rawValue)")
+
+        // Update video orientation asynchronously to avoid blocking
+        DispatchQueue.main.async { [weak self] in
+            self?.updateVideoOrientation()
+        }
+    }
+
+    func addGridOverlay(to view: UIView, gridMode: String) {
+        removeGridOverlay()
 
-        view.layer.insertSublayer(self.previewLayer!, at: 0)
-        self.previewLayer?.frame = view.frame
+        // Disable animation for grid overlay creation and positioning
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+        gridOverlayView = GridOverlayView(frame: view.bounds)
+        gridOverlayView?.gridMode = gridMode
+        view.addSubview(gridOverlayView!)
+        CATransaction.commit()
+    }
 
-        updateVideoOrientation()
+    func removeGridOverlay() {
+        gridOverlayView?.removeFromSuperview()
+        gridOverlayView = nil
     }
 
     func setupGestures(target: UIView, enableZoom: Bool) {
@@ -291,6 +585,10 @@ extension CameraController {
     func setupPinchGesture(target: UIView, selector: Selector, delegate: UIGestureRecognizerDelegate?) {
         let pinchGesture = UIPinchGestureRecognizer(target: self, action: selector)
         pinchGesture.delegate = delegate
+        // Optimize gesture recognition for better performance
+        pinchGesture.delaysTouchesBegan = false
+        pinchGesture.delaysTouchesEnded = false
+        pinchGesture.cancelsTouchesInView = false
         target.addGestureRecognizer(pinchGesture)
     }
 
@@ -298,8 +596,8 @@ extension CameraController {
         if Thread.isMainThread {
             updateVideoOrientationOnMainThread()
         } else {
-            DispatchQueue.main.async { [weak self] in
-                self?.updateVideoOrientationOnMainThread()
+            DispatchQueue.main.sync {
+                self.updateVideoOrientationOnMainThread()
             }
         }
     }
@@ -340,7 +638,7 @@ extension CameraController {
 
         // Ensure we have the necessary cameras
         guard (currentCameraPosition == .front && rearCamera != nil) ||
-              (currentCameraPosition == .rear && frontCamera != nil) else {
+                (currentCameraPosition == .rear && frontCamera != nil) else {
             throw CameraControllerError.noCamerasAvailable
         }
 
@@ -356,9 +654,7 @@ extension CameraController {
             captureSession.commitConfiguration()
             // Restart the session if it was running before
             if wasRunning {
-                DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-                    self?.captureSession?.startRunning()
-                }
+                captureSession.startRunning()
             }
         }
 
@@ -368,7 +664,7 @@ extension CameraController {
         // Remove only video inputs
         captureSession.inputs.forEach { input in
             if (input as? AVCaptureDeviceInput)?.device.hasMediaType(.video) ?? false {
-            captureSession.removeInput(input)
+                captureSession.removeInput(input)
             }
         }
 
@@ -387,7 +683,7 @@ extension CameraController {
             rearCamera.unlockForConfiguration()
 
             if let newInput = try? AVCaptureDeviceInput(device: rearCamera),
-                captureSession.canAddInput(newInput) {
+               captureSession.canAddInput(newInput) {
                 captureSession.addInput(newInput)
                 rearCameraInput = newInput
                 self.currentCameraPosition = .rear
@@ -407,7 +703,7 @@ extension CameraController {
             frontCamera.unlockForConfiguration()
 
             if let newInput = try? AVCaptureDeviceInput(device: frontCamera),
-                captureSession.canAddInput(newInput) {
+               captureSession.canAddInput(newInput) {
                 captureSession.addInput(newInput)
                 frontCameraInput = newInput
                 self.currentCameraPosition = .front
@@ -422,20 +718,186 @@ extension CameraController {
         }
 
         // Update video orientation
-        DispatchQueue.main.async { [weak self] in
-            self?.updateVideoOrientation()
-        }
+        self.updateVideoOrientation()
     }
 
-    func captureImage(completion: @escaping (UIImage?, Error?) -> Void) {
-        guard let captureSession = captureSession, captureSession.isRunning else { completion(nil, CameraControllerError.captureSessionIsMissing); return }
+        func captureImage(width: Int?, height: Int?, aspectRatio: String?, quality: Float, gpsLocation: CLLocation?, completion: @escaping (UIImage?, Error?) -> Void) {
+        guard let photoOutput = self.photoOutput else {
+            completion(nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Photo output is not available"]))
+            return
+        }
+
         let settings = AVCapturePhotoSettings()
 
-        settings.flashMode = self.flashMode
-        settings.isHighResolutionPhotoEnabled = self.highResolutionOutput
+        // Apply the current flash mode to the photo settings
+        // Check if the current device supports flash
+        var currentCamera: AVCaptureDevice?
+        switch currentCameraPosition {
+        case .front:
+            currentCamera = self.frontCamera
+        case .rear:
+            currentCamera = self.rearCamera
+        default:
+            break
+        }
 
-        self.photoOutput?.capturePhoto(with: settings, delegate: self)
-        self.photoCaptureCompletionBlock = completion
+        // Only apply flash if the device has flash and the flash mode is supported
+        if let device = currentCamera, device.hasFlash {
+            let supportedFlashModes = photoOutput.supportedFlashModes
+            if supportedFlashModes.contains(self.flashMode) {
+                settings.flashMode = self.flashMode
+            }
+        }
+
+        self.photoCaptureCompletionBlock = { (image, error) in
+            if let error = error {
+                completion(nil, error)
+                return
+            }
+
+            guard let image = image else {
+                completion(nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Failed to capture image"]))
+                return
+            }
+
+            if let location = gpsLocation {
+                self.addGPSMetadata(to: image, location: location)
+            }
+
+            var finalImage = image
+            
+            // When no dimensions are specified, crop to match what's visible in preview
+            if width == nil && height == nil {
+                // If aspectRatio is specified, use it to crop
+                if let aspectRatio = aspectRatio {
+                let components = aspectRatio.split(separator: ":").compactMap { Double($0) }
+                if components.count == 2 {
+                    // For capture in portrait orientation, swap the aspect ratio (16:9 becomes 9:16)
+                    let isPortrait = image.size.height > image.size.width
+                    let targetAspectRatio = isPortrait ? components[1] / components[0] : components[0] / components[1]
+                    let imageSize = image.size
+                    let originalAspectRatio = imageSize.width / imageSize.height
+                    
+                    var targetSize = imageSize
+                    
+                    if originalAspectRatio > targetAspectRatio {
+                        // Original is wider than target - fit by height
+                        targetSize.width = imageSize.height * CGFloat(targetAspectRatio)
+                    } else {
+                        // Original is taller than target - fit by width
+                        targetSize.height = imageSize.width / CGFloat(targetAspectRatio)
+                    }
+                    
+                    // Center crop the image
+                    if let croppedImage = self.cropImageToAspectRatio(image: image, targetSize: targetSize) {
+                        finalImage = croppedImage
+                    }
+                }
+                } else {
+                    // No aspectRatio specified but we need to crop to match preview
+                    // Since preview uses resizeAspectFill, we need to crop the captured image
+                    // to match what's visible in the preview
+                    if let previewLayer = self.previewLayer,
+                       let croppedImage = self.cropImageToMatchPreview(image: image, previewLayer: previewLayer) {
+                        finalImage = croppedImage
+                    }
+                }
+            } else if let width = width, let height = height {
+                finalImage = self.resizeImage(image: image, to: CGSize(width: width, height: height))!
+            }
+            
+            completion(finalImage, nil)
+        }
+
+        photoOutput.capturePhoto(with: settings, delegate: self)
+    }
+
+    func addGPSMetadata(to image: UIImage, location: CLLocation) {
+        guard let jpegData = image.jpegData(compressionQuality: 1.0),
+              let source = CGImageSourceCreateWithData(jpegData as CFData, nil),
+              let uti = CGImageSourceGetType(source) else { return }
+
+        var metadata = CGImageSourceCopyPropertiesAtIndex(source, 0, nil) as? [String: Any] ?? [:]
+
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"
+        formatter.timeZone = TimeZone(abbreviation: "UTC")
+
+        let gpsDict: [String: Any] = [
+            kCGImagePropertyGPSLatitude as String: abs(location.coordinate.latitude),
+            kCGImagePropertyGPSLatitudeRef as String: location.coordinate.latitude >= 0 ? "N" : "S",
+            kCGImagePropertyGPSLongitude as String: abs(location.coordinate.longitude),
+            kCGImagePropertyGPSLongitudeRef as String: location.coordinate.longitude >= 0 ? "E" : "W",
+            kCGImagePropertyGPSTimeStamp as String: formatter.string(from: location.timestamp),
+            kCGImagePropertyGPSAltitude as String: location.altitude,
+            kCGImagePropertyGPSAltitudeRef as String: location.altitude >= 0 ? 0 : 1
+        ]
+
+        metadata[kCGImagePropertyGPSDictionary as String] = gpsDict
+
+        let destData = NSMutableData()
+        guard let destination = CGImageDestinationCreateWithData(destData, uti, 1, nil) else { return }
+        CGImageDestinationAddImageFromSource(destination, source, 0, metadata as CFDictionary)
+        CGImageDestinationFinalize(destination)
+    }
+
+    func resizeImage(image: UIImage, to size: CGSize) -> UIImage? {
+        let renderer = UIGraphicsImageRenderer(size: size)
+        let resizedImage = renderer.image { (_) in
+            image.draw(in: CGRect(origin: .zero, size: size))
+        }
+        return resizedImage
+    }
+    
+    func cropImageToAspectRatio(image: UIImage, targetSize: CGSize) -> UIImage? {
+        let imageSize = image.size
+        
+        // Calculate the crop rect - center crop
+        let xOffset = (imageSize.width - targetSize.width) / 2
+        let yOffset = (imageSize.height - targetSize.height) / 2
+        let cropRect = CGRect(x: xOffset, y: yOffset, width: targetSize.width, height: targetSize.height)
+        
+        // Create the cropped image
+        guard let cgImage = image.cgImage,
+              let croppedCGImage = cgImage.cropping(to: cropRect) else {
+            return nil
+        }
+        
+        return UIImage(cgImage: croppedCGImage, scale: image.scale, orientation: image.imageOrientation)
+    }
+    
+    func cropImageToMatchPreview(image: UIImage, previewLayer: AVCaptureVideoPreviewLayer) -> UIImage? {
+        // Get the dimensions of the preview layer
+        let previewBounds = previewLayer.bounds
+        let previewAspectRatio = previewBounds.width / previewBounds.height
+        
+        // Get the dimensions of the captured image
+        let imageSize = image.size
+        let imageAspectRatio = imageSize.width / imageSize.height
+        
+        // Since we're using resizeAspectFill, we need to calculate what portion of the image
+        // is visible in the preview
+        var cropRect: CGRect
+        
+        if imageAspectRatio > previewAspectRatio {
+            // Image is wider than preview - crop horizontally
+            let visibleWidth = imageSize.height * previewAspectRatio
+            let xOffset = (imageSize.width - visibleWidth) / 2
+            cropRect = CGRect(x: xOffset, y: 0, width: visibleWidth, height: imageSize.height)
+        } else {
+            // Image is taller than preview - crop vertically
+            let visibleHeight = imageSize.width / previewAspectRatio
+            let yOffset = (imageSize.height - visibleHeight) / 2
+            cropRect = CGRect(x: 0, y: yOffset, width: imageSize.width, height: visibleHeight)
+        }
+        
+        // Create the cropped image
+        guard let cgImage = image.cgImage,
+              let croppedCGImage = cgImage.cropping(to: cropRect) else {
+            return nil
+        }
+        
+        return UIImage(cgImage: croppedCGImage, scale: image.scale, orientation: image.imageOrientation)
     }
 
     func captureSample(completion: @escaping (UIImage?, Error?) -> Void) {
@@ -612,7 +1074,7 @@ extension CameraController {
         )
     }
 
-    func setZoom(level: CGFloat, ramp: Bool) throws {
+    func setZoom(level: CGFloat, ramp: Bool, autoFocus: Bool = true) throws {
         var currentCamera: AVCaptureDevice?
         switch currentCameraPosition {
         case .front:
@@ -633,7 +1095,8 @@ extension CameraController {
             try device.lockForConfiguration()
 
             if ramp {
-                device.ramp(toVideoZoomFactor: zoomLevel, withRate: 1.0)
+                // Use a very fast ramp rate for immediate response
+                device.ramp(toVideoZoomFactor: zoomLevel, withRate: 8.0)
             } else {
                 device.videoZoomFactor = zoomLevel
             }
@@ -642,11 +1105,123 @@ extension CameraController {
 
             // Update our internal zoom factor tracking
             self.zoomFactor = zoomLevel
+
+            // Trigger autofocus after zoom if requested
+            if autoFocus {
+                self.triggerAutoFocus()
+            }
         } catch {
             throw CameraControllerError.invalidOperation
         }
     }
 
+    private func triggerAutoFocus() {
+        var currentCamera: AVCaptureDevice?
+        switch currentCameraPosition {
+        case .front:
+            currentCamera = self.frontCamera
+        case .rear:
+            currentCamera = self.rearCamera
+        default: break
+        }
+
+        guard let device = currentCamera else {
+            return
+        }
+
+        // Focus on the center of the preview (0.5, 0.5)
+        let centerPoint = CGPoint(x: 0.5, y: 0.5)
+
+        do {
+            try device.lockForConfiguration()
+
+            // Set focus mode to auto if supported
+            if device.isFocusModeSupported(.autoFocus) {
+                device.focusMode = .autoFocus
+                if device.isFocusPointOfInterestSupported {
+                    device.focusPointOfInterest = centerPoint
+                }
+            } else if device.isFocusModeSupported(.continuousAutoFocus) {
+                device.focusMode = .continuousAutoFocus
+                if device.isFocusPointOfInterestSupported {
+                    device.focusPointOfInterest = centerPoint
+                }
+            }
+
+            // Also set exposure point if supported
+            if device.isExposurePointOfInterestSupported && device.isExposureModeSupported(.autoExpose) {
+                device.exposureMode = .autoExpose
+                device.exposurePointOfInterest = centerPoint
+            } else if device.isExposureModeSupported(.continuousAutoExposure) {
+                device.exposureMode = .continuousAutoExposure
+                if device.isExposurePointOfInterestSupported {
+                    device.exposurePointOfInterest = centerPoint
+                }
+            }
+
+            device.unlockForConfiguration()
+        } catch {
+            // Silently ignore errors during autofocus
+        }
+    }
+
+    func setFocus(at point: CGPoint, showIndicator: Bool = false, in view: UIView? = nil) throws {
+        // Validate that coordinates are within bounds (0-1 range for device coordinates)
+        if point.x < 0 || point.x > 1 || point.y < 0 || point.y > 1 {
+            print("setFocus: Coordinates out of bounds - x: \(point.x), y: \(point.y)")
+            throw CameraControllerError.invalidOperation
+        }
+
+        var currentCamera: AVCaptureDevice?
+        switch currentCameraPosition {
+        case .front:
+            currentCamera = self.frontCamera
+        case .rear:
+            currentCamera = self.rearCamera
+        default: break
+        }
+
+        guard let device = currentCamera else {
+            throw CameraControllerError.noCamerasAvailable
+        }
+
+        guard device.isFocusPointOfInterestSupported else {
+            // Device doesn't support focus point of interest
+            return
+        }
+
+        // Show focus indicator if requested and view is provided - only after validation
+        if showIndicator, let view = view, let previewLayer = self.previewLayer {
+            // Convert the device point to layer point for indicator display
+            let layerPoint = previewLayer.layerPointConverted(fromCaptureDevicePoint: point)
+            showFocusIndicator(at: layerPoint, in: view)
+        }
+
+        do {
+            try device.lockForConfiguration()
+
+            // Set focus mode to auto if supported
+            if device.isFocusModeSupported(.autoFocus) {
+                device.focusMode = .autoFocus
+            } else if device.isFocusModeSupported(.continuousAutoFocus) {
+                device.focusMode = .continuousAutoFocus
+            }
+
+            // Set the focus point
+            device.focusPointOfInterest = point
+
+            // Also set exposure point if supported
+            if device.isExposurePointOfInterestSupported && device.isExposureModeSupported(.autoExpose) {
+                device.exposureMode = .autoExpose
+                device.exposurePointOfInterest = point
+            }
+
+            device.unlockForConfiguration()
+        } catch {
+            throw CameraControllerError.unknown
+        }
+    }
+
     func getFlashMode() throws -> String {
         switch self.flashMode {
         case .off:
@@ -677,7 +1252,7 @@ extension CameraController {
 
         return device.uniqueID
     }
-    
+
     func getCurrentLensInfo() throws -> (focalLength: Float, deviceType: String, baseZoomRatio: Float) {
         var currentCamera: AVCaptureDevice?
         switch currentCameraPosition {
@@ -757,9 +1332,7 @@ extension CameraController {
             captureSession.commitConfiguration()
             // Restart the session if it was running before
             if wasRunning {
-                DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-                    self?.captureSession?.startRunning()
-                }
+                captureSession.startRunning()
             }
         }
 
@@ -806,13 +1379,9 @@ extension CameraController {
         }
 
         // Update video orientation
-        DispatchQueue.main.async { [weak self] in
-            self?.updateVideoOrientation()
-        }
+        self.updateVideoOrientation()
     }
 
-
-
     func cleanup() {
         if let captureSession = self.captureSession {
             captureSession.stopRunning()
@@ -823,6 +1392,9 @@ extension CameraController {
         self.previewLayer?.removeFromSuperlayer()
         self.previewLayer = nil
 
+        self.focusIndicatorView?.removeFromSuperview()
+        self.focusIndicatorView = nil
+
         self.frontCameraInput = nil
         self.rearCameraInput = nil
         self.audioInput = nil
@@ -830,6 +1402,7 @@ extension CameraController {
         self.frontCamera = nil
         self.rearCamera = nil
         self.audioDevice = nil
+        self.allDiscoveredDevices = []
 
         self.dataOutput = nil
         self.photoOutput = nil
@@ -837,6 +1410,13 @@ extension CameraController {
 
         self.captureSession = nil
         self.currentCameraPosition = nil
+
+        // Reset output preparation status
+        self.outputsPrepared = false
+        
+        // Reset first frame detection
+        self.hasReceivedFirstFrame = false
+        self.firstFrameReadyCallback = nil
     }
 
     func captureVideo() throws {
@@ -913,6 +1493,11 @@ extension CameraController: UIGestureRecognizerDelegate {
         let point = tap.location(in: tap.view)
         let devicePoint = self.previewLayer?.captureDevicePointConverted(fromLayerPoint: point)
 
+        // Show focus indicator at the tap point
+        if let view = tap.view {
+            showFocusIndicator(at: point, in: view)
+        }
+
         do {
             try device.lockForConfiguration()
             defer { device.unlockForConfiguration() }
@@ -933,6 +1518,54 @@ extension CameraController: UIGestureRecognizerDelegate {
         }
     }
 
+    private func showFocusIndicator(at point: CGPoint, in view: UIView) {
+        // Remove any existing focus indicator
+        focusIndicatorView?.removeFromSuperview()
+
+        // Create a new focus indicator
+        let indicator = UIView(frame: CGRect(x: 0, y: 0, width: 80, height: 80))
+        indicator.center = point
+        indicator.layer.borderColor = UIColor.yellow.cgColor
+        indicator.layer.borderWidth = 2.0
+        indicator.layer.cornerRadius = 40
+        indicator.backgroundColor = UIColor.clear
+        indicator.alpha = 0
+        indicator.transform = CGAffineTransform(scaleX: 1.5, y: 1.5)
+
+        // Add inner circle for better visibility
+        let innerCircle = UIView(frame: CGRect(x: 20, y: 20, width: 40, height: 40))
+        innerCircle.layer.borderColor = UIColor.yellow.cgColor
+        innerCircle.layer.borderWidth = 1.0
+        innerCircle.layer.cornerRadius = 20
+        innerCircle.backgroundColor = UIColor.clear
+        indicator.addSubview(innerCircle)
+
+        view.addSubview(indicator)
+        focusIndicatorView = indicator
+
+        // Animate the focus indicator
+        UIView.animate(withDuration: 0.15, animations: {
+            indicator.alpha = 1.0
+            indicator.transform = CGAffineTransform.identity
+        }) { _ in
+            // Keep the indicator visible for a moment
+            UIView.animate(withDuration: 0.2, delay: 0.5, options: [], animations: {
+                indicator.alpha = 0.3
+            }) { _ in
+                // Fade out and remove
+                UIView.animate(withDuration: 0.3, delay: 0.2, options: [], animations: {
+                    indicator.alpha = 0
+                    indicator.transform = CGAffineTransform(scaleX: 0.8, y: 0.8)
+                }) { _ in
+                    indicator.removeFromSuperview()
+                    if self.focusIndicatorView == indicator {
+                        self.focusIndicatorView = nil
+                    }
+                }
+            }
+        }
+    }
+
     @objc
     private func handlePinch(_ pinch: UIPinchGestureRecognizer) {
         guard let device = self.currentCameraPosition == .rear ? rearCamera : frontCamera else { return }
@@ -940,45 +1573,75 @@ extension CameraController: UIGestureRecognizerDelegate {
         let effectiveMaxZoom = min(device.maxAvailableVideoZoomFactor, self.saneMaxZoomFactor)
         func minMaxZoom(_ factor: CGFloat) -> CGFloat { return max(device.minAvailableVideoZoomFactor, min(factor, effectiveMaxZoom)) }
 
-        func update(scale factor: CGFloat) {
+        switch pinch.state {
+        case .began:
+            // Store the initial zoom factor when pinch begins
+            zoomFactor = device.videoZoomFactor
+
+        case .changed:
+            // Throttle zoom updates to prevent excessive CPU usage
+            let currentTime = CACurrentMediaTime()
+            guard currentTime - lastZoomUpdateTime >= zoomUpdateThrottle else { return }
+            lastZoomUpdateTime = currentTime
+
+            // Calculate new zoom factor based on pinch scale
+            let newScaleFactor = minMaxZoom(pinch.scale * zoomFactor)
+
+            // Use ramping for smooth zoom transitions during pinch
+            // This provides much smoother performance than direct setting
             do {
                 try device.lockForConfiguration()
-                defer { device.unlockForConfiguration() }
-
-                device.videoZoomFactor = factor
+                // Use a very fast ramp rate for immediate response
+                device.ramp(toVideoZoomFactor: newScaleFactor, withRate: 5.0)
+                device.unlockForConfiguration()
             } catch {
-                debugPrint(error)
+                debugPrint("Failed to set zoom: \(error)")
             }
-        }
 
-        switch pinch.state {
-        case .began: fallthrough
-        case .changed:
-            let newScaleFactor = minMaxZoom(pinch.scale * zoomFactor)
-            update(scale: newScaleFactor)
         case .ended:
+            // Update our internal zoom factor tracking
             zoomFactor = device.videoZoomFactor
+
         default: break
         }
     }
 }
 
 extension CameraController: AVCapturePhotoCaptureDelegate {
-    public func photoOutput(_ captureOutput: AVCapturePhotoOutput, didFinishProcessingPhoto photoSampleBuffer: CMSampleBuffer?, previewPhoto previewPhotoSampleBuffer: CMSampleBuffer?,
-                            resolvedSettings: AVCaptureResolvedPhotoSettings, bracketSettings: AVCaptureBracketedStillImageSettings?, error: Swift.Error?) {
+    public func photoOutput(_ output: AVCapturePhotoOutput, didFinishProcessingPhoto photo: AVCapturePhoto, error: Error?) {
         if let error = error {
             self.photoCaptureCompletionBlock?(nil, error)
-        } else if let buffer = photoSampleBuffer, let data = AVCapturePhotoOutput.jpegPhotoDataRepresentation(forJPEGSampleBuffer: buffer, previewPhotoSampleBuffer: nil),
-                  let image = UIImage(data: data) {
-            self.photoCaptureCompletionBlock?(image.fixedOrientation(), nil)
-        } else {
+            return
+        }
+
+        // Get the photo data using the modern API
+        guard let imageData = photo.fileDataRepresentation() else {
             self.photoCaptureCompletionBlock?(nil, CameraControllerError.unknown)
+            return
+        }
+
+        guard let image = UIImage(data: imageData) else {
+            self.photoCaptureCompletionBlock?(nil, CameraControllerError.unknown)
+            return
         }
+
+        self.photoCaptureCompletionBlock?(image.fixedOrientation(), nil)
     }
 }
 
 extension CameraController: AVCaptureVideoDataOutputSampleBufferDelegate {
     func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
+        // Check if we're waiting for the first frame
+        if !hasReceivedFirstFrame, let firstFrameCallback = firstFrameReadyCallback {
+            hasReceivedFirstFrame = true
+            firstFrameCallback()
+            firstFrameReadyCallback = nil
+            // If no capture is in progress, we can return early
+            if sampleBufferCaptureCompletionBlock == nil {
+                return
+            }
+        }
+        
         guard let completion = sampleBufferCaptureCompletionBlock else { return }
 
         guard let imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else {
@@ -1028,6 +1691,7 @@ enum CameraControllerError: Swift.Error {
     case cannotFindDocumentsDirectory
     case fileVideoOutputNotFound
     case unknown
+    case invalidZoomLevel(min: CGFloat, max: CGFloat, requested: CGFloat)
 }
 
 public enum CameraPosition {
@@ -1054,6 +1718,8 @@ extension CameraControllerError: LocalizedError {
             return NSLocalizedString("Cannot find documents directory", comment: "This should never happen")
         case .fileVideoOutputNotFound:
             return NSLocalizedString("Video recording is not available. Make sure the camera is properly initialized.", comment: "Video recording not available")
+        case .invalidZoomLevel(let min, let max, let requested):
+            return NSLocalizedString("Invalid zoom level. Must be between \(min) and \(max). Requested: \(requested)", comment: "Invalid Zoom Level")
         }
     }
 }
@@ -1095,6 +1761,8 @@ extension UIImage {
             print("right")
         case .up, .upMirrored:
             break
+        @unknown default:
+            break
         }
 
         // Flip image one more time if needed to, this is to prevent flipped image
@@ -1107,15 +1775,21 @@ extension UIImage {
             transform.scaledBy(x: -1, y: 1)
         case .up, .down, .left, .right:
             break
+        @unknown default:
+            break
         }
 
         ctx.concatenate(transform)
 
         switch imageOrientation {
         case .left, .leftMirrored, .right, .rightMirrored:
-            ctx.draw(self.cgImage!, in: CGRect(x: 0, y: 0, width: size.height, height: size.width))
+            if let cgImage = self.cgImage {
+                ctx.draw(cgImage, in: CGRect(x: 0, y: 0, width: size.height, height: size.width))
+            }
         default:
-            ctx.draw(self.cgImage!, in: CGRect(x: 0, y: 0, width: size.width, height: size.height))
+            if let cgImage = self.cgImage {
+                ctx.draw(cgImage, in: CGRect(x: 0, y: 0, width: size.width, height: size.height))
+            }
         }
         guard let newCGImage = ctx.makeImage() else { return nil }
         return UIImage.init(cgImage: newCGImage, scale: 1, orientation: .up)