expo-camera 15.0.1 → 15.0.2

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 15.0.2 — 2024-04-24
+
+### 🐛 Bug fixes
+
+- On `iOS`, fixed regression where recording a video captures dark frames. Reduced frequency of camera initialization. ([#28427](https://github.com/expo/expo/pull/28427) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 15.0.1 — 2024-04-23
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

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

package/ios/CameraViewModule.swift

@@ -88,9 +88,7 @@ public final class CameraViewModule: Module, ScannerResultHandler {
       }
 
       Prop("mute") { (view, muted: Bool?) in
-        if let muted, view.isMuted != muted {
-          view.isMuted = muted
-        }
+        view.isMuted = muted ?? false
       }
 
       Prop("animateShutter") { (view, animate: Bool?) in
@@ -109,6 +107,10 @@ public final class CameraViewModule: Module, ScannerResultHandler {
         }
       }
 
+      OnViewDidUpdateProps { view in
+        view.initCamera()
+      }
+
       AsyncFunction("getAvailablePictureSizes") { (_: String?) in
         return PictureSize.allCases.map {
           $0.rawValue

package/ios/Current/CameraView.swift

@@ -28,6 +28,7 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
     mm.gyroUpdateInterval = 0.2
     return mm
   }()
+  private var cameraShouldInit = true
 
   // MARK: Property Observers
 
@@ -124,8 +125,6 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
     setupPreview()
     #endif
     UIDevice.current.beginGeneratingDeviceOrientationNotifications()
-    initializeCaptureSessionInput()
-    startSession()
     NotificationCenter.default.addObserver(
       self,
       selector: #selector(orientationChanged(notification:)),
@@ -140,13 +139,16 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
     previewLayer.videoPreviewLayer.needsDisplayOnBoundsChange = true
   }
 
-  private func updateType() {
-    sessionQueue.async {
-      self.initializeCaptureSessionInput()
-      if !self.session.isRunning {
-        self.startSession()
-      }
+  func initCamera() {
+    guard cameraShouldInit else {
+      return
     }
+    cameraShouldInit = false
+    self.initializeCaptureSessionInput()
+  }
+
+  private func updateType() {
+    cameraShouldInit = true
   }
 
   public func onAppForegrounded() {
@@ -199,7 +201,6 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
       if self.mode == .video {
         if self.videoFileOutput == nil {
           self.setupMovieFileCapture()
-          self.updateSessionAudioIsMuted()
         }
       } else {
         self.cleanupMovieFileCapture()
@@ -230,16 +231,13 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
 
       self.addErrorNotification()
       self.changePreviewOrientation()
-      self.session.commitConfiguration()
+    }
 
-      // Delay starting the scanner
-      self.sessionQueue.asyncAfter(deadline: .now() + 0.5) {
-        self.barcodeScanner.maybeStartBarcodeScanning()
-        if !self.session.isRunning {
-          self.session.startRunning()
-        }
-        self.onCameraReady()
-      }
+    // Delay starting the scanner
+    sessionQueue.asyncAfter(deadline: .now() + 0.5) {
+      self.barcodeScanner.maybeStartBarcodeScanning()
+      self.session.startRunning()
+      self.onCameraReady()
     }
   }
 
@@ -512,6 +510,13 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
   }
 
   func record(options: CameraRecordingOptions, promise: Promise) {
+    sessionQueue.async {
+      let preset = options.quality?.toPreset()
+      if let preset {
+        self.updateSessionPreset(preset: preset)
+      }
+    }
+
     sessionQueue.async {
       if let videoFileOutput = self.videoFileOutput, !videoFileOutput.isRecording && self.videoRecordedPromise == nil {
         if let connection = videoFileOutput.connection(with: .video) {
@@ -532,9 +537,6 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
           }
         }
 
-        let preset = options.quality?.toPreset() ?? .high
-        self.updateSessionPreset(preset: preset)
-
         if !self.isValidVideoOptions {
           return
         }
@@ -582,13 +584,13 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
   func updateSessionAudioIsMuted() {
     sessionQueue.async {
       self.session.beginConfiguration()
-      for input in self.session.inputs {
-        if let deviceInput = input as? AVCaptureDeviceInput {
-          if deviceInput.device.hasMediaType(.audio) {
-            if self.isMuted {
+      if self.isMuted {
+        for input in self.session.inputs {
+          if let deviceInput = input as? AVCaptureDeviceInput {
+            if deviceInput.device.hasMediaType(.audio) {
               self.session.removeInput(input)
+              return
             }
-            return
           }
         }
       }
@@ -687,9 +689,11 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
   func updateSessionPreset(preset: AVCaptureSession.Preset) {
 #if !targetEnvironment(simulator)
     if self.session.canSetSessionPreset(preset) {
-      self.session.beginConfiguration()
-      self.session.sessionPreset = preset
-      self.session.commitConfiguration()
+      if self.session.sessionPreset != preset {
+        self.session.beginConfiguration()
+        self.session.sessionPreset = preset
+        self.session.commitConfiguration()
+      }
     }
 #endif
   }
@@ -722,6 +726,7 @@ public class CameraView: ExpoView, EXCameraInterface, EXAppLifecycleListener,
         self.onMountError(["message": "Camera could not be started - \(error.localizedDescription)"])
       }
       self.session.commitConfiguration()
+      self.startSession()
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-camera",
-  "version": "15.0.1",
+  "version": "15.0.2",
   "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",
@@ -42,5 +42,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ee4f30ef3b5fa567ad1bf94794197f7683fdd481"
+  "gitHead": "8b4cb45563b85c2ec91b1b249d136661bf6e8981"
 }