Enabled flash during video capture.

andreilob · Jun 8, 2023 · 8777f54 · 8777f54
1 parent c96fcef
commit 8777f54
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 15 deletions.
diff --git a/Sources/CameraKage/AVFoundationsInternals/VideoCaptureDevice.swift b/Sources/CameraKage/AVFoundationsInternals/VideoCaptureDevice.swift
@@ -55,6 +55,20 @@ class VideoCaptureDevice: NSObject {
         return min(min(maxFactor, options.maximumZoomScale), videoDevice.activeFormat.videoMaxZoomFactor)
     }
 
+    func configureFlash(_ flashMode: FlashMode) throws {
+        guard videoDevice.isTorchModeSupported(flashMode.avTorchModeOption),
+              videoDevice.torchMode != flashMode.avTorchModeOption else {
+            throw CameraError.cameraComponentError(reason: .torchModeNotSupported)
+        }
+        do {
+            try videoDevice.lockForConfiguration()
+            videoDevice.torchMode = flashMode.avTorchModeOption
+            videoDevice.unlockForConfiguration()
+        } catch {
+            throw CameraError.cameraComponentError(reason: .failedToLockDevice)
+        }
+    }
+
     func configureVideoDevice(forSession session: CaptureSession,
                               andOptions options: CameraComponentParsedOptions,
                               isFlipped: Bool) -> Bool {

diff --git a/Sources/CameraKage/CameraKage.swift b/Sources/CameraKage/CameraKage.swift
@@ -140,9 +140,13 @@ public class CameraKage: UIView {
 
     /**
      Starts a video recording for the camera. `CameraKageDelegate` sends a notification when the recording has started.
+
+     - parameter flashOption: Indicates what flash option should be used for the video recording. Default is `.off`.
+
+     - important: Front camera dosen't support video recordings with flash mode `.on`.
      */
-    public func startVideoRecording() {
-        cameraComposer.startVideoRecording()
+    public func startVideoRecording(_ flashOption: FlashMode) {
+        cameraComposer.startVideoRecording(flashOption)
     }
 
     /**
@@ -180,13 +184,10 @@ public class CameraKage: UIView {
     }
 
     private func setupComposer() {
-        DispatchQueue.main.async { [weak self] in
-            guard let self else { return }
-            self.cameraComposer = CameraComposer()
-            self.cameraComposer.delegate = self
-            self.addSubview(self.cameraComposer)
-            self.cameraComposer.layoutToFill(inView: self)
-        }
+        cameraComposer = CameraComposer()
+        cameraComposer.delegate = self
+        addSubview(cameraComposer)
+        cameraComposer.layoutToFill(inView: self)
     }
 }
 

diff --git a/Sources/CameraKage/Extensions/Internal/FlashMode+AVFoundation.swift b/Sources/CameraKage/Extensions/Internal/FlashMode+AVFoundation.swift
@@ -15,4 +15,12 @@ extension FlashMode {
         case .auto: return .auto
         }
     }
+
+    var avTorchModeOption: AVCaptureDevice.TorchMode {
+        switch self {
+        case .on: return .on
+        case .off: return .off
+        case .auto: return .auto
+        }
+    }
 }
diff --git a/Sources/CameraKage/General/Camera/Camera.swift b/Sources/CameraKage/General/Camera/Camera.swift
@@ -68,12 +68,26 @@ class Camera {
         photoOutput.capturePhoto(flashMode, redEyeCorrection: redEyeCorrection)
     }
 
-    func startMovieRecording() {
+    func startMovieRecording(_ flashMode: FlashMode) {
+        do {
+            try videoDevice.configureFlash(flashMode)
+        } catch let error as CameraError {
+            delegate?.camera(self, didFail: error)
+        } catch {
+            delegate?.camera(self, didFail: .cameraComponentError(reason: .torchModeNotSupported))
+        }
         movieOutput.startMovieRecording()
     }
 
     func stopMovieRecording() {
         movieOutput.stopMovieRecording()
+        do {
+            try videoDevice.configureFlash(.off)
+        } catch let error as CameraError {
+            delegate?.camera(self, didFail: error)
+        } catch {
+            delegate?.camera(self, didFail: .cameraComponentError(reason: .torchModeNotSupported))
+        }
     }
 
     func focus(with focusMode: FocusMode,

diff --git a/Sources/CameraKage/General/Camera/CameraComponent.swift b/Sources/CameraKage/General/Camera/CameraComponent.swift
@@ -34,8 +34,8 @@ class CameraComponent: UIView {
         camera.capturePhoto(flashMode, redEyeCorrection: redEyeCorrection)
     }
 
-    func startMovieRecording() {
-        camera.startMovieRecording()
+    func startMovieRecording(_ flashMode: FlashMode) {
+        camera.startMovieRecording(flashMode)
     }
 
     func stopMovieRecording() {

diff --git a/Sources/CameraKage/General/Camera/CameraComposer.swift b/Sources/CameraKage/General/Camera/CameraComposer.swift
@@ -50,10 +50,10 @@ final class CameraComposer: UIView, CameraComposerProtocol {
         }
     }
 
-    func startVideoRecording() {
+    func startVideoRecording(_ flashOption: FlashMode) {
         sessionQueue.async { [weak self] in
             guard let self, !self.isRecording else { return }
-            self.cameraComponent.startMovieRecording()
+            self.cameraComponent.startMovieRecording(flashOption)
         }
     }
 

diff --git a/Sources/CameraKage/General/Camera/CameraComposerProtocol.swift b/Sources/CameraKage/General/Camera/CameraComposerProtocol.swift
@@ -15,7 +15,7 @@ protocol CameraComposerProtocol: UIView {
     func startCameraSession(with options: CameraComponentParsedOptions)
     func stopCameraSession()
     func capturePhoto(_ flashOption: FlashMode, redEyeCorrection: Bool)
-    func startVideoRecording()
+    func startVideoRecording(_ flashOption: FlashMode)
     func stopVideoRecording()
     func flipCamera()
     func adjustFocusAndExposure(with focusMode: FocusMode,

diff --git a/Sources/CameraKage/General/CameraError.swift b/Sources/CameraKage/General/CameraError.swift
@@ -41,6 +41,9 @@ public enum CameraError: Error {
 
         /// Occurs when a camera initialization fails.
         case failedToComposeCamera
+
+        /// Error thrown when a specified torch mode is not supported by the device.
+        case torchModeNotSupported
     }
 
     public enum CameraSessionErrorReason {