Revert "[camera_avfoundation] Implementation swift migration - part 4 (#9219)"

This reverts commit 974f152.

Author: RobertOdrowaz

packages/camera/camera_avfoundation/CHANGELOG.md

@@ -1,9 +1,3 @@
-## 0.9.19+2
-
-* Adds the `Camera` Swift 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`.

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

@@ -4,11 +4,11 @@
 
 import XCTest
 
-@testable import camera_avfoundation
-
 // Import Objectice-C part of the implementation when SwiftPM is used.
 #if canImport(camera_avfoundation_objc)
   import camera_avfoundation_objc
+#else
+  import camera_avfoundation
 #endif
 
 /// Utils for creating default class instances used in tests
@@ -81,16 +81,16 @@ enum CameraTestUtils {
     return configuration
   }
 
-  static func createTestCamera(_ configuration: FLTCamConfiguration) -> DefaultCamera {
-    return DefaultCamera(configuration: configuration, error: nil)
+  static func createTestCamera(_ configuration: FLTCamConfiguration) -> FLTCam {
+    return FLTCam(configuration: configuration, error: nil)
   }
 
-  static func createTestCamera() -> DefaultCamera {
+  static func createTestCamera() -> FLTCam {
     return createTestCamera(createTestCameraConfiguration())
   }
 
   static func createCameraWithCaptureSessionQueue(_ captureSessionQueue: DispatchQueue)
-    -> DefaultCamera
+    -> FLTCam
   {
     let configuration = createTestCameraConfiguration()
     configuration.captureSessionQueue = captureSessionQueue

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

@@ -12,7 +12,7 @@ import XCTest
 #endif
 
 final class FLTCamExposureTests: XCTestCase {
-  private func createCamera() -> (Camera, MockCaptureDevice, MockDeviceOrientationProvider) {
+  private func createCamera() -> (FLTCam, MockCaptureDevice, MockDeviceOrientationProvider) {
     let mockDevice = MockCaptureDevice()
     let mockDeviceOrientationProvider = MockDeviceOrientationProvider()
 

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

@@ -13,7 +13,7 @@ import XCTest
 #endif
 
 final class FLTCamSetFocusModeTests: XCTestCase {
-  private func createCamera() -> (Camera, MockCaptureDevice, MockDeviceOrientationProvider) {
+  private func createCamera() -> (FLTCam, MockCaptureDevice, MockDeviceOrientationProvider) {
     let mockDevice = MockCaptureDevice()
     let mockDeviceOrientationProvider = MockDeviceOrientationProvider()
 

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

@@ -13,7 +13,7 @@ import XCTest
 #endif
 
 final class FLTCamSetDeviceOrientationTests: XCTestCase {
-  private func createCamera() -> (Camera, MockCaptureConnection, MockCaptureConnection) {
+  private func createCamera() -> (FLTCam, MockCaptureConnection, MockCaptureConnection) {
     let camera = CameraTestUtils.createTestCamera()
 
     let mockCapturePhotoOutput = MockCapturePhotoOutput()

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

@@ -13,7 +13,7 @@ import XCTest
 #endif
 
 final class FLTCamSetFlashModeTests: XCTestCase {
-  private func createCamera() -> (Camera, MockCaptureDevice, MockCapturePhotoOutput) {
+  private func createCamera() -> (FLTCam, MockCaptureDevice, MockCapturePhotoOutput) {
     let mockDevice = MockCaptureDevice()
     let mockCapturePhotoOutput = MockCapturePhotoOutput()
 

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

@@ -13,7 +13,7 @@ import XCTest
 #endif
 
 final class FLTCamZoomTests: XCTestCase {
-  private func createCamera() -> (Camera, MockCaptureDevice) {
+  private func createCamera() -> (FLTCam, MockCaptureDevice) {
     let mockDevice = MockCaptureDevice()
 
     let configuration = CameraTestUtils.createTestCameraConfiguration()

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

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-@testable import camera_avfoundation
+import camera_avfoundation
 
 // Import Objectice-C part of the implementation when SwiftPM is used.
 #if canImport(camera_avfoundation_objc)
   import camera_avfoundation_objc
 #endif
 
-final class MockCamera: NSObject, Camera {
+final class MockCamera: FLTCam {
   var setDartApiStub: ((FCPCameraEventApi?) -> Void)?
   var setOnFrameAvailableStub: (((() -> Void)?) -> Void)?
   var getMinimumExposureOffsetStub: (() -> CGFloat)?
@@ -42,7 +42,7 @@ final class MockCamera: NSObject, Camera {
   var startImageStreamStub: ((FlutterBinaryMessenger) -> Void)?
   var stopImageStreamStub: (() -> Void)?
 
-  var dartAPI: FCPCameraEventApi? {
+  override var dartAPI: FCPCameraEventApi {
     get {
       preconditionFailure("Attempted to access unimplemented property: dartAPI")
     }
@@ -51,7 +51,7 @@ final class MockCamera: NSObject, Camera {
     }
   }
 
-  var onFrameAvailable: (() -> Void)? {
+  override var onFrameAvailable: (() -> Void) {
     get {
       preconditionFailure("Attempted to access unimplemented property: onFrameAvailable")
     }
@@ -60,149 +60,147 @@ final class MockCamera: NSObject, Camera {
     }
   }
 
-  var videoFormat: FourCharCode = kCVPixelFormatType_32BGRA
-
-  var isPreviewPaused: Bool = false
-
-  var minimumExposureOffset: CGFloat {
+  override var minimumExposureOffset: CGFloat {
     return getMinimumExposureOffsetStub?() ?? 0
   }
 
-  var maximumExposureOffset: CGFloat {
+  override var maximumExposureOffset: CGFloat {
     return getMaximumExposureOffsetStub?() ?? 0
   }
 
-  var minimumAvailableZoomFactor: CGFloat {
+  override var minimumAvailableZoomFactor: CGFloat {
     return getMinimumAvailableZoomFactorStub?() ?? 0
   }
 
-  var maximumAvailableZoomFactor: CGFloat {
+  override var maximumAvailableZoomFactor: CGFloat {
     return getMaximumAvailableZoomFactorStub?() ?? 0
   }
 
-  func setUpCaptureSessionForAudioIfNeeded() {
+  override func setUpCaptureSessionForAudioIfNeeded() {
     setUpCaptureSessionForAudioIfNeededStub?()
   }
 
-  func reportInitializationState() {}
+  override func reportInitializationState() {}
 
-  func receivedImageStreamData() {
+  override func receivedImageStreamData() {
     receivedImageStreamDataStub?()
   }
 
-  func start() {
+  override func start() {
     startStub?()
   }
 
-  func stop() {}
+  override func stop() {}
 
-  func startVideoRecording(
+  override func startVideoRecording(
     completion: @escaping (FlutterError?) -> Void,
     messengerForStreaming messenger: FlutterBinaryMessenger?
   ) {
     startVideoRecordingStub?(completion, messenger)
   }
 
-  func pauseVideoRecording() {
+  override func pauseVideoRecording() {
     pauseVideoRecordingStub?()
   }
 
-  func resumeVideoRecording() {
+  override func resumeVideoRecording() {
     resumeVideoRecordingStub?()
   }
 
-  func stopVideoRecording(completion: @escaping (String?, FlutterError?) -> Void) {
+  override func stopVideoRecording(completion: @escaping (String?, FlutterError?) -> Void) {
     stopVideoRecordingStub?(completion)
   }
 
-  func captureToFile(completion: @escaping (String?, FlutterError?) -> Void) {
+  override func captureToFile(completion: @escaping (String?, FlutterError?) -> Void) {
     captureToFileStub?(completion)
   }
 
-  func setDeviceOrientation(_ orientation: UIDeviceOrientation) {
+  override func setDeviceOrientation(_ orientation: UIDeviceOrientation) {
     setDeviceOrientationStub?(orientation)
   }
 
-  func lockCaptureOrientation(_ orientation: FCPPlatformDeviceOrientation) {
+  override func lockCaptureOrientation(_ orientation: FCPPlatformDeviceOrientation) {
     lockCaptureOrientationStub?(orientation)
   }
 
-  func unlockCaptureOrientation() {
+  override func unlockCaptureOrientation() {
     unlockCaptureOrientationStub?()
   }
 
-  func setImageFileFormat(_ fileFormat: FCPPlatformImageFileFormat) {
+  override func setImageFileFormat(_ fileFormat: FCPPlatformImageFileFormat) {
     setImageFileFormatStub?(fileFormat)
   }
 
-  func setExposureMode(_ mode: FCPPlatformExposureMode) {
+  override func setExposureMode(_ mode: FCPPlatformExposureMode) {
     setExposureModeStub?(mode)
   }
 
-  func setExposureOffset(_ offset: Double) {
+  override func setExposureOffset(_ offset: Double) {
     setExposureOffsetStub?(offset)
   }
 
-  func setExposurePoint(
+  override func setExposurePoint(
     _ point: FCPPlatformPoint?, withCompletion: @escaping (FlutterError?) -> Void
   ) {
     setExposurePointStub?(point, withCompletion)
   }
 
-  func setFocusMode(_ mode: FCPPlatformFocusMode) {
+  override func setFocusMode(_ mode: FCPPlatformFocusMode) {
     setFocusModeStub?(mode)
   }
 
-  func setFocusPoint(_ point: FCPPlatformPoint?, completion: @escaping (FlutterError?) -> Void) {
+  override func setFocusPoint(
+    _ point: FCPPlatformPoint?, completion: @escaping (FlutterError?) -> Void
+  ) {
     setFocusPointStub?(point, completion)
   }
 
-  func setZoomLevel(
+  override func setZoomLevel(
     _ zoom: CGFloat,
     withCompletion completion: @escaping (FlutterError?) -> Void
   ) {
     setZoomLevelStub?(zoom, completion)
   }
 
-  func setFlashMode(
+  override func setFlashMode(
     _ mode: FCPPlatformFlashMode,
     withCompletion completion: @escaping (FlutterError?) -> Void
   ) {
     setFlashModeStub?(mode, completion)
   }
 
-  func pausePreview() {
+  override func pausePreview() {
     pausePreviewStub?()
   }
 
-  func resumePreview() {
+  override func resumePreview() {
     resumePreviewStub?()
   }
 
-  func setDescriptionWhileRecording(
+  override func setDescriptionWhileRecording(
     _ cameraName: String,
     withCompletion completion: @escaping (FlutterError?) -> Void
   ) {
     setDescriptionWhileRecordingStub?(cameraName, completion)
   }
 
-  func startImageStream(with messenger: FlutterBinaryMessenger) {
+  override func startImageStream(with messenger: FlutterBinaryMessenger) {
     startImageStreamStub?(messenger)
   }
 
-  func stopImageStream() {
+  override func stopImageStream() {
     stopImageStreamStub?()
   }
 
-  func captureOutput(
+  override func captureOutput(
     _ output: AVCaptureOutput,
     didOutput sampleBuffer: CMSampleBuffer,
     from connection: AVCaptureConnection
   ) {}
 
-  func close() {}
+  override func close() {}
 
-  func copyPixelBuffer() -> Unmanaged<CVPixelBuffer>? {
+  override func copyPixelBuffer() -> Unmanaged<CVPixelBuffer>? {
     return nil
   }
 }

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

@@ -14,7 +14,7 @@ import XCTest
 
 /// Includes test cases related to photo capture operations for FLTCam class.
 final class PhotoCaptureTests: XCTestCase {
-  private func createCam(with captureSessionQueue: DispatchQueue) -> DefaultCamera {
+  private func createCam(with captureSessionQueue: DispatchQueue) -> FLTCam {
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.captureSessionQueue = captureSessionQueue
     return CameraTestUtils.createTestCamera(configuration)

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

@@ -69,7 +69,7 @@ private class FakeMediaSettingsAVWrapper: FLTCamMediaSettingsAVWrapper {
 /// Includes test cases related to sample buffer handling for FLTCam class.
 final class CameraSampleBufferTests: XCTestCase {
   private func createCamera() -> (
-    DefaultCamera,
+    FLTCam,
     MockAssetWriter,
     MockAssetWriterInputPixelBufferAdaptor,
     MockAssetWriterInput