improve code

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamPhotoCaptureTests.m

@@ -102,8 +102,7 @@ - (void)testCaptureToFile_mustSetExtensionToHeicIfAvailablePhotoCodecTypesContai
   dispatch_queue_set_specific(captureSessionQueue, FLTCaptureSessionQueueSpecific,
                               (void *)FLTCaptureSessionQueueSpecific, NULL);
   FLTCam *cam = FLTCreateCamWithCaptureSessionQueue(captureSessionQueue);
-  [cam setFileFormat:FLTFileFormatHEIF];
-
+  [cam setFileFormat:FCPFileFormatHEIF];
 
   // Set photo settings to HEVC
   AVCapturePhotoSettings *settings =
@@ -139,4 +138,43 @@ - (void)testCaptureToFile_mustSetExtensionToHeicIfAvailablePhotoCodecTypesContai
   });
   [self waitForExpectationsWithTimeout:1 handler:nil];
 }
+
+- (void)testCaptureToFile_mustSetExtensionToJpegIfAvailablePhotoCodecTypesDoesNotContainHEVC {
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:
+                @"Test must set extension to jpeg if availablePhotoCodecTypes does not contain HEVC."];
+  dispatch_queue_t captureSessionQueue = dispatch_queue_create("capture_session_queue", NULL);
+  dispatch_queue_set_specific(captureSessionQueue, FLTCaptureSessionQueueSpecific,
+                              (void *)FLTCaptureSessionQueueSpecific, NULL);
+  FLTCam *cam = FLTCreateCamWithCaptureSessionQueue(captureSessionQueue);
+  [cam setFileFormat:FCPFileFormatHEIF];
+
+  AVCapturePhotoSettings *settings = [AVCapturePhotoSettings photoSettings];
+  id mockSettings = OCMClassMock([AVCapturePhotoSettings class]);
+  OCMStub([mockSettings photoSettings]).andReturn(settings);
+
+  NSString *filePath = @"test";
+  id mockResult = OCMClassMock([FLTThreadSafeFlutterResult class]);
+  OCMStub([mockResult sendSuccessWithData:filePath]).andDo(^(NSInvocation *invocation) {
+    [expectation fulfill];
+  });
+
+  id mockOutput = OCMClassMock([AVCapturePhotoOutput class]);
+
+  OCMStub([mockOutput capturePhotoWithSettings:OCMOCK_ANY delegate:OCMOCK_ANY])
+      .andDo(^(NSInvocation *invocation) {
+        FLTSavePhotoDelegate *delegate = cam.inProgressSavePhotoDelegates[@(settings.uniqueID)];
+        // Completion runs on IO queue.
+        dispatch_queue_t ioQueue = dispatch_queue_create("io_queue", NULL);
+        dispatch_async(ioQueue, ^{
+          delegate.completionHandler(filePath, nil);
+        });
+      });
+  cam.capturePhotoOutput = mockOutput;
+  // `FLTCam::captureToFile` runs on capture session queue.
+  dispatch_async(captureSessionQueue, ^{
+    [cam captureToFile:mockResult];
+  [self waitForExpectationsWithTimeout:1 handler:nil];
+  });
+}
 @end

packages/camera/camera_avfoundation/ios/Classes/CameraProperties.h

@@ -130,16 +130,16 @@ extern OSType FLTGetVideoFormatFromString(NSString *videoFormatString);
 /**
  * Represents image format. Mirrors FileFormat in camera.dart.
  */
-typedef NS_ENUM(NSInteger, FLTFileFormat) {
-  FLTFileFormatJPEG,
-  FLTFileFormatHEIF,
+typedef NS_ENUM(NSInteger, FCPFileFormat) {
+  FCPFileFormatJPEG,
+  FCPFileFormatHEIF,
 };
 
 #pragma mark - image extension
 
 /**
  * Gets a string representation of FileFormat.
  */
-extern FLTFileFormat FLTGetFileFormatFromString(NSString *fileFormatString);
+extern FCPFileFormat FLTGetFileFormatFromString(NSString *fileFormatString);
 
 NS_ASSUME_NONNULL_END

packages/camera/camera_avfoundation/ios/Classes/CameraProperties.m

@@ -151,11 +151,11 @@ OSType FLTGetVideoFormatFromString(NSString *videoFormatString) {
 
 #pragma mark - video codec
 
-FLTFileFormat FLTGetFileFormatFromString(NSString *fileFormatString) {
+FCPFileFormat FLTGetFileFormatFromString(NSString *fileFormatString) {
   if ([fileFormatString isEqualToString:@"jpg"]) {
-    return FLTFileFormatJPEG;
+    return FCPFileFormatJPEG;
   } else if ([fileFormatString isEqualToString:@"heif"]) {
-    return FLTFileFormatHEIF;
+    return FCPFileFormatHEIF;
   } else {
     NSError *error = [NSError
         errorWithDomain:NSCocoaErrorDomain

packages/camera/camera_avfoundation/ios/Classes/FLTCam.h

@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(assign, nonatomic) FLTFlashMode flashMode;
 // Format used for video and image streaming.
 @property(assign, nonatomic) FourCharCode videoFormat;
-@property(assign, nonatomic) FLTFileFormat fileFormat;
+@property(assign, nonatomic) FCPFileFormat fileFormat;
 
 /// Initializes an `FLTCam` instance.
 /// @param cameraName a name used to uniquely identify the camera.
@@ -51,7 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)captureToFile:(FLTThreadSafeFlutterResult *)result;
 - (void)close;
 - (void)startVideoRecordingWithResult:(FLTThreadSafeFlutterResult *)result;
-- (void)setFileFormat:(FLTFileFormat)fileFormat;
+- (void)setFileFormat:(FCPFileFormat)fileFormat;
 /**
  * Starts recording a video with an optional streaming messenger.
  * If the messenger is non-null then it will be called for each

packages/camera/camera_avfoundation/ios/Classes/FLTCam.m

@@ -144,7 +144,7 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
   _deviceOrientation = orientation;
   _videoFormat = kCVPixelFormatType_32BGRA;
   _inProgressSavePhotoDelegates = [NSMutableDictionary dictionary];
-  _fileFormat = FLTFileFormatJPEG;
+  _fileFormat = FCPFileFormatJPEG;
 
   // To limit memory consumption, limit the number of frames pending processing.
   // After some testing, 4 was determined to be the best maximum value.
@@ -219,7 +219,7 @@ - (void)setVideoFormat:(OSType)videoFormat {
       @{(NSString *)kCVPixelBufferPixelFormatTypeKey : @(videoFormat)};
 }
 
-- (void)setFileFormat:(FLTFileFormat)fileFormat {
+- (void)setFileFormat:(FCPFileFormat)fileFormat {
   _fileFormat = fileFormat;
 }
 
@@ -264,7 +264,7 @@ - (void)captureToFile:(FLTThreadSafeFlutterResult *)result {
     [settings setHighResolutionPhotoEnabled:YES];
   }
 
-  if (_fileFormat == FLTFileFormatHEIF) {
+  if (_fileFormat == FCPFileFormatHEIF) {
     if ([self.capturePhotoOutput.availablePhotoCodecTypes containsObject:AVVideoCodecTypeHEVC]) {
       settings = [AVCapturePhotoSettings
           photoSettingsWithFormat:@{AVVideoCodecKey : AVVideoCodecTypeHEVC}];