[camera_avfoundation] Wrappers swift migration - part 1 #10119
+302
−529
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // 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 | ||
| import CoreMedia | ||
| import Foundation | ||
|
There was a problem hiding this comment. Foundation should already be auto imported ( |
||
| import UIKit | ||
|
|
||
| // Import Objective-C part of the implementation when SwiftPM is used. | ||
|
There was a problem hiding this comment. you probably mentioned it before, but could you document both SwiftPM and non-SwiftPM (cocoapod?) behavior in the comment? |
||
| #if canImport(camera_avfoundation_objc) | ||
| import camera_avfoundation_objc | ||
| #endif | ||
|
|
||
| /// Factory block returning an FLTCaptureDevice. | ||
| /// Used in tests to inject a device into DefaultCamera. | ||
| typealias CaptureDeviceFactory = (String) -> FLTCaptureDevice | ||
|
There was a problem hiding this comment. should this be "VdieoCaptureDeviceFactory"? (see below) |
||
|
|
||
| typealias AudioCaptureDeviceFactory = () -> FLTCaptureDevice | ||
|
|
||
| typealias CaptureSessionFactory = () -> FLTCaptureSession | ||
|
|
||
| typealias AssetWriterFactory = (URL, AVFileType, inout NSError?) -> FLTAssetWriter? | ||
|
There was a problem hiding this comment. can you add label so it's more readable? You may have to put an underscore there |
||
|
|
||
| typealias InputPixelBufferAdaptorFactory = (FLTAssetWriterInput, [String: Any]?) -> | ||
| FLTAssetWriterInputPixelBufferAdaptor | ||
|
|
||
| /// Determines the video dimensions (width and height) for a given capture device format. | ||
| /// Used in tests to mock CMVideoFormatDescriptionGetDimensions. | ||
| typealias VideoDimensionsForFormat = (FLTCaptureDeviceFormat) -> CMVideoDimensions | ||
|
There was a problem hiding this comment. Nit: from this naming it's hard to tell it's a typealias for a closure. It sounds like a method name but its first letter is uppercase. |
||
|
|
||
| /// A configuration object that centralizes dependencies for `DefaultCamera`. | ||
| class FLTCamConfiguration { | ||
|
There was a problem hiding this comment. should we call it |
||
| var mediaSettings: FCPPlatformMediaSettings | ||
| var mediaSettingsWrapper: FLTCamMediaSettingsAVWrapper | ||
| var captureSessionQueue: DispatchQueue | ||
| var videoCaptureSession: FLTCaptureSession | ||
| var audioCaptureSession: FLTCaptureSession | ||
| var captureDeviceFactory: CaptureDeviceFactory | ||
| let audioCaptureDeviceFactory: AudioCaptureDeviceFactory | ||
| let captureDeviceInputFactory: FLTCaptureDeviceInputFactory | ||
| var assetWriterFactory: AssetWriterFactory | ||
| var inputPixelBufferAdaptorFactory: InputPixelBufferAdaptorFactory | ||
| var videoDimensionsForFormat: VideoDimensionsForFormat | ||
| var deviceOrientationProvider: FLTDeviceOrientationProviding | ||
| let initialCameraName: String | ||
| var orientation: UIDeviceOrientation | ||
|
|
||
| init( | ||
| mediaSettings: FCPPlatformMediaSettings, | ||
| mediaSettingsWrapper: FLTCamMediaSettingsAVWrapper, | ||
| captureDeviceFactory: @escaping CaptureDeviceFactory, | ||
| audioCaptureDeviceFactory: @escaping AudioCaptureDeviceFactory, | ||
| captureSessionFactory: @escaping CaptureSessionFactory, | ||
| captureSessionQueue: DispatchQueue, | ||
| captureDeviceInputFactory: FLTCaptureDeviceInputFactory, | ||
| initialCameraName: String | ||
| ) { | ||
| self.mediaSettings = mediaSettings | ||
| self.mediaSettingsWrapper = mediaSettingsWrapper | ||
| self.captureDeviceFactory = captureDeviceFactory | ||
| self.audioCaptureDeviceFactory = audioCaptureDeviceFactory | ||
| self.captureSessionQueue = captureSessionQueue | ||
| self.videoCaptureSession = captureSessionFactory() | ||
| self.audioCaptureSession = captureSessionFactory() | ||
| self.captureDeviceInputFactory = captureDeviceInputFactory | ||
| self.initialCameraName = initialCameraName | ||
| self.orientation = UIDevice.current.orientation | ||
| self.deviceOrientationProvider = FLTDefaultDeviceOrientationProvider() | ||
|
|
||
| self.videoDimensionsForFormat = { format in | ||
| return CMVideoFormatDescriptionGetDimensions(format.formatDescription) | ||
| } | ||
|
|
||
| self.assetWriterFactory = { url, fileType, error in | ||
| return FLTDefaultAssetWriter(url: url, fileType: fileType, error: &error) | ||
| } | ||
|
|
||
| self.inputPixelBufferAdaptorFactory = { assetWriterInput, sourcePixelBufferAttributes in | ||
| let adaptor = AVAssetWriterInputPixelBufferAdaptor( | ||
| assetWriterInput: assetWriterInput.input, | ||
| sourcePixelBufferAttributes: sourcePixelBufferAttributes | ||
| ) | ||
| return FLTDefaultAssetWriterInputPixelBufferAdaptor(adaptor: adaptor) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| // 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 | ||
| import Foundation | ||
|
|
||
| // Import Objective-C part of the implementation when SwiftPM is used. | ||
| #if canImport(camera_avfoundation_objc) | ||
| import camera_avfoundation_objc | ||
| #endif | ||
|
|
||
| /// A protocol which is a direct passthrough to `AVCaptureOutput`. It exists to allow mocking | ||
| /// `AVCaptureOutput` in tests. | ||
| protocol CaptureOutput { | ||
| /// Returns a connection with the specified media type, or nil if no such connection exists. | ||
| func connection(withMediaType mediaType: AVMediaType) -> FLTCaptureConnection? | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. oh is it an apple api? if so, maybe |
||
| } | ||
|
|
||
| /// A protocol which is a direct passthrough to `AVCaptureVideoDataOutput`. It exists to allow | ||
| /// mocking `AVCaptureVideoDataOutput` in tests. | ||
| protocol CaptureVideoDataOutput: CaptureOutput { | ||
| /// The underlying instance of `AVCaptureVideoDataOutput`. | ||
| var avOutput: AVCaptureVideoDataOutput { get } | ||
|
|
||
| /// Corresponds to the `alwaysDiscardsLateVideoFrames` property of `AVCaptureVideoDataOutput` | ||
| var alwaysDiscardsLateVideoFrames: Bool { get set } | ||
|
|
||
| /// Corresponds to the `videoSettings` property of `AVCaptureVideoDataOutput` | ||
| var videoSettings: [String: Any]! { get set } | ||
|
|
||
| /// Corresponds to the `setSampleBufferDelegate` method of `AVCaptureVideoDataOutput` | ||
| func setSampleBufferDelegate( | ||
| _ sampleBufferDelegate: AVCaptureVideoDataOutputSampleBufferDelegate?, | ||
| queue sampleBufferCallbackQueue: DispatchQueue? | ||
| ) | ||
| } | ||
|
|
||
| extension AVCaptureVideoDataOutput: CaptureVideoDataOutput { | ||
| var avOutput: AVCaptureVideoDataOutput { | ||
| return self | ||
| } | ||
|
|
||
| func connection(withMediaType mediaType: AVMediaType) -> FLTCaptureConnection? { | ||
| guard let connection = connection(with: mediaType) else { return nil } | ||
| return FLTDefaultCaptureConnection(connection: connection) | ||
| } | ||
| } | ||
|
|
||
| /// A protocol which is a direct passthrough to `AVCapturePhotoOutput`. It exists to allow mocking | ||
| /// `AVCapturePhotoOutput` in tests. | ||
| protocol CapturePhotoOutput: CaptureOutput { | ||
| /// The underlying instance of `AVCapturePhotoOutput`. | ||
| var avOutput: AVCapturePhotoOutput { get } | ||
|
|
||
| /// Corresponds to the `availablePhotoCodecTypes` property of `AVCapturePhotoOutput` | ||
| var availablePhotoCodecTypes: [AVVideoCodecType] { get } | ||
|
|
||
| /// Corresponds to the `isHighResolutionCaptureEnabled` property of `AVCapturePhotoOutput` | ||
| var isHighResolutionCaptureEnabled: Bool { get set } | ||
|
|
||
| /// Corresponds to the `supportedFlashModes` property of `AVCapturePhotoOutput` | ||
| var supportedFlashModes: [AVCaptureDevice.FlashMode] { get } | ||
|
|
||
| /// Corresponds to the `capturePhotoWithSettings` method of `AVCapturePhotoOutput` | ||
| func capturePhoto(with settings: AVCapturePhotoSettings, delegate: AVCapturePhotoCaptureDelegate) | ||
| } | ||
|
|
||
| /// Make AVCapturePhotoOutput conform to FLTCapturePhotoOutput protocol directly | ||
| extension AVCapturePhotoOutput: CapturePhotoOutput { | ||
| var avOutput: AVCapturePhotoOutput { | ||
| return self | ||
| } | ||
|
|
||
| func connection(withMediaType mediaType: AVMediaType) -> FLTCaptureConnection? { | ||
| guard let connection = connection(with: mediaType) else { return nil } | ||
| return FLTDefaultCaptureConnection(connection: connection) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: just
.auto