expo-camera 16.0.15 → 16.0.16

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 16.0.16 — 2025-02-10
+
+_This version does not introduce any user-facing changes._
+
 ## 16.0.15 — 2025-02-06
 
 _This version does not introduce any user-facing changes._
@@ -36,6 +40,8 @@ _This version does not introduce any user-facing changes._
 - [Android] Fix an issue where the camera image is pixelated when using the gl integration. ([#34174](https://github.com/expo/expo/pull/34174) by [@alanjhughes](https://github.com/alanjhughes))
 - [Android] Fix setting the camera preview provider. ([#34302](https://github.com/expo/expo/pull/34302) by [@alanjhughes](https://github.com/alanjhughes))
 - [iOS] Fix initial roation when used with `react-native-screens`. ([#34721](https://github.com/expo/expo/pull/34721) by [@alanjhughes](https://github.com/alanjhughes))
+- [iOS] Fix performance regression. ([#34750](https://github.com/expo/expo/pull/34750) by [@alanjhughes](https://github.com/alanjhughes))
+- [Android] Attempt to fix `setLinearZoom` incompatability with some devices. ([#34757](https://github.com/expo/expo/pull/34757) by [@alanjhughes](https://github.com/alanjhughes))
 
 ## 16.0.10 — 2024-12-16
 

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '16.0.15'
+version = '16.0.16'
 
 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.15"
+    versionName "16.0.16"
   }
 }
 

package/android/src/main/java/expo/modules/camera/ExpoCameraView.kt

@@ -81,6 +81,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import java.io.File
+import java.lang.Float.max
+import java.lang.Float.min
 import kotlin.math.roundToInt
 import kotlin.properties.Delegates
 
@@ -150,7 +152,7 @@ class ExpoCameraView(
   var zoom: Float = 0f
     set(value) {
       field = value
-      camera?.cameraControl?.setLinearZoom(value.coerceIn(0f, 1f))
+      setCameraZoom(value)
     }
 
   var autoFocus: FocusMode = FocusMode.OFF
@@ -431,7 +433,7 @@ class ExpoCameraView(
             observeCameraState(it.cameraInfo)
           }
           // Set the previous zoom level after recreating the camera
-          camera?.cameraControl?.setLinearZoom(zoom.coerceIn(0f, 1f))
+          setCameraZoom(zoom)
           this.cameraProvider = cameraProvider
         } catch (e: Exception) {
           onMountError(
@@ -544,6 +546,12 @@ class ExpoCameraView(
     }
   }
 
+  private fun setCameraZoom(value: Float) {
+    val maxZoomRatio = camera?.cameraInfo?.zoomState?.value?.maxZoomRatio ?: 1f
+    val targetZoomRatio = max(1f, min(maxZoomRatio, value.coerceIn(0f, 1f) * maxZoomRatio))
+    camera?.cameraControl?.setZoomRatio(targetZoomRatio)
+  }
+
   private fun observeCameraState(cameraInfo: CameraInfo) {
     cameraInfo.cameraState.observe(currentActivity) {
       when (it.type) {

package/ios/CameraViewModule.swift

@@ -76,27 +76,48 @@ public final class CameraViewModule: Module, ScannerResultHandler {
         if let type, view.presetCamera != type.toPosition() {
           view.presetCamera = type.toPosition()
         }
+        // the prop has been removed, reset to default
+        if type == nil && view.presetCamera != .back {
+          view.presetCamera = .back
+        }
       }
 
       Prop("flashMode") { (view, flashMode: FlashMode?) in
         if let flashMode, view.flashMode != flashMode {
           view.flashMode = flashMode
         }
+        if flashMode == nil && view.flashMode != .auto {
+          view.flashMode = .auto
+        }
       }
 
       Prop("enableTorch") { (view, enabled: Bool?) in
-        view.torchEnabled = enabled ?? false
+        if let enabled, view.torchEnabled != enabled {
+          view.torchEnabled = enabled
+          return
+        }
+        if enabled == nil && view.torchEnabled {
+          view.torchEnabled = false
+        }
       }
 
       Prop("pictureSize") { (view, pictureSize: PictureSize?) in
         if let pictureSize, view.pictureSize != pictureSize {
           view.pictureSize = pictureSize
+          return
+        }
+        if pictureSize == nil && view.pictureSize != .high {
+          view.pictureSize = .high
         }
       }
 
       Prop("zoom") { (view, zoom: Double?) in
         if let zoom, fabs(view.zoom - zoom) > Double.ulpOfOne {
           view.zoom = zoom
+          return
+        }
+        if zoom == nil && view.zoom != 0 {
+          view.zoom = 0
         }
       }
 
@@ -104,11 +125,18 @@ public final class CameraViewModule: Module, ScannerResultHandler {
         if let mode, view.mode != mode {
           view.mode = mode
         }
+        if mode == nil && view.mode != .picture {
+          view.mode = .picture
+        }
       }
 
       Prop("barcodeScannerEnabled") { (view, scanBarcodes: Bool?) in
         if let scanBarcodes, view.isScanningBarcodes != scanBarcodes {
           view.isScanningBarcodes = scanBarcodes
+          return
+        }
+        if scanBarcodes == nil && view.isScanningBarcodes != false {
+          view.isScanningBarcodes = false
         }
       }
 
@@ -119,56 +147,71 @@ public final class CameraViewModule: Module, ScannerResultHandler {
       }
 
       Prop("mute") { (view, muted: Bool?) in
-        view.isMuted = muted ?? false
+        if let muted, view.isMuted != muted {
+          view.isMuted = muted
+          return
+        }
+        if muted == nil && view.isMuted != false {
+          view.isMuted = false
+        }
       }
 
       Prop("animateShutter") { (view, animate: Bool?) in
+        // Does not call anything that immediately causes any configuration changes
+        // so it's fine to just set it
         view.animateShutter = animate ?? true
       }
 
       Prop("videoQuality") { (view, quality: VideoQuality?) in
-        view.videoQuality = quality ?? .video1080p
+        if let quality, view.videoQuality != quality {
+          view.videoQuality = quality
+          return
+        }
+        if quality == nil && view.videoQuality != .video1080p {
+          view.videoQuality = .video1080p
+        }
       }
 
       Prop("autoFocus") { (view, focusMode: FocusMode?) in
-        view.autoFocus = focusMode?.toAVCaptureFocusMode() ?? .continuousAutoFocus
+        if let focusMode, view.autoFocus != focusMode.toAVCaptureFocusMode() {
+          view.autoFocus = focusMode.toAVCaptureFocusMode()
+          return
+        }
+        if focusMode == nil && view.autoFocus != .continuousAutoFocus {
+          view.autoFocus = .continuousAutoFocus
+        }
       }
 
       Prop("responsiveOrientationWhenOrientationLocked") { (view, responsiveOrientation: Bool?) in
         if let responsiveOrientation, view.responsiveWhenOrientationLocked != responsiveOrientation {
           view.responsiveWhenOrientationLocked = responsiveOrientation
+          return
+        }
+        if responsiveOrientation == nil && view.responsiveWhenOrientationLocked != false {
+          view.responsiveWhenOrientationLocked = false
         }
       }
 
       Prop("mirror") { (view, mirror: Bool?) in
-        if let mirror {
-          view.mirror = mirror
-          return
-        }
-        view.mirror = false
+        // Does not call anything that immediately causes any configuration changes
+        // so it's fine to just set it
+        view.mirror = mirror ?? false
       }
 
       Prop("active") { (view, active: Bool?) in
-        if let active {
+        if let active, view.active != active {
           view.active = active
           return
         }
-      }
-
-      Prop("videoBitrate") { (view, bitrate: Int?) in
-        if let bitrate {
-          view.videoBitrate = bitrate
-          return
-        }
-        if view.videoBitrate != nil {
-          view.videoBitrate = nil
+        if active == nil && view.active != true {
+          view.active = true
         }
       }
 
-      OnViewDidUpdateProps { view in
-        Task {
-          await view.initCamera()
-        }
+      Prop("videoBitrate") { (view, bitrate: Int?) in
+        // Does not call anything that immediately causes any configuration changes
+        // so it's fine to just set it
+        view.videoBitrate = bitrate
       }
 
       AsyncFunction("resumePreview") { view in

package/ios/Current/BarcodeScanner.swift

@@ -108,9 +108,6 @@ actor BarcodeScanner: NSObject, BarcodeScanningResponseHandler {
   }
 
   private func addOutputs() async {
-    session.beginConfiguration()
-    defer { session.commitConfiguration() }
-
     delegate = MetaDataDelegate(
       settings: settings,
       previewLayer: previewLayer,
@@ -118,6 +115,7 @@ actor BarcodeScanner: NSObject, BarcodeScanningResponseHandler {
       zxingEnabled: zxingEnabled,
       metadataResultHandler: self)
 
+    session.beginConfiguration()
     if metadataOutput == nil {
       let output = AVCaptureMetadataOutput()
       output.setMetadataObjectsDelegate(delegate, queue: sessionQueue)
@@ -137,6 +135,7 @@ actor BarcodeScanner: NSObject, BarcodeScanningResponseHandler {
         videoDataOutput = output
       }
     }
+    session.commitConfiguration()
   }
 
   private func removeOutputs() async {

package/ios/Current/CameraView.swift

@@ -26,7 +26,6 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     mm.gyroUpdateInterval = 0.2
     return mm
   }()
-  private var cameraShouldInit = true
   private var isSessionPaused = false
 
   // MARK: Property Observers
@@ -39,8 +38,8 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
 
   var videoQuality: VideoQuality = .video1080p {
     didSet {
-      Task {
-        await updateSessionPreset(preset: videoQuality.toPreset())
+      sessionQueue.async {
+        self.updateSessionPreset(preset: self.videoQuality.toPreset())
       }
     }
   }
@@ -57,7 +56,9 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
 
   var presetCamera = AVCaptureDevice.Position.back {
     didSet {
-      updateType()
+      sessionQueue.async {
+        self.updateDevice()
+      }
     }
   }
 
@@ -77,31 +78,31 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
 
   var pictureSize = PictureSize.high {
     didSet {
-      Task {
-        await updatePictureSize()
-      }
+      updatePictureSize()
     }
   }
 
   var mode = CameraMode.picture {
     didSet {
-      Task {
-        await setCameraMode()
+      sessionQueue.async {
+        self.setCameraMode()
       }
     }
   }
 
   var isMuted = false {
     didSet {
-      Task {
-        await updateSessionAudioIsMuted()
+      sessionQueue.async {
+        self.updateSessionAudioIsMuted()
       }
     }
   }
 
   var active = true {
     didSet {
-      updateCameraIsActive()
+      sessionQueue.async {
+        self.updateCameraIsActive()
+      }
     }
   }
 
@@ -154,6 +155,7 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
       name: UIDevice.orientationDidChangeNotification,
       object: nil)
     lifecycleManager?.register(self)
+    initializeCaptureSessionInput()
   }
 
   private func setupPreview() {
@@ -161,44 +163,51 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     previewLayer.needsDisplayOnBoundsChange = true
   }
 
-  func initCamera() async {
-    guard cameraShouldInit else {
+  private func updateDevice() {
+    guard let device = ExpoCameraUtils.device(with: .video, preferring: presetCamera) else {
       return
     }
-    cameraShouldInit = false
-    await initializeCaptureSessionInput()
-  }
 
-  private func updateType() {
-    cameraShouldInit = true
+    session.beginConfiguration()
+    defer { session.commitConfiguration() }
+    if let captureDeviceInput {
+      session.removeInput(captureDeviceInput)
+    }
+
+    do {
+      let deviceInput = try AVCaptureDeviceInput(device: device)
+      if session.canAddInput(deviceInput) {
+        session.addInput(deviceInput)
+        captureDeviceInput = deviceInput
+        updateZoom()
+      }
+    } catch {
+      onMountError(["message": "Camera could not be started - \(error.localizedDescription)"])
+    }
   }
 
   public func onAppForegrounded() {
     if !session.isRunning && isSessionPaused {
       isSessionPaused = false
-      sessionQueue.async {
-        self.session.startRunning()
-        self.enableTorch()
-      }
+      session.startRunning()
+      enableTorch()
     }
   }
 
   public func onAppBackgrounded() {
     if session.isRunning && !isSessionPaused {
       isSessionPaused = true
-      sessionQueue.async {
-        self.session.stopRunning()
-      }
+      session.stopRunning()
     }
   }
 
-  private func updatePictureSize() async {
+  private func updatePictureSize() {
 #if !targetEnvironment(simulator)
-    session.beginConfiguration()
-    defer { session.commitConfiguration() }
-    let preset = pictureSize.toCapturePreset()
-    if session.canSetSessionPreset(preset) {
-      session.sessionPreset = preset
+    sessionQueue.async {
+      let preset = self.pictureSize.toCapturePreset()
+      if self.session.canSetSessionPreset(preset) {
+        self.session.sessionPreset = preset
+      }
     }
 #endif
   }
@@ -236,18 +245,18 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     device.unlockForConfiguration()
   }
 
-  private func setCameraMode() async {
+  private func setCameraMode() {
     if mode == .video {
       if videoFileOutput == nil {
-        await setupMovieFileCapture()
+        setupMovieFileCapture()
       }
-      await updateSessionAudioIsMuted()
+      updateSessionAudioIsMuted()
     } else {
-      await cleanupMovieFileCapture()
+      cleanupMovieFileCapture()
     }
   }
 
-  private func startSession() async {
+  private func startSession() {
 #if targetEnvironment(simulator)
     return
 #else
@@ -262,17 +271,19 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
 
     let photoOutput = AVCapturePhotoOutput()
     photoOutput.isLivePhotoCaptureEnabled = false
+    session.beginConfiguration()
     if session.canAddOutput(photoOutput) {
       session.addOutput(photoOutput)
       self.photoOutput = photoOutput
     }
 
     session.sessionPreset = mode == .video ? pictureSize.toCapturePreset() : .photo
-    addErrorNotification()
-    await changePreviewOrientation()
-
-    await barcodeScanner?.maybeStartBarcodeScanning()
     session.commitConfiguration()
+    addErrorNotification()
+    changePreviewOrientation()
+    Task.detached(priority: .userInitiated, operation: {
+      await self.barcodeScanner?.maybeStartBarcodeScanning()
+    })
     updateCameraIsActive()
     onCameraReady()
     enableTorch()
@@ -303,7 +314,9 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
         if !session.isRunning {
           session.startRunning()
         }
-        await updateSessionAudioIsMuted()
+        sessionQueue.async {
+          self.updateSessionAudioIsMuted()
+        }
         onCameraReady()
       }
     }
@@ -593,14 +606,14 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
         self.videoCodecType = codecType
       } else {
         promise.reject(CameraRecordingException(options.codec?.rawValue))
-        await cleanupMovieFileCapture()
+        cleanupMovieFileCapture()
         videoRecordedPromise = nil
         isValidVideoOptions = false
       }
     }
   }
 
-  func updateSessionAudioIsMuted() async {
+  func updateSessionAudioIsMuted() {
     session.beginConfiguration()
     defer { session.commitConfiguration() }
 
@@ -629,21 +642,17 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     }
   }
 
-  func setupMovieFileCapture() async {
+  func setupMovieFileCapture() {
     let output = AVCaptureMovieFileOutput()
     if session.canAddOutput(output) {
-      session.beginConfiguration()
-      defer { session.commitConfiguration() }
       session.addOutput(output)
       videoFileOutput = output
     }
   }
 
-  func cleanupMovieFileCapture() async {
+  func cleanupMovieFileCapture() {
     if let videoFileOutput {
       if session.outputs.contains(videoFileOutput) {
-        session.beginConfiguration()
-        defer { session.commitConfiguration() }
         session.removeOutput(videoFileOutput)
         self.videoFileOutput = nil
       }
@@ -659,8 +668,8 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
 
   public override func removeFromSuperview() {
     super.removeFromSuperview()
-    Task {
-      await stopSession()
+    sessionQueue.async {
+      self.stopSession()
     }
     lifecycleManager?.unregisterAppLifecycleListener(self)
     UIDevice.current.endGeneratingDeviceOrientationNotifications()
@@ -704,15 +713,11 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     videoCodecType = nil
   }
 
-  func setPresetCamera(presetCamera: AVCaptureDevice.Position) {
-    self.presetCamera = presetCamera
-  }
-
   func stopRecording() {
     videoFileOutput?.stopRecording()
   }
 
-  func updateSessionPreset(preset: AVCaptureSession.Preset) async {
+  func updateSessionPreset(preset: AVCaptureSession.Preset) {
 #if !targetEnvironment(simulator)
     if session.canSetSessionPreset(preset) {
       if session.sessionPreset != preset {
@@ -720,36 +725,25 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
         defer { session.commitConfiguration() }
         session.sessionPreset = preset
       }
+    } else {
+      // The selected preset cannot be used on the current device so we fall back to the highest available.
+      if session.sessionPreset != .high {
+        session.beginConfiguration()
+        defer { session.commitConfiguration() }
+        session.sessionPreset = .high
+      }
     }
 #endif
   }
 
-  func initializeCaptureSessionInput() async {
-    session.beginConfiguration()
-
-    guard let device = ExpoCameraUtils.device(with: .video, preferring: presetCamera) else {
-      return
-    }
-
-    if let captureDeviceInput {
-      session.removeInput(captureDeviceInput)
-    }
-
-    do {
-      let deviceInput = try AVCaptureDeviceInput(device: device)
-
-      if session.canAddInput(deviceInput) {
-        session.addInput(deviceInput)
-        captureDeviceInput = deviceInput
-        updateZoom()
-      }
-    } catch {
-      onMountError(["message": "Camera could not be started - \(error.localizedDescription)"])
+  func initializeCaptureSessionInput() {
+    sessionQueue.async {
+      self.updateDevice()
+      self.startSession()
     }
-    await startSession()
   }
 
-  private func stopSession() async {
+  private func stopSession() {
 #if targetEnvironment(simulator)
     return
 #else
@@ -761,7 +755,9 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     for output in session.outputs {
       session.removeOutput(output)
     }
-    await barcodeScanner?.stopBarcodeScanning()
+    Task {
+      await barcodeScanner?.stopBarcodeScanning()
+    }
     session.commitConfiguration()
 
     motionManager.stopAccelerometerUpdates()
@@ -785,13 +781,14 @@ public class CameraView: ExpoView, EXAppLifecycleListener,
     }
   }
 
-  @MainActor
-  func changePreviewOrientation() async {
+  func changePreviewOrientation() {
     // We shouldn't access the device orientation anywhere but on the main thread
-    let videoOrientation = ExpoCameraUtils.videoOrientation(for: deviceOrientation)
-    if (previewLayer.connection?.isVideoOrientationSupported) == true {
-      physicalOrientation = ExpoCameraUtils.physicalOrientation(for: deviceOrientation)
-      previewLayer.connection?.videoOrientation = videoOrientation
+    Task { @MainActor in
+      let videoOrientation = ExpoCameraUtils.videoOrientation(for: deviceOrientation)
+      if (previewLayer.connection?.isVideoOrientationSupported) == true {
+        physicalOrientation = ExpoCameraUtils.physicalOrientation(for: deviceOrientation)
+        previewLayer.connection?.videoOrientation = videoOrientation
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-camera",
-  "version": "16.0.15",
+  "version": "16.0.16",
   "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": "9442f00874e0cd738030abae80e5bdef184a2581"
+  "gitHead": "81941fa03383e748ba1b6345d9ca0d048bb5c4d1"
 }