railbird/react-native-vision-camera
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fix torch not working on iOS (#2031)

Browse Source 
* fix: Fix `torch` not working on iOS

* Format

* fix: Use `withSessionLock` and `withDeviceLock`

* Update CameraSession.swift

* Update RecordingSession.swift
This commit is contained in:
Marc Rousavy
2023-10-18 18:04:58 +02:00
committed by GitHub
parent 6956fded2d
commit 89dfd351e0
4 changed files with 90 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
package/ios/Core/CameraSession+Configuration.swift
View File

@@ -175,16 +175,13 @@ extension CameraSession {
/**
Configures the active format (`format`)
*/
func configureFormat(configuration: CameraConfiguration) throws {
func configureFormat(configuration: CameraConfiguration, device: AVCaptureDevice) throws {
guard let targetFormat = configuration.format else {
// No format was set, just use the default.
return
}
ReactLogger.log(level: .info, message: "Configuring Format (\(targetFormat))...")
guard let device = videoDeviceInput?.device else {
throw CameraError.session(.cameraNotReady)
}
let currentFormat = CameraDeviceFormat(fromFormat: device.activeFormat)
if currentFormat == targetFormat {
@@ -207,13 +204,9 @@ extension CameraSession {
// pragma MARK: Side-Props
/**
Configures format-dependant "side-props" (`fps`, `lowLightBoost`, `torch`)
Configures format-dependant "side-props" (`fps`, `lowLightBoost`)
*/
func configureSideProps(configuration: CameraConfiguration) throws {
guard let device = videoDeviceInput?.device else {
throw CameraError.session(.cameraNotReady)
}
func configureSideProps(configuration: CameraConfiguration, device: AVCaptureDevice) throws {
// Configure FPS
if let fps = configuration.fps {
let supportsGivenFps = device.activeFormat.videoSupportedFrameRateRanges.contains { range in
@@ -238,13 +231,20 @@ extension CameraSession {
}
device.automaticallyEnablesLowLightBoostWhenAvailable = configuration.enableLowLightBoost
}
}
/**
Configures the torch.
The CaptureSession has to be running for the Torch to work.
*/
func configureTorch(configuration: CameraConfiguration, device: AVCaptureDevice) throws {
// Configure Torch
let torchMode = configuration.torch.toTorchMode()
if device.torchMode != torchMode {
guard device.hasTorch else {
throw CameraError.device(.flashUnavailable)
}
device.torchMode = torchMode
if torchMode == .on {
try device.setTorchModeOn(level: 1.0)
@@ -257,10 +257,7 @@ extension CameraSession {
/**
Configures zoom (`zoom`)
*/
func configureZoom(configuration: CameraConfiguration) throws {
guard let device = videoDeviceInput?.device else {
throw CameraError.session(.cameraNotReady)
}
func configureZoom(configuration: CameraConfiguration, device: AVCaptureDevice) {
guard let zoom = configuration.zoom else {
return
}