apply changes from twostraws#156

Author: weakfl

Sources/CodeScanner/ScannerViewController.swift

@@ -12,19 +12,17 @@ import UIKit
 
 @available(macCatalyst 14.0, *)
 extension CodeScannerView {
-    
+
     public final class ScannerViewController: UIViewController, UINavigationControllerDelegate {
-        private let photoOutput = AVCapturePhotoOutput()
-        private var isCapturing = false
         private var handler: ((UIImage?) -> Void)?
         var parentView: CodeScannerView!
         var codesFound = Set<String>()
         var didFinishScanning = false
         var lastTime = Date(timeIntervalSince1970: 0)
         private let showViewfinder: Bool
-        
+        private var latestSampleBuffer: CMSampleBuffer?
         let fallbackVideoCaptureDevice = AVCaptureDevice.default(for: .video)
-        
+
         private var isGalleryShowing: Bool = false {
             didSet {
                 // Update binding
@@ -44,15 +42,15 @@ extension CodeScannerView {
             self.showViewfinder = false
             super.init(coder: coder)
         }
-        
+
         func openGallery() {
             isGalleryShowing = true
             let imagePicker = UIImagePickerController()
             imagePicker.delegate = self
             imagePicker.presentationController?.delegate = self
             present(imagePicker, animated: true, completion: nil)
         }
-        
+
         @objc func openGalleryFromButton(_ sender: UIButton) {
             openGallery()
         }
@@ -99,9 +97,9 @@ extension CodeScannerView {
                 type: parentView.codeTypes.first ?? .qr, image: nil, corners: []
             ))
         }
-        
+
         #else
-        
+
         var captureSession: AVCaptureSession?
         var previewLayer: AVCaptureVideoPreviewLayer!
 
@@ -114,7 +112,7 @@ extension CodeScannerView {
             imageView.translatesAutoresizingMaskIntoConstraints = false
             return imageView
         }()
-        
+
         private lazy var manualCaptureButton: UIButton = {
             let button = UIButton(type: .system)
             let image = UIImage(named: "capture", in: .module, with: nil)
@@ -173,12 +171,12 @@ extension CodeScannerView {
 
             setupSession()
         }
-      
+
         private func setupSession() {
             guard let captureSession else {
                 return
             }
-            
+
             if previewLayer == nil {
                 previewLayer = AVCaptureVideoPreviewLayer(session: captureSession)
             }
@@ -213,7 +211,7 @@ extension CodeScannerView {
                 case .authorized:
                     self.setupCaptureDevice()
                     self.setupSession()
-                    
+
                 default:
                     break
             }
@@ -228,7 +226,7 @@ extension CodeScannerView {
                 completion?()
             }
         }
-      
+
         private func addOrientationDidChangeObserver() {
             NotificationCenter.default.addObserver(
                 self,
@@ -237,11 +235,11 @@ extension CodeScannerView {
                 object: nil
             )
         }
-      
+
         private func setBackgroundColor(_ color: UIColor = .black) {
             view.backgroundColor = color
         }
-      
+
         private func setupCaptureDevice() {
             captureSession = AVCaptureSession()
 
@@ -265,12 +263,15 @@ extension CodeScannerView {
                 return
             }
             let metadataOutput = AVCaptureMetadataOutput()
+            let videoOutput = AVCaptureVideoDataOutput()
 
             if captureSession!.canAddOutput(metadataOutput) {
                 captureSession!.addOutput(metadataOutput)
-                captureSession!.addOutput(photoOutput)
+                captureSession!.addOutput(videoOutput)
                 metadataOutput.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
                 metadataOutput.metadataObjectTypes = parentView.codeTypes
+
+                videoOutput.setSampleBufferDelegate(self, queue: DispatchQueue(label: "com.hackingwithswift.codeScanner.videoQueue"))
             } else {
                 didFail(reason: .badOutput)
                 return
@@ -337,11 +338,11 @@ extension CodeScannerView {
             device.exposureMode = AVCaptureDevice.ExposureMode.continuousAutoExposure
             device.unlockForConfiguration()
         }
-        
+
         @objc func manualCapturePressed(_ sender: Any?) {
             self.readyManualCapture()
         }
-        
+
         func showManualCaptureButton(_ isManualCapture: Bool) {
             if manualCaptureButton.superview == nil {
                 view.addSubview(manualCaptureButton)
@@ -352,11 +353,11 @@ extension CodeScannerView {
                     view.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: manualCaptureButton.bottomAnchor, constant: 32)
                 ])
             }
-            
+
             view.bringSubviewToFront(manualCaptureButton)
             manualCaptureButton.isHidden = !isManualCapture
         }
-        
+
         func showManualSelectButton(_ isManualSelect: Bool) {
             if manualSelectButton.superview == nil {
                 view.addSubview(manualSelectButton)
@@ -367,39 +368,39 @@ extension CodeScannerView {
                     view.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: manualSelectButton.bottomAnchor, constant: 32)
                 ])
             }
-            
+
             view.bringSubviewToFront(manualSelectButton)
             manualSelectButton.isHidden = !isManualSelect
         }
         #endif
-        
+
         func updateViewController(isTorchOn: Bool, isGalleryPresented: Bool, isManualCapture: Bool, isManualSelect: Bool) {
             guard let videoCaptureDevice = parentView.videoCaptureDevice ?? fallbackVideoCaptureDevice else {
                 return
             }
-            
+
             if videoCaptureDevice.hasTorch {
                 try? videoCaptureDevice.lockForConfiguration()
                 videoCaptureDevice.torchMode = isTorchOn ? .on : .off
                 videoCaptureDevice.unlockForConfiguration()
             }
-            
+
             if isGalleryPresented, !isGalleryShowing {
                 openGallery()
             }
-            
+
             #if !targetEnvironment(simulator)
             showManualCaptureButton(isManualCapture)
             showManualSelectButton(isManualSelect)
             #endif
         }
-        
+
         public func reset() {
             codesFound.removeAll()
             didFinishScanning = false
             lastTime = Date(timeIntervalSince1970: 0)
         }
-        
+
         public func readyManualCapture() {
             guard parentView.scanMode.isManual else { return }
             self.reset()
@@ -409,7 +410,7 @@ extension CodeScannerView {
         var isPastScanInterval: Bool {
             Date().timeIntervalSince(lastTime) >= parentView.scanInterval
         }
-        
+
         var isWithinManualCaptureInterval: Bool {
             Date().timeIntervalSince(lastTime) <= 0.5
         }
@@ -429,7 +430,26 @@ extension CodeScannerView {
                 self.parentView.completion(.failure(reason))
             }
         }
-        
+
+    }
+}
+
+// MARK: - AVCaptureVideoDataOutputSampleBufferDelegate
+@available(macCatalyst 14.0, *)
+extension CodeScannerView.ScannerViewController: AVCaptureVideoDataOutputSampleBufferDelegate {
+    public func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
+        latestSampleBuffer = sampleBuffer
+    }
+
+    func processFrame(_ sampleBuffer: CMSampleBuffer) {
+        guard let imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else { return }
+
+        let ciImage = CIImage(cvPixelBuffer: imageBuffer)
+
+        let context = CIContext()
+        if let cgImage = context.createCGImage(ciImage, from: ciImage.extent) {
+            handler?(UIImage(cgImage: cgImage))
+        }
     }
 }
 
@@ -443,7 +463,6 @@ extension CodeScannerView.ScannerViewController: AVCaptureMetadataOutputObjectsD
         guard let metadataObject = metadataObjects.first,
               !parentView.isPaused,
               !didFinishScanning,
-              !isCapturing,
               let readableObject = metadataObject as? AVMetadataMachineReadableCodeObject,
               let stringValue = readableObject.stringValue else {
 
@@ -484,9 +503,8 @@ extension CodeScannerView.ScannerViewController: AVCaptureMetadataOutputObjectsD
             }
         }
 
-        if parentView.requiresPhotoOutput {
-            isCapturing = true
-            photoOutput.capturePhoto(with: AVCapturePhotoSettings(), delegate: self)
+        if parentView.requiresPhotoOutput, let latestSampleBuffer {
+            self.processFrame(latestSampleBuffer)
         } else {
             handler?(nil)
         }
@@ -516,7 +534,7 @@ extension CodeScannerView.ScannerViewController: UIImagePickerControllerDelegate
         guard !features.isEmpty else {
             didFail(reason: .badOutput)
             return
-        } 
+        }
         for feature in features.compactMap({ $0 as? CIQRCodeFeature }) {
             guard let qrCodeLink = feature.messageString, !qrCodeLink.isEmpty else {
                 didFail(reason: .badOutput)
@@ -551,54 +569,16 @@ extension CodeScannerView.ScannerViewController: UIAdaptivePresentationControlle
     }
 }
 
-// MARK: - AVCapturePhotoCaptureDelegate
-
-@available(macCatalyst 14.0, *)
-extension CodeScannerView.ScannerViewController: AVCapturePhotoCaptureDelegate {
-    
-    public func photoOutput(
-        _ output: AVCapturePhotoOutput,
-        didFinishProcessingPhoto photo: AVCapturePhoto,
-        error: Error?
-    ) {
-        isCapturing = false
-        guard let imageData = photo.fileDataRepresentation() else {
-            print("Error while generating image from photo capture data.");
-            return
-        }
-        guard let qrImage = UIImage(data: imageData) else {
-            print("Unable to generate UIImage from image data.");
-            return
-        }
-        handler?(qrImage)
-    }
-    
-    public func photoOutput(
-        _ output: AVCapturePhotoOutput,
-        willCapturePhotoFor resolvedSettings: AVCaptureResolvedPhotoSettings
-    ) {
-        AudioServicesDisposeSystemSoundID(1108)
-    }
-    
-    public func photoOutput(
-        _ output: AVCapturePhotoOutput,
-        didCapturePhotoFor resolvedSettings: AVCaptureResolvedPhotoSettings
-    ) {
-        AudioServicesDisposeSystemSoundID(1108)
-    }
-    
-}
-
 // MARK: - AVCaptureDevice
 
 @available(macCatalyst 14.0, *)
 public extension AVCaptureDevice {
-    
+
     /// This returns the Ultra Wide Camera on capable devices and the default Camera for Video otherwise.
     static var bestForVideo: AVCaptureDevice? {
         let deviceHasUltraWideCamera = !AVCaptureDevice.DiscoverySession(deviceTypes: [.builtInUltraWideCamera], mediaType: .video, position: .back).devices.isEmpty
         return deviceHasUltraWideCamera ? AVCaptureDevice.default(.builtInUltraWideCamera, for: .video, position: .back) : AVCaptureDevice.default(for: .video)
     }
-    
+
 }
 #endif