@carviz/capacitor-camera-preview 7.1.1 → 7.2.1

package/ios/Plugin/CameraController.swift

@@ -43,6 +43,7 @@ class CameraController: NSObject {
     var captureSession: AVCaptureSession?
     
     var photoOutput = AVCapturePhotoOutput()
+    var videoDataOutput = AVCaptureVideoDataOutput()
     var photoCaptureCompletionBlock: ((UIImage?, Error?) -> Void)?
     var sampleBufferCaptureCompletionBlock: ((UIImage?, Error?) -> Void)?
     
@@ -91,6 +92,18 @@ class CameraController: NSObject {
             captureSession.addOutput(self.photoOutput)
         }
         
+        // Configure video data output for sample capture
+        self.videoDataOutput.setSampleBufferDelegate(self, queue: DispatchQueue(label: "videoQueue"))
+        self.videoDataOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey as String: Int(kCVPixelFormatType_32BGRA)]
+        if captureSession.canAddOutput(self.videoDataOutput) {
+            captureSession.addOutput(self.videoDataOutput)
+            
+            // Set the video orientation to match the preview layer
+            if let connection = self.videoDataOutput.connection(with: .video) {
+                connection.videoOrientation = self.previewLayer.connection?.videoOrientation ?? .portrait
+            }
+        }
+        
         captureSession.startRunning()
         
         // Lastly setting the video zoom factor
@@ -214,6 +227,11 @@ class CameraController: NSObject {
 
         previewLayer.connection?.videoOrientation = videoOrientation
         photoOutput.connections.forEach { $0.videoOrientation = videoOrientation }
+        
+        // Also update video data output orientation
+        if let connection = videoDataOutput.connection(with: .video) {
+            connection.videoOrientation = videoOrientation
+        }
     }
 
     public func switchCameras() throws {
@@ -293,6 +311,7 @@ class CameraController: NSObject {
             return
         }
 
+        // Store the completion block to be called when we receive the next video frame
         self.sampleBufferCaptureCompletionBlock = completion
     }
 
@@ -517,6 +536,77 @@ 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
+    }
+}
+
 extension CameraController: UIGestureRecognizerDelegate {
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
         return true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carviz/capacitor-camera-preview",
-  "version": "7.1.1",
+  "version": "7.2.1",
   "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",