expo-camera 16.0.1 → 16.0.3

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 16.0.3 — 2024-10-28
+
+### 🐛 Bug fixes
+
+- [iOS] Fix build issue with after switch to Swift concurrency. ([#32379](https://github.com/expo/expo/pull/32379) by [@Eingin](https://github.com/Eingin))
+
+## 16.0.2 — 2024-10-25
+
+_This version does not introduce any user-facing changes._
+
 ## 16.0.1 — 2024-10-24
 
 _This version does not introduce any user-facing changes._
@@ -33,6 +43,8 @@ _This version does not introduce any user-facing changes._
 - Fixed issue regarding using the "back"-facing on mobile web browswer. ([#30811](https://github.com/expo/expo/pull/30811) by [@entiendoNull](https://github.com/entiendoNull))
 - Fix `takePictureAsync` `quality` option when set to 0. ([#31587](https://github.com/expo/expo/pull/31587) by [@davidavz](https://github.com/davidavz))
 - [iOS] Fix crash related to `sublayers` on 0.75 and above on the new architecture. ([#32194](https://github.com/expo/expo/pull/32194) by [@alanjhughes](https://github.com/alanjhughes))
+- [iOS] Fix regression in running the cameras cleanup function. ([#32333](https://github.com/expo/expo/pull/32333) by [@alanjhughes](https://github.com/alanjhughes))
+- [iOS] Use an `Actor` to ensure correct order of changes to the barcode scanners outputs. ([#32353](https://github.com/expo/expo/pull/32353) by [@alanjhughes](https://github.com/alanjhughes))
 
 ### 💡 Others
 

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '16.0.1'
+version = '16.0.3'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.camera"
   defaultConfig {
     versionCode 32
-    versionName "16.0.1"
+    versionName "16.0.3"
   }
 }
 

package/ios/CameraViewModule.swift

@@ -155,7 +155,6 @@ public final class CameraViewModule: Module, ScannerResultHandler {
           view.active = active
           return
         }
-        view.active = true
       }
 
       OnViewDidUpdateProps { view in

package/ios/Current/BarcodeScanner.swift

@@ -3,8 +3,8 @@ import AVFoundation
 
 let BARCODE_TYPES_KEY = "barcodeTypes"
 
-class BarcodeScanner: NSObject, AVCaptureMetadataOutputObjectsDelegate, AVCaptureVideoDataOutputSampleBufferDelegate {
-  var onBarcodeScanned: (([String: Any]?) -> Void)?
+actor BarcodeScanner: NSObject, BarcodeScanningResponseHandler {
+  private var onBarcodeScanned: (([String: Any]?) -> Void)?
   var isScanningBarcodes = false
 
   // MARK: - Properties
@@ -21,8 +21,8 @@ class BarcodeScanner: NSObject, AVCaptureMetadataOutputObjectsDelegate, AVCaptur
     AVMetadataObject.ObjectType.code39: ZXCode39Reader()
   ]
   private var previewLayer: AVCaptureVideoPreviewLayer?
-  private var zxingFPSProcessed = 6.0
   private var zxingEnabled = true
+  private var delegate: MetatDataDelegate?
 
   init(session: AVCaptureSession, sessionQueue: DispatchQueue) {
     self.session = session
@@ -42,7 +42,7 @@ class BarcodeScanner: NSObject, AVCaptureMetadataOutputObjectsDelegate, AVCaptur
         let zxingCoveredTypes = Set(zxingBarcodeReaders.keys)
         zxingEnabled = !zxingCoveredTypes.isDisjoint(with: newTypes)
         Task {
-          await self.maybeStartBarcodeScanning()
+          await maybeStartBarcodeScanning()
         }
       }
     }
@@ -52,23 +52,21 @@ class BarcodeScanner: NSObject, AVCaptureMetadataOutputObjectsDelegate, AVCaptur
     self.previewLayer = layer
   }
 
-  func setIsEnabled(_ enabled: Bool) {
+  func setIsEnabled(_ enabled: Bool) async {
     guard isScanningBarcodes != enabled else {
       return
     }
 
     isScanningBarcodes = enabled
-    Task {
-      if isScanningBarcodes {
-        if metadataOutput != nil {
-          setConnection(enabled: true)
-        } else {
-          await maybeStartBarcodeScanning()
-        }
+    if isScanningBarcodes {
+      if metadataOutput != nil {
+        setConnection(enabled: true)
       } else {
-        setConnection(enabled: false)
-        await stopBarcodeScanning()
+        await maybeStartBarcodeScanning()
       }
+    } else {
+      setConnection(enabled: false)
+      await stopBarcodeScanning()
     }
   }
 
@@ -78,6 +76,10 @@ class BarcodeScanner: NSObject, AVCaptureMetadataOutputObjectsDelegate, AVCaptur
     }
   }
 
+  func setOnBarcodeScanned(_ onBarcodeScanned: @escaping ([String: Any]?) -> Void) {
+    self.onBarcodeScanned = onBarcodeScanned
+  }
+
   func maybeStartBarcodeScanning() async {
     guard isScanningBarcodes else {
       return
@@ -105,43 +107,20 @@ class BarcodeScanner: NSObject, AVCaptureMetadataOutputObjectsDelegate, AVCaptur
     }
   }
 
-  func scanBarcodes(from image: CGImage, completion: @escaping (ZXResult) -> Void) {
-    let source = ZXCGImageLuminanceSource(cgImage: image)
-    let binarizer = ZXHybridBinarizer(source: source)
-    let bitmap = ZXBinaryBitmap(binarizer: binarizer)
-
-    var result: ZXResult?
-
-    for reader in zxingBarcodeReaders.values {
-      result = try? reader.decode(bitmap, hints: nil)
-      if result != nil {
-        break
-      }
-    }
-
-    if result == nil && bitmap?.rotateSupported == true {
-      if let rotatedBitmap = bitmap?.rotateCounterClockwise() {
-        for reader in zxingBarcodeReaders.values {
-          result = try? reader.decode(rotatedBitmap, hints: nil)
-          if result != nil {
-            break
-          }
-        }
-      }
-    }
-
-    if let result {
-      completion(result)
-    }
-  }
-
   private func addOutputs() async {
     session.beginConfiguration()
     defer { session.commitConfiguration() }
 
+    delegate = MetatDataDelegate(
+      settings: settings,
+      previewLayer: previewLayer,
+      zxingBarcodeReaders: zxingBarcodeReaders,
+      zxingEnabled: zxingEnabled,
+      metadataResultHandler: self)
+
     if metadataOutput == nil {
       let output = AVCaptureMetadataOutput()
-      output.setMetadataObjectsDelegate(self, queue: sessionQueue)
+      output.setMetadataObjectsDelegate(delegate, queue: sessionQueue)
       if session.canAddOutput(output) {
         session.addOutput(output)
         metadataOutput = output
@@ -152,7 +131,7 @@ class BarcodeScanner: NSObject, AVCaptureMetadataOutputObjectsDelegate, AVCaptur
       let output = AVCaptureVideoDataOutput()
       output.videoSettings = [kCVPixelBufferPixelFormatTypeKey as String: kCVPixelFormatType_32BGRA]
       output.alwaysDiscardsLateVideoFrames = true
-      output.setSampleBufferDelegate(self, queue: zxingCaptureQueue)
+      output.setSampleBufferDelegate(delegate, queue: zxingCaptureQueue)
       if session.canAddOutput(output) {
         session.addOutput(output)
         videoDataOutput = output
@@ -179,55 +158,7 @@ class BarcodeScanner: NSObject, AVCaptureMetadataOutputObjectsDelegate, AVCaptur
     }
   }
 
-  func metadataOutput(_ output: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from connection: AVCaptureConnection) {
-    guard let settings = settings[BARCODE_TYPES_KEY], let metadataOutput else {
-      return
-    }
-
-    for metadata in metadataObjects {
-      var codeMetadata = metadata as? AVMetadataMachineReadableCodeObject
-      if let previewLayer {
-        codeMetadata = previewLayer.transformedMetadataObject(for: metadata) as? AVMetadataMachineReadableCodeObject
-      }
-
-      for barcodeType in settings {
-        if zxingBarcodeReaders[barcodeType] != nil {
-          continue
-        }
-
-        if let codeMetadata {
-          if codeMetadata.stringValue != nil && codeMetadata.type == barcodeType {
-            onBarcodeScanned?(BarcodeScannerUtils.avMetadataCodeObjectToDictionary(codeMetadata))
-          }
-        }
-      }
-    }
-  }
-
-  func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
-    guard let barcodeTypes = settings[BARCODE_TYPES_KEY],
-      let metadataOutput,
-      zxingEnabled else {
-      return
-    }
-
-    let kMinMargin = 1.0 / zxingFPSProcessed
-    let presentTimeStamp = CMSampleBufferGetPresentationTimeStamp(sampleBuffer)
-
-    var curFrameTimeStamp = 0.0
-    var lastFrameTimeStamp = 0.0
-
-    curFrameTimeStamp = Double(presentTimeStamp.value) / Double(presentTimeStamp.timescale)
-
-    if curFrameTimeStamp - lastFrameTimeStamp > Double(kMinMargin) {
-      lastFrameTimeStamp = curFrameTimeStamp
-
-      if let videoFrame = CMSampleBufferGetImageBuffer(sampleBuffer),
-      let videoFrameImage = ZXCGImageLuminanceSource.createImage(from: videoFrame) {
-        self.scanBarcodes(from: videoFrameImage) { barcodeScannerResult in
-          self.onBarcodeScanned?(BarcodeScannerUtils.zxResultToDictionary(barcodeScannerResult))
-        }
-      }
-    }
+  func onScanningResult(_ result: [String: Any]) {
+    self.onBarcodeScanned?(result)
   }
 }

package/ios/Current/CameraView.swift

@@ -49,7 +49,9 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
 
   var isScanningBarcodes = false {
     didSet {
-      barcodeScanner.setIsEnabled(isScanningBarcodes)
+      Task {
+        await barcodeScanner.setIsEnabled(isScanningBarcodes)
+      }
     }
   }
 
@@ -145,7 +147,7 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     UIDevice.current.beginGeneratingDeviceOrientationNotifications()
     NotificationCenter.default.addObserver(
       self,
-      selector: #selector(orientationChanged(notification:)),
+      selector: #selector(orientationChanged),
       name: UIDevice.orientationDidChangeNotification,
       object: nil)
     lifecycleManager?.register(self)
@@ -303,7 +305,9 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
   }
 
   func setBarcodeScannerSettings(settings: BarcodeSettings) {
-    barcodeScanner.setSettings([BARCODE_TYPES_KEY: settings.toMetadataObjectType()])
+    Task {
+      await barcodeScanner.setSettings([BARCODE_TYPES_KEY: settings.toMetadataObjectType()])
+    }
   }
 
   func updateResponsiveOrientation() {
@@ -592,12 +596,6 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     }
   }
 
-  public override func didMoveToWindow() {
-    if window == nil {
-      cleanupCamera()
-    }
-  }
-
   func updateSessionAudioIsMuted() async {
     session.beginConfiguration()
     defer { session.commitConfiguration() }
@@ -655,12 +653,12 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     self.layer.insertSublayer(previewLayer, at: 0)
   }
 
-  private func cleanupCamera() {
-    cameraShouldInit = true
-    lifecycleManager?.unregisterAppLifecycleListener(self)
+  public override func removeFromSuperview() {
+    super.removeFromSuperview()
     Task {
       await stopSession()
     }
+    lifecycleManager?.unregisterAppLifecycleListener(self)
     UIDevice.current.endGeneratingDeviceOrientationNotifications()
     NotificationCenter.default.removeObserver(self, name: UIDevice.orientationDidChangeNotification, object: nil)
   }
@@ -751,8 +749,6 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     #if targetEnvironment(simulator)
     return
     #endif
-//    self.previewLayer.layer.removeFromSuperlayer()
-
     session.beginConfiguration()
     for input in self.session.inputs {
       session.removeInput(input)
@@ -778,8 +774,10 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     previewLayer.connection?.isEnabled = false
   }
 
-  @objc func orientationChanged(notification: Notification) async {
-    await changePreviewOrientation()
+  @objc func orientationChanged() {
+    Task {
+      await changePreviewOrientation()
+    }
   }
 
   @MainActor
@@ -794,13 +792,16 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
 
   private func createBarcodeScanner() -> BarcodeScanner {
     let scanner = BarcodeScanner(session: session, sessionQueue: sessionQueue)
-    scanner.setPreviewLayer(layer: previewLayer)
-    scanner.onBarcodeScanned = { [weak self] body in
-      guard let self else {
-        return
-      }
-      if let body {
-        self.onBarcodeScanned(body)
+
+    Task {
+      await scanner.setPreviewLayer(layer: previewLayer)
+      await scanner.setOnBarcodeScanned { [weak self] body in
+        guard let self else {
+          return
+        }
+        if let body {
+          self.onBarcodeScanned(body)
+        }
       }
     }
 

package/ios/Current/MetatDataDelegate.swift

@@ -0,0 +1,112 @@
+import ZXingObjC
+
+protocol BarcodeScanningResponseHandler {
+  func onScanningResult(_ result: [String: Any]) async
+}
+
+class MetatDataDelegate: NSObject, AVCaptureMetadataOutputObjectsDelegate, AVCaptureVideoDataOutputSampleBufferDelegate {
+  private var settings: [String: [AVMetadataObject.ObjectType]]
+  private var previewLayer: AVCaptureVideoPreviewLayer?
+  private var zxingBarcodeReaders: [AVMetadataObject.ObjectType: ZXReader]
+  private var zxingEnabled = true
+  private var zxingFPSProcessed = 6.0
+  private let responseHandler: BarcodeScanningResponseHandler
+
+  init(
+    settings: [String: [AVMetadataObject.ObjectType]],
+    previewLayer: AVCaptureVideoPreviewLayer?,
+    zxingBarcodeReaders: [AVMetadataObject.ObjectType: ZXReader],
+    zxingEnabled: Bool,
+    metadataResultHandler: BarcodeScanningResponseHandler
+  ) {
+    self.settings = settings
+    self.previewLayer = previewLayer
+    self.zxingEnabled = zxingEnabled
+    self.responseHandler = metadataResultHandler
+    self.zxingBarcodeReaders = zxingBarcodeReaders
+  }
+
+  func metadataOutput(_ output: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from connection: AVCaptureConnection) {
+    guard let settings = settings[BARCODE_TYPES_KEY] else {
+      return
+    }
+
+    for metadata in metadataObjects {
+      var codeMetadata = metadata as? AVMetadataMachineReadableCodeObject
+      if let previewLayer {
+        codeMetadata = previewLayer.transformedMetadataObject(for: metadata) as? AVMetadataMachineReadableCodeObject
+      }
+
+      for barcodeType in settings {
+        if zxingBarcodeReaders[barcodeType] != nil {
+          continue
+        }
+
+        if let codeMetadata {
+          if codeMetadata.stringValue != nil && codeMetadata.type == barcodeType {
+            Task {
+              await responseHandler.onScanningResult(BarcodeScannerUtils.avMetadataCodeObjectToDictionary(codeMetadata))
+            }
+          }
+        }
+      }
+    }
+  }
+
+  func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
+    guard zxingEnabled else {
+      return
+    }
+
+    let kMinMargin = 1.0 / zxingFPSProcessed
+    let presentTimeStamp = CMSampleBufferGetPresentationTimeStamp(sampleBuffer)
+
+    var curFrameTimeStamp = 0.0
+    var lastFrameTimeStamp = 0.0
+
+    curFrameTimeStamp = Double(presentTimeStamp.value) / Double(presentTimeStamp.timescale)
+
+    if curFrameTimeStamp - lastFrameTimeStamp > Double(kMinMargin) {
+      lastFrameTimeStamp = curFrameTimeStamp
+
+      if let videoFrame = CMSampleBufferGetImageBuffer(sampleBuffer),
+      let videoFrameImage = ZXCGImageLuminanceSource.createImage(from: videoFrame) {
+        self.scanBarcodes(from: videoFrameImage) { barcodeScannerResult in
+          Task {
+            await self.responseHandler.onScanningResult(BarcodeScannerUtils.zxResultToDictionary(barcodeScannerResult))
+          }
+        }
+      }
+    }
+  }
+
+  func scanBarcodes(from image: CGImage, completion: @escaping (ZXResult) -> Void) {
+    let source = ZXCGImageLuminanceSource(cgImage: image)
+    let binarizer = ZXHybridBinarizer(source: source)
+    let bitmap = ZXBinaryBitmap(binarizer: binarizer)
+
+    var result: ZXResult?
+
+    for reader in zxingBarcodeReaders.values {
+      result = try? reader.decode(bitmap, hints: nil)
+      if result != nil {
+        break
+      }
+    }
+
+    if result == nil && bitmap?.rotateSupported == true {
+      if let rotatedBitmap = bitmap?.rotateCounterClockwise() {
+        for reader in zxingBarcodeReaders.values {
+          result = try? reader.decode(rotatedBitmap, hints: nil)
+          if result != nil {
+            break
+          }
+        }
+      }
+    }
+
+    if let result {
+      completion(result)
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-camera",
-  "version": "16.0.1",
+  "version": "16.0.3",
   "description": "A React component that renders a preview for the device's either front or back camera. Camera's parameters like zoom, auto focus, white balance and flash mode are adjustable. With expo-camera, one can also take photos and record videos that are saved to the app's cache. Morever, the component is also capable of detecting faces and bar codes appearing on the preview.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -50,5 +50,5 @@
       "optional": true
     }
   },
-  "gitHead": "2e4f18d41da033c5ced0a4a045d91cf5250016b7"
+  "gitHead": "fc8a1408cab82e003dd2424db2994d7dea958067"
 }