Migrate FLTCamConfiguration, FLTCamMediaSettingsAVWrapper, FLTCaptureOutput, FLTCapturePhotoOutput, FLTCaptureVideoDataOutput to Swift

Author: RobertOdrowaz

packages/camera/camera_avfoundation/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.9.22+2
+
+* Migrates `FLTCamConfiguration`, `FLTCamMediaSettingsAVWrapper` classes to Swift.
+* Migrates `FLTCaptureOutput`, `FLTCapturePhotoOutput`, `FLTCaptureVideoDataOutput` protocols to Swift.
+
 ## 0.9.22+1
 
 * Fixes crash on iOS when `enableAudio` is false.
@@ -80,14 +85,14 @@
 ## 0.9.19+2
 
 * Adds the `Camera` Swift protocol.
-* Adds `DefaultCamera`, a `FLTCam`-based implementation of the `Camera` protocol.
+* Adds `DefaultCamera`, a `FLTCam`\*based implementation of the `Camera` protocol.
 * Migrates sample buffer delegates and `FlutterTexture` protocol implementations to `DefaultCamera`.
 
 ## 0.9.19+1
 
 * Adds `audioCaptureDeviceFactory` to `FLTCamConfiguration`.
-* Renames the `lockCaptureOrientation` method of Objective-C type `FLTCam` when exported to Swift.
-* Renames arguments of the `captureOutput` method of Objective-C type `FLTCam` when exported to Swift.
+* Renames the `lockCaptureOrientation` method of Objective\*C type `FLTCam` when exported to Swift.
+* Renames arguments of the `captureOutput` method of Objective\*C type `FLTCam` when exported to Swift.
 * Changes the `connection` argument type of the `captureOutput` method of the of `FLTCam` class to `AVCaptureConnection`.
 * Makes `minimum/maximumAvailableZoomFactor` and `minimum/maximumExposureOffset` fields of `FLTCam` readonly.
 * Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
@@ -109,7 +114,7 @@
 ## 0.9.18+12
 
 * Migrates test utils and mocks to Swift.
-* Renames the methods of Objective-C type `FLTCaptureSession` when exported to Swift.
+* Renames the methods of Objective\*C type `FLTCaptureSession` when exported to Swift.
 
 ## 0.9.18+11
 
@@ -177,7 +182,7 @@
 
 ## 0.9.17+4
 
-* Updates Pigeon for non-nullable collection type support.
+* Updates Pigeon for non\*nullable collection type support.
 * Updates minimum supported SDK version to Flutter 3.19/Dart 3.3.
 
 ## 0.9.17+3
@@ -210,12 +215,12 @@
 
 ## 0.9.16
 
-* Converts Dart-to-host communcation to Pigeon.
+* Converts Dart*to*host communcation to Pigeon.
 * Fixes a race condition in camera disposal.
 
 ## 0.9.15+4
 
-* Converts host-to-Dart communcation to Pigeon.
+* Converts host*to*Dart communcation to Pigeon.
 
 ## 0.9.15+3
 
@@ -261,7 +266,7 @@
 
 ## 0.9.13+8
 
-* Updates example app to use non-deprecated video_player method.
+* Updates example app to use non\*deprecated video_player method.
 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
 
 ## 0.9.13+7
@@ -288,7 +293,7 @@
 
 ## 0.9.13+2
 
-* Removes obsolete null checks on non-nullable values.
+* Removes obsolete null checks on non\*nullable values.
 * Updates minimum supported SDK version to Flutter 3.3/Dart 2.18.
 
 ## 0.9.13+1
@@ -349,7 +354,7 @@
 
 ## 0.9.8+2
 
-* Fixes exception in registerWith caused by the switch to an in-package method channel.
+* Fixes exception in registerWith caused by the switch to an in\*package method channel.
 
 ## 0.9.8+1
 

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraSessionPresetsTests.swift

@@ -35,7 +35,7 @@ final class CameraSessionPresetsTests: XCTestCase {
     }
 
     let configuration = CameraTestUtils.createTestCameraConfiguration()
-    configuration.captureDeviceFactory = { _ in captureDeviceMock }
+    configuration.videoCaptureDeviceFactory = { _ in captureDeviceMock }
     configuration.videoDimensionsForFormat = { format in
       return CMVideoDimensions(width: 1, height: 1)
     }
@@ -65,7 +65,7 @@ final class CameraSessionPresetsTests: XCTestCase {
     configuration.videoCaptureSession = videoSessionMock
     configuration.mediaSettings = CameraTestUtils.createDefaultMediaSettings(
       resolutionPreset: FCPPlatformResolutionPreset.max)
-    configuration.captureDeviceFactory = { _ in MockCaptureDevice() }
+    configuration.videoCaptureDeviceFactory = { _ in MockCaptureDevice() }
 
     let _ = CameraTestUtils.createTestCamera(configuration)
 

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraSettingsTests.swift

@@ -106,7 +106,7 @@ private final class TestMediaSettingsAVWrapper: FLTCamMediaSettingsAVWrapper {
   }
 
   override func recommendedVideoSettingsForAssetWriter(
-    withFileType fileType: AVFileType, for output: FLTCaptureVideoDataOutput
+    withFileType fileType: AVFileType, for output: CaptureVideoDataOutput
   ) -> [String: Any]? {
     return [:]
   }

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraTestUtils.swift

@@ -26,8 +26,8 @@ enum CameraTestUtils {
       enableAudio: true)
   }
 
-  /// Creates a test `FLTCamConfiguration` with a default mock setup.
-  static func createTestCameraConfiguration() -> FLTCamConfiguration {
+  /// Creates a test `CameraConfiguration` with a default mock setup.
+  static func createTestCameraConfiguration() -> CameraConfiguration {
     let captureSessionQueue = DispatchQueue(label: "capture_session_queue")
 
     let videoSessionMock = MockCaptureSession()
@@ -56,7 +56,7 @@ enum CameraTestUtils {
       currentFormat = format
     }
 
-    let configuration = FLTCamConfiguration(
+    let configuration = CameraConfiguration(
       mediaSettings: createDefaultMediaSettings(
         resolutionPreset: FCPPlatformResolutionPreset.medium),
       mediaSettingsWrapper: FLTCamMediaSettingsAVWrapper(),
@@ -81,7 +81,7 @@ enum CameraTestUtils {
     return configuration
   }
 
-  static func createTestCamera(_ configuration: FLTCamConfiguration) -> DefaultCamera {
+  static func createTestCamera(_ configuration: CameraConfiguration) -> DefaultCamera {
     return (try? DefaultCamera(configuration: configuration))!
   }
 

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamExposureTests.swift

@@ -17,7 +17,7 @@ final class FLTCamExposureTests: XCTestCase {
     let mockDeviceOrientationProvider = MockDeviceOrientationProvider()
 
     let configuration = CameraTestUtils.createTestCameraConfiguration()
-    configuration.captureDeviceFactory = { _ in mockDevice }
+    configuration.videoCaptureDeviceFactory = { _ in mockDevice }
     configuration.deviceOrientationProvider = mockDeviceOrientationProvider
     let camera = CameraTestUtils.createTestCamera(configuration)
 

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamFocusTests.swift

@@ -18,7 +18,7 @@ final class FLTCamSetFocusModeTests: XCTestCase {
     let mockDeviceOrientationProvider = MockDeviceOrientationProvider()
 
     let configuration = CameraTestUtils.createTestCameraConfiguration()
-    configuration.captureDeviceFactory = { _ in mockDevice }
+    configuration.videoCaptureDeviceFactory = { _ in mockDevice }
     configuration.deviceOrientationProvider = mockDeviceOrientationProvider
     let camera = CameraTestUtils.createTestCamera(configuration)
 

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamSetFlashModeTests.swift

@@ -18,7 +18,7 @@ final class FLTCamSetFlashModeTests: XCTestCase {
     let mockCapturePhotoOutput = MockCapturePhotoOutput()
 
     let configuration = CameraTestUtils.createTestCameraConfiguration()
-    configuration.captureDeviceFactory = { _ in mockDevice }
+    configuration.videoCaptureDeviceFactory = { _ in mockDevice }
     let camera = CameraTestUtils.createTestCamera(configuration)
     camera.capturePhotoOutput = mockCapturePhotoOutput
 
@@ -87,9 +87,7 @@ final class FLTCamSetFlashModeTests: XCTestCase {
   func testSetFlashModeWithNonTorchMode_setsTrochModeOff_ifTorchModeIsEnabled() {
     let (camera, mockDevice, mockCapturePhotoOutput) = createCamera()
 
-    mockCapturePhotoOutput.supportedFlashModes = [
-      NSNumber(value: AVCaptureDevice.FlashMode.auto.rawValue)
-    ]
+    mockCapturePhotoOutput.supportedFlashModes = [.auto]
 
     mockDevice.hasFlash = true
     // Torch mode is enabled

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamZoomTests.swift

@@ -17,7 +17,7 @@ final class FLTCamZoomTests: XCTestCase {
     let mockDevice = MockCaptureDevice()
 
     let configuration = CameraTestUtils.createTestCameraConfiguration()
-    configuration.captureDeviceFactory = { _ in mockDevice }
+    configuration.videoCaptureDeviceFactory = { _ in mockDevice }
     let camera = CameraTestUtils.createTestCamera(configuration)
 
     return (camera, mockDevice)

packages/camera/camera_avfoundation/example/ios/RunnerTests/Mocks/MockCapturePhotoOutput.swift

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import camera_avfoundation
+@testable import camera_avfoundation
 
 // Import Objective-C part of the implementation when SwiftPM is used.
 #if canImport(camera_avfoundation_objc)
@@ -11,11 +11,11 @@ import camera_avfoundation
 
 /// Mock implementation of `FLTCapturePhotoOutput` protocol which allows injecting a custom
 /// implementation.
-final class MockCapturePhotoOutput: NSObject, FLTCapturePhotoOutput {
+final class MockCapturePhotoOutput: NSObject, CapturePhotoOutput {
   var avOutput = AVCapturePhotoOutput()
   var availablePhotoCodecTypes: [AVVideoCodecType] = []
-  var highResolutionCaptureEnabled = false
-  var supportedFlashModes: [NSNumber] = []
+  var isHighResolutionCaptureEnabled = false
+  var supportedFlashModes: [AVCaptureDevice.FlashMode] = []
 
   // Stub that is called when the corresponding public method is called.
   var capturePhotoWithSettingsStub:
@@ -29,7 +29,7 @@ final class MockCapturePhotoOutput: NSObject, FLTCapturePhotoOutput {
     capturePhotoWithSettingsStub?(settings, delegate)
   }
 
-  func connection(withMediaType mediaType: AVMediaType) -> FLTCaptureConnection? {
+  func connection(with mediaType: AVMediaType) -> FLTCaptureConnection? {
     return connectionWithMediaTypeStub?(mediaType)
   }
 }

packages/camera/camera_avfoundation/example/ios/RunnerTests/Mocks/MockCaptureVideoDataOutput.swift

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import camera_avfoundation
+@testable import camera_avfoundation
 
 // Import Objective-C part of the implementation when SwiftPM is used.
 #if canImport(camera_avfoundation_objc)
@@ -11,15 +11,14 @@ import camera_avfoundation
 
 /// Mock implementation of `FLTCaptureVideoDataOutput` protocol which allows injecting a custom
 /// implementation.
-class MockCaptureVideoDataOutput: NSObject, FLTCaptureVideoDataOutput {
-
+class MockCaptureVideoDataOutput: NSObject, CaptureVideoDataOutput {
   var avOutput = AVCaptureVideoDataOutput()
   var alwaysDiscardsLateVideoFrames = false
-  var videoSettings: [String: Any] = [:]
+  var videoSettings: [String: Any]! = [:]
 
   var connectionWithMediaTypeStub: ((AVMediaType) -> FLTCaptureConnection?)?
 
-  func connection(withMediaType mediaType: AVMediaType) -> FLTCaptureConnection? {
+  func connection(with mediaType: AVMediaType) -> FLTCaptureConnection? {
     return connectionWithMediaTypeStub?(mediaType)
   }