@carviz/capacitor-camera-preview 7.2.1 → 7.2.3

package/ios/Plugin/CameraController.swift

@@ -94,7 +94,7 @@ class CameraController: NSObject {
         
         // Configure video data output for sample capture
         self.videoDataOutput.setSampleBufferDelegate(self, queue: DispatchQueue(label: "videoQueue"))
-        self.videoDataOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey as String: Int(kCVPixelFormatType_32BGRA)]
+        self.videoDataOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey as String: Int(kCVPixelFormatType_420YpCbCr8BiPlanarFullRange)]
         if captureSession.canAddOutput(self.videoDataOutput) {
             captureSession.addOutput(self.videoDataOutput)
             
@@ -311,8 +311,41 @@ class CameraController: NSObject {
             return
         }
 
-        // Store the completion block to be called when we receive the next video frame
-        self.sampleBufferCaptureCompletionBlock = completion
+        // Capture the preview layer content directly - this mimics what the user sees
+        DispatchQueue.main.async {
+            guard let image = self.capturePreviewLayerAsImage() else {
+                completion(nil, CameraControllerError.unknown)
+                return
+            }
+            
+            // Apply the same orientation fix as the regular capture function
+            let orientationFixedImage = image.fixedOrientation() ?? image
+            completion(orientationFixedImage, nil)
+        }
+    }
+    
+    private func capturePreviewLayerAsImage() -> UIImage? {
+        // Ensure we're on the main thread
+        assert(Thread.isMainThread)
+        
+        // Get the preview layer bounds
+        let bounds = previewLayer.bounds
+        
+        // Create a graphics context
+        UIGraphicsBeginImageContextWithOptions(bounds.size, false, UIScreen.main.scale)
+        guard let context = UIGraphicsGetCurrentContext() else {
+            UIGraphicsEndImageContext()
+            return nil
+        }
+        
+        // Render the preview layer into the context
+        previewLayer.render(in: context)
+        
+        // Get the image from the context
+        let image = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+        
+        return image
     }
 
     func getSupportedFlashModes() throws -> [String] {
@@ -538,72 +571,8 @@ extension CameraController: AVCapturePhotoCaptureDelegate {
 
 extension CameraController: AVCaptureVideoDataOutputSampleBufferDelegate {
     func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
-        // Only process if we have a pending sample capture request
-        guard let completion = self.sampleBufferCaptureCompletionBlock else { return }
-        
-        // Clear the completion block to avoid capturing multiple frames for one request
-        self.sampleBufferCaptureCompletionBlock = nil
-        
-        // Convert sample buffer to UIImage
-        guard let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else {
-            DispatchQueue.main.async {
-                completion(nil, CameraControllerError.unknown)
-            }
-            return
-        }
-        
-        // Create CIImage from pixel buffer
-        var ciImage = CIImage(cvPixelBuffer: pixelBuffer)
-        
-        // Apply orientation correction based on video orientation
-        let videoOrientation = connection.videoOrientation
-        let transform = self.transformForVideoOrientation(videoOrientation, pixelBuffer: pixelBuffer)
-        ciImage = ciImage.transformed(by: transform)
-        
-        let context = CIContext()
-        
-        guard let cgImage = context.createCGImage(ciImage, from: ciImage.extent) else {
-            DispatchQueue.main.async {
-                completion(nil, CameraControllerError.unknown)
-            }
-            return
-        }
-        
-        let image = UIImage(cgImage: cgImage, scale: 1.0, orientation: .up)
-        
-        // Call completion on main queue
-        DispatchQueue.main.async {
-            completion(image, nil)
-        }
-    }
-    
-    private func transformForVideoOrientation(_ orientation: AVCaptureVideoOrientation, pixelBuffer: CVPixelBuffer) -> CGAffineTransform {
-        let bufferWidth = CGFloat(CVPixelBufferGetWidth(pixelBuffer))
-        let bufferHeight = CGFloat(CVPixelBufferGetHeight(pixelBuffer))
-        
-        var transform = CGAffineTransform.identity
-        
-        switch orientation {
-        case .portrait:
-            // No rotation needed for portrait
-            break
-        case .portraitUpsideDown:
-            // Rotate 180 degrees
-            transform = transform.translatedBy(x: bufferWidth, y: bufferHeight)
-            transform = transform.rotated(by: .pi)
-        case .landscapeRight:
-            // Rotate 90 degrees clockwise
-            transform = transform.translatedBy(x: bufferHeight, y: 0)
-            transform = transform.rotated(by: .pi / 2)
-        case .landscapeLeft:
-            // Rotate 90 degrees counter-clockwise
-            transform = transform.translatedBy(x: 0, y: bufferWidth)
-            transform = transform.rotated(by: -.pi / 2)
-        @unknown default:
-            break
-        }
-        
-        return transform
+        // We don't actually need to process video frames anymore since we're using preview layer capture
+        // This method is kept for compatibility but does nothing
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carviz/capacitor-camera-preview",
-  "version": "7.2.1",
+  "version": "7.2.3",
   "description": "Fork of the capacitor-community/camera-preview plugin focusing on high resolution photos without bloating up the code.",
   "type": "module",
   "main": "dist/plugin.cjs.js",