Move fields unused in FLTCam to DefaultCamera

Author: RobertOdrowaz

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

@@ -10,6 +10,9 @@ import CoreMotion
 #endif
 
 final class DefaultCamera: FLTCam, Camera {
+  var dartAPI: FCPCameraEventApi?
+  var onFrameAvailable: (() -> Void)?
+
   override var videoFormat: FourCharCode {
     didSet {
       captureVideoOutput.videoSettings = [
@@ -18,6 +21,8 @@ final class DefaultCamera: FLTCam, Camera {
     }
   }
 
+  private(set) var isPreviewPaused = false
+
   override var deviceOrientation: UIDeviceOrientation {
     get { super.deviceOrientation }
     set {
@@ -42,11 +47,30 @@ final class DefaultCamera: FLTCam, Camera {
   /// Videos are written to disk by `videoAdaptor` on an internal queue managed by AVFoundation.
   private let photoIOQueue = DispatchQueue(label: "io.flutter.camera.photoIOQueue")
 
+  private var videoWriter: FLTAssetWriter?
+  private var videoWriterInput: FLTAssetWriterInput?
+  private var audioWriterInput: FLTAssetWriterInput?
+  private var videoAdaptor: FLTAssetWriterInputPixelBufferAdaptor?
+
+  private var imageStreamHandler: FLTImageStreamHandler?
+
   /// Tracks the latest pixel buffer sent from AVFoundation's sample buffer delegate callback.
   /// Used to deliver the latest pixel buffer to the flutter engine via the `copyPixelBuffer` API.
   private var latestPixelBuffer: CVPixelBuffer?
+
+  private var videoRecordingPath: String?
+  private var isRecordingPaused = false
+  private var isFirstVideoSample = false
+  private var videoIsDisconnected = false
+  private var audioIsDisconnected = false
+  private var isAudioSetup = false
   private var lastVideoSampleTime = CMTime.zero
   private var lastAudioSampleTime = CMTime.zero
+  private var videoTimeOffset = CMTime.zero
+  private var audioTimeOffset = CMTime.zero
+
+  /// Number of frames currently pending processing.
+  private var streamingPendingFramesCount = 0
 
   /// Maximum number of frames pending processing.
   /// To limit memory consumption, limit the number of frames pending processing.

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation_objc/include/camera_avfoundation/FLTCam.h

@@ -23,38 +23,19 @@ NS_ASSUME_NONNULL_BEGIN
 // captureDevice is assignable for the Swift DefaultCamera subclass
 @property(strong, nonatomic) NSObject<FLTCaptureDevice> *captureDevice;
 @property(readonly, nonatomic) CGSize previewSize;
-@property(assign, nonatomic) BOOL isPreviewPaused;
-@property(nonatomic, copy, nullable) void (^onFrameAvailable)(void);
-/// The API instance used to communicate with the Dart side of the plugin. Once initially set, this
-/// should only ever be accessed on the main thread.
-@property(nonatomic, nullable) FCPCameraEventApi *dartAPI;
 // Format used for video and image streaming.
 @property(assign, nonatomic) FourCharCode videoFormat;
 @property(assign, nonatomic) FCPPlatformImageFileFormat fileFormat;
 
 // Properties exposed for the Swift DefaultCamera subclass
-@property(nonatomic, nullable) FLTImageStreamHandler *imageStreamHandler;
-/// Number of frames currently pending processing.
-@property(assign, nonatomic) int streamingPendingFramesCount;
-@property(assign, nonatomic) BOOL isFirstVideoSample;
 @property(assign, nonatomic) BOOL isRecording;
-@property(assign, nonatomic) BOOL isRecordingPaused;
-@property(strong, nonatomic, nullable) NSObject<FLTAssetWriter> *videoWriter;
-@property(assign, nonatomic) BOOL videoIsDisconnected;
-@property(assign, nonatomic) BOOL audioIsDisconnected;
-@property(assign, nonatomic) CMTime videoTimeOffset;
-@property(assign, nonatomic) CMTime audioTimeOffset;
-@property(strong, nonatomic, nullable) NSObject<FLTAssetWriterInput> *videoWriterInput;
-@property(strong, nonatomic, nullable) NSObject<FLTAssetWriterInput> *audioWriterInput;
-@property(nullable) NSObject<FLTAssetWriterInputPixelBufferAdaptor> *videoAdaptor;
 @property(readonly, nonatomic) NSObject<FLTCaptureSession> *videoCaptureSession;
 @property(readonly, nonatomic) NSObject<FLTCaptureSession> *audioCaptureSession;
 @property(readonly, nonatomic) NSObject<FLTDeviceOrientationProviding> *deviceOrientationProvider;
 @property(assign, nonatomic) UIDeviceOrientation lockedCaptureOrientation;
 @property(assign, nonatomic) UIDeviceOrientation deviceOrientation;
 @property(assign, nonatomic) FCPPlatformFlashMode flashMode;
 @property(nonatomic) CMMotionManager *motionManager;
-@property(strong, nonatomic, nullable) NSString *videoRecordingPath;
 @property(nonatomic, copy) CaptureDeviceFactory captureDeviceFactory;
 @property(strong, nonatomic) NSObject<FLTCaptureInput> *captureVideoInput;
 @property(readonly, nonatomic) NSObject<FLTCaptureDeviceInputFactory> *captureDeviceInputFactory;
@@ -64,7 +45,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property(readonly, nonatomic) FLTCamMediaSettingsAVWrapper *mediaSettingsAVWrapper;
 @property(readonly, nonatomic) FCPPlatformMediaSettings *mediaSettings;
 @property(nonatomic, copy) InputPixelBufferAdaptorFactory inputPixelBufferAdaptorFactory;
-@property(assign, nonatomic) BOOL isAudioSetup;
 /// A wrapper for AVCaptureDevice creation to allow for dependency injection in tests.
 @property(nonatomic, copy) AudioCaptureDeviceFactory audioCaptureDeviceFactory;