Migrate FLTCaptureConnection class to Swift

Author: RobertOdrowaz

packages/camera/camera_avfoundation/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.22+6
+
+* Migrates `FLTCaptureConnection` class to Swift.
+
 ## 0.9.22+5
 
 * Migrates `FLTCaptureDevice`, `FLTCaptureSession`, and `FLTFormatUtils` classes to Swift.

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

@@ -2,15 +2,15 @@
 // 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)
   import camera_avfoundation_objc
 #endif
 
-/// A mock implementation of `FLTCaptureConnection` that allows injecting a custom implementation.
-final class MockCaptureConnection: NSObject, FLTCaptureConnection {
+/// A mock implementation of `CaptureConnection` that allows injecting a custom implementation.
+final class MockCaptureConnection: NSObject, CaptureConnection {
   var setVideoOrientationStub: ((AVCaptureVideoOrientation) -> Void)?
 
   var connection: AVCaptureConnection {

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

@@ -22,14 +22,14 @@ final class MockCapturePhotoOutput: NSObject, CapturePhotoOutput {
     ((_ settings: AVCapturePhotoSettings, _ delegate: AVCapturePhotoCaptureDelegate) -> Void)?
 
   // Stub that is called when the corresponding public method is called.
-  var connectionWithMediaTypeStub: ((_ mediaType: AVMediaType) -> FLTCaptureConnection?)?
+  var connectionWithMediaTypeStub: ((_ mediaType: AVMediaType) -> CaptureConnection?)?
 
   func capturePhoto(with settings: AVCapturePhotoSettings, delegate: AVCapturePhotoCaptureDelegate)
   {
     capturePhotoWithSettingsStub?(settings, delegate)
   }
 
-  func connection(with mediaType: AVMediaType) -> FLTCaptureConnection? {
+  func connection(with mediaType: AVMediaType) -> CaptureConnection? {
     return connectionWithMediaTypeStub?(mediaType)
   }
 }

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

@@ -16,9 +16,9 @@ class MockCaptureVideoDataOutput: NSObject, CaptureVideoDataOutput {
   var alwaysDiscardsLateVideoFrames = false
   var videoSettings: [String: Any]! = [:]
 
-  var connectionWithMediaTypeStub: ((AVMediaType) -> FLTCaptureConnection?)?
+  var connectionWithMediaTypeStub: ((AVMediaType) -> CaptureConnection?)?
 
-  func connection(with mediaType: AVMediaType) -> FLTCaptureConnection? {
+  func connection(with mediaType: AVMediaType) -> CaptureConnection? {
     return connectionWithMediaTypeStub?(mediaType)
   }
 

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/CaptureConnection.swift

@@ -0,0 +1,26 @@
+// Copyright 2013 The Flutter Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import AVFoundation
+
+/// A protocol which is a direct passthrough to `AVCaptureConnection`. It exists to allow replacing
+/// `AVCaptureConnection` in tests.
+protocol CaptureConnection: NSObjectProtocol {
+  /// Corresponds to the `isVideoMirrored` property of `AVCaptureConnection`
+  var isVideoMirrored: Bool { get set }
+
+  /// Corresponds to the `videoOrientation` property of `AVCaptureConnection`
+  var videoOrientation: AVCaptureVideoOrientation { get set }
+
+  /// Corresponds to the `inputPorts` property of `AVCaptureConnection`
+  var inputPorts: [AVCaptureInput.Port] { get }
+
+  /// Corresponds to the `supportsVideoMirroring` property of `AVCaptureConnection`
+  var isVideoMirroringSupported: Bool { get }
+
+  /// Corresponds to the `supportsVideoOrientation` property of `AVCaptureConnection`
+  var isVideoOrientationSupported: Bool { get }
+}
+
+extension AVCaptureConnection: CaptureConnection {}

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/CaptureOutput.swift

@@ -14,7 +14,7 @@ import Foundation
 /// `AVCaptureOutput` in tests.
 protocol CaptureOutput {
   /// Returns a connection with the specified media type, or nil if no such connection exists.
-  func connection(with mediaType: AVMediaType) -> FLTCaptureConnection?
+  func connection(with mediaType: AVMediaType) -> CaptureConnection?
 }
 
 /// A protocol which is a direct passthrough to `AVCaptureVideoDataOutput`. It exists to allow
@@ -41,9 +41,9 @@ extension AVCaptureVideoDataOutput: CaptureVideoDataOutput {
     return self
   }
 
-  func connection(with mediaType: AVMediaType) -> FLTCaptureConnection? {
-    guard let connection: AVCaptureConnection = connection(with: mediaType) else { return nil }
-    return FLTDefaultCaptureConnection(connection: connection)
+  func connection(with mediaType: AVMediaType) -> (any CaptureConnection)? {
+    let connection: AVCaptureConnection? = connection(with: mediaType)
+    return connection
   }
 }
 
@@ -72,8 +72,8 @@ extension AVCapturePhotoOutput: CapturePhotoOutput {
     return self
   }
 
-  func connection(with mediaType: AVMediaType) -> FLTCaptureConnection? {
-    guard let connection: AVCaptureConnection = connection(with: mediaType) else { return nil }
-    return FLTDefaultCaptureConnection(connection: connection)
+  func connection(with mediaType: AVMediaType) -> CaptureConnection? {
+    let connection: AVCaptureConnection? = connection(with: mediaType)
+    return connection
   }
 }

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation_objc/FLTCaptureConnection.m

@@ -2,7 +2,7 @@ name: camera_avfoundation
 description: iOS implementation of the camera plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_avfoundation
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.9.22+5
+version: 0.9.22+6
 
 environment:
   sdk: ^3.9.0