capacitor-camera-view 2.0.1 → 2.1.0

package/ios/Sources/CameraViewPlugin/CameraViewManager+BarcodeScan.swift

@@ -5,39 +5,34 @@ extension CameraViewManager: AVCaptureMetadataOutputObjectsDelegate {
     /// Set up metadata output for the capture session in case it's not configured yet
     /// Make sure to call `captureSession.beginConfiguration` before calling this
     ///
+    /// - Parameter barcodeTypes: Optional array of specific barcode types to detect.
+    ///                          If nil, all supported types are detected (backwards compatible).
     /// - Throws: An error if the output cannot be set.
-    internal func setupMetadataOutput() throws {
-        let metadataOutput = AVCaptureMetadataOutput()
+    internal func setupMetadataOutput(barcodeTypes: [AVMetadataObject.ObjectType]? = nil) throws {
+        let requestedBarcodeTypes = barcodeTypes ?? ALL_SUPPORTED_BARCODE_TYPES
 
-        if (captureSession.outputs.contains { $0 is AVCaptureMetadataOutput }) {
-            // Nothing todo, we already have an output
-            return
-        }
+        let metadataOutput: AVCaptureMetadataOutput
 
-        if !captureSession.canAddOutput(metadataOutput) {
-            throw CameraError.outputAdditionFailed
-        }
+        if let existingOutput = captureSession.outputs.first(where: { $0 is AVCaptureMetadataOutput }) as? AVCaptureMetadataOutput {
+            metadataOutput = existingOutput
+        } else {
+            let newOutput = AVCaptureMetadataOutput()
+            if !captureSession.canAddOutput(newOutput) {
+                throw CameraError.outputAdditionFailed
+            }
 
-        captureSession.addOutput(metadataOutput)
+            captureSession.addOutput(newOutput)
+            newOutput.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
+            metadataOutput = newOutput
+        }
 
-        metadataOutput.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
+        let supportedTypes = Set(metadataOutput.availableMetadataObjectTypes)
+        let resolvedTypes = requestedBarcodeTypes.filter { supportedTypes.contains($0) }
 
-        // Set all available barcode types
-        metadataOutput.metadataObjectTypes = [
-            .qr,
-            .code128,
-            .code39,
-            .code39Mod43,
-            .code93,
-            .ean8,
-            .ean13,
-            .interleaved2of5,
-            .itf14,
-            .pdf417,
-            .aztec,
-            .dataMatrix,
-            .upce
-        ]
+        if metadataOutput.metadataObjectTypes != resolvedTypes {
+            // Update the metadata output with the resolved types only if they differ from the current configuration
+            metadataOutput.metadataObjectTypes = resolvedTypes
+        }
     }
 
     /// Remove the metadata output if in case it is already configured, e.g. because
@@ -80,21 +75,15 @@ extension CameraViewManager: AVCaptureMetadataOutputObjectsDelegate {
             return
         }
 
-        let boundingRect: [String: Double] = [
-            "x": Double(transformedMetadataObject.bounds.origin.x),
-            "y": Double(transformedMetadataObject.bounds.origin.y),
-            "width": Double(transformedMetadataObject.bounds.width),
-            "height": Double(transformedMetadataObject.bounds.height)
-        ]
+        let boundingRect = BarcodeDetectedEvent.BoundingRect(
+            x: Double(transformedMetadataObject.bounds.origin.x),
+            y: Double(transformedMetadataObject.bounds.origin.y),
+            width: Double(transformedMetadataObject.bounds.width),
+            height: Double(transformedMetadataObject.bounds.height)
+        )
 
-        NotificationCenter.default.post(
-            name: Notification.Name("barcodeDetected"),
-            object: nil,
-            userInfo: [
-                "value": barcodeValue,
-                "type": barcodeType,
-                "boundingRect": boundingRect
-            ]
+        eventEmitter.emitBarcodeDetected(
+            BarcodeDetectedEvent(value: barcodeValue, type: barcodeType, boundingRect: boundingRect)
         )
     }
 }

package/ios/Sources/CameraViewPlugin/CameraViewManager+PhotoCapture.swift

@@ -13,19 +13,22 @@ extension CameraViewManager: AVCapturePhotoCaptureDelegate {
             // use outputs for taking photos here we don't need a new one
             return
         }
-
+        
         // Balanced should be a good choice for most use cases
         avPhotoOutput.maxPhotoQualityPrioritization = .balanced
-
+        
         if !captureSession.canAddOutput(avPhotoOutput) {
             throw CameraError.outputAdditionFailed
         }
-
+        
         captureSession.addOutput(avPhotoOutput)
     }
-
+    
     /// Delegate method called when a photo has been captured via `AVCapturePhotoCaptureDelegate`
     ///
+    /// This method handles both the legacy UIImage-based callback and the optimized Data-based
+    /// callback to eliminate double JPEG encoding when possible.
+    ///
     /// - Parameters:
     ///   - output: The photo output that captured the photo.
     ///   - photo: The captured photo.
@@ -35,17 +38,46 @@ extension CameraViewManager: AVCapturePhotoCaptureDelegate {
         didFinishProcessingPhoto photo: AVCapturePhoto,
         error: Error?
     ) {
-        if let error = error {
-            photoCaptureHandler?(nil, error)
+        // Handle optimized Data-based callback first (avoids double encoding)
+        if let dataHandler = photoDataCaptureHandler {
+            photoDataCaptureHandler = nil
+            
+            if let error = error {
+                dataHandler(nil, error)
+                return
+            }
+            
+            guard let data = photo.fileDataRepresentation() else {
+                dataHandler(nil, CameraError.photoOutputError)
+                return
+            }
+            
+            dataHandler(data, nil)
             return
         }
-
-        guard let data = photo.fileDataRepresentation(), let image = UIImage(data: data) else {
-            photoCaptureHandler?(nil, CameraError.photoOutputError)
-            return
+        
+        // Handle legacy UIImage-based callback
+        if let imageHandler = photoCaptureHandler {
+            photoCaptureHandler = nil
+            
+            if let error = error {
+                imageHandler(nil, error)
+                return
+            }
+            
+            guard let data = photo.fileDataRepresentation() else {
+                imageHandler(nil, CameraError.photoOutputError)
+                return
+            }
+            
+            guard let image = UIImage(data: data) else {
+                imageHandler(nil, CameraError.photoOutputError)
+                return
+            }
+            
+            imageHandler(image, nil)
         }
-
-        photoCaptureHandler?(image, nil)
     }
-
+    
 }
+

package/ios/Sources/CameraViewPlugin/CameraViewManager+VideoDataOutput.swift

@@ -33,7 +33,8 @@ extension CameraViewManager: AVCaptureVideoDataOutputSampleBufferDelegate {
         captureSession.addOutput(avVideoDataOutput)
     }
 
-    /// Capture a snapshot from the camera feed
+    /// Capture a snapshot from the camera feed using the shared Metal-backed CIContext.
+    /// Using a shared CIContext eliminates the ~80% CPU overhead of creating one per frame.
     public func captureOutput(
         _ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer,
         from connection: AVCaptureConnection
@@ -52,8 +53,8 @@ extension CameraViewManager: AVCaptureVideoDataOutputSampleBufferDelegate {
         }
 
         let ciImage = CIImage(cvPixelBuffer: imageBuffer)
-        let context = CIContext()
-        guard let cgImage = context.createCGImage(ciImage, from: ciImage.extent) else {
+        // Use the shared Metal-backed CIContext for efficient rendering
+        guard let cgImage = CameraViewManager.sharedCIContext.createCGImage(ciImage, from: ciImage.extent) else {
             completionHandler(nil, CameraError.frameCaptureError)
             return
         }