[camera] add heif support image iOS

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## NEXT
+
+* Adds support to HEIF format to iOS
+
 ## 0.10.5+5
 
 * Fixes bug where old camera resources were not disposed when switching between camera descriptions.

packages/camera/camera/example/integration_test/camera_test.dart

@@ -329,4 +329,29 @@ void main() {
     },
     skip: !Platform.isIOS,
   );
+
+  testWidgets(
+    'Capture image with fileFormat',
+    (WidgetTester tester) async {
+      final List<CameraDescription> cameras = await availableCameras();
+      if (cameras.isEmpty) {
+        return;
+      }
+      for (final CameraDescription cameraDescription in cameras) {
+        final CameraController controller =
+            CameraController(cameraDescription, ResolutionPreset.low);
+
+        await controller.setFileFormat(FileFormat.heif);
+        await controller.initialize();
+
+        final XFile file = await controller.takePicture();
+        final File fileImage = File(file.path);
+        final Image image =
+            await decodeImageFromList(fileImage.readAsBytesSync());
+
+        expect(image, isNotNull);
+      }
+    },
+    skip: !Platform.isIOS,
+  );
 }

packages/camera/camera/example/ios/Runner.xcodeproj/project.pbxproj

@@ -169,7 +169,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "The Flutter Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

packages/camera/camera/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

packages/camera/camera/example/pubspec.yaml

@@ -30,3 +30,8 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {camera_platform_interface: {path: ../../../camera/camera_platform_interface}}

packages/camera/camera/lib/camera.dart

@@ -12,7 +12,8 @@ export 'package:camera_platform_interface/camera_platform_interface.dart'
         FocusMode,
         ResolutionPreset,
         XFile,
-        ImageFormatGroup;
+        ImageFormatGroup,
+        FileFormat;
 
 export 'src/camera_controller.dart';
 export 'src/camera_image.dart';

packages/camera/camera/lib/src/camera_controller.dart

@@ -237,6 +237,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     this.resolutionPreset, {
     this.enableAudio = true,
     this.imageFormatGroup,
+    this.fileFormat,
   }) : super(CameraValue.uninitialized(description));
 
   /// The properties of the camera device controlled by this controller.
@@ -258,6 +259,13 @@ class CameraController extends ValueNotifier<CameraValue> {
   /// When null the imageFormat will fallback to the platforms default.
   final ImageFormatGroup? imageFormatGroup;
 
+  /// The [FileFormat] describes the compression of the image.
+  ///
+  /// When null the fileFormat will fallback [FileFormat.jpeg]
+  ///
+  /// Only supported on iOS for now.
+  final FileFormat? fileFormat;
+
   /// The id of a camera that hasn't been initialized.
   @visibleForTesting
   static const int kUninitializedCameraId = -1;
@@ -844,6 +852,17 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
   }
 
+  /// Sets the output format for the camera.
+  ///
+  /// If [format] is omitted, the default output format is used.
+  Future<void> setFileFormat(FileFormat format) async {
+    try {
+      await CameraPlatform.instance.setFileFormat(_cameraId, format);
+    } on PlatformException catch (e) {
+      throw CameraException(e.code, e.message);
+    }
+  }
+
   /// Releases the resources of this camera.
   @override
   Future<void> dispose() async {

packages/camera/camera/pubspec.yaml

@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
   Dart.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.10.5+5
+version: 0.10.6
 
 environment:
   sdk: ">=2.19.0 <4.0.0"
@@ -22,8 +22,8 @@ flutter:
 
 dependencies:
   camera_android: ^0.10.7
-  camera_avfoundation: ^0.9.13
-  camera_platform_interface: ^2.5.0
+  camera_avfoundation: ^0.9.13+2
+  camera_platform_interface: ^2.5.1
   camera_web: ^0.3.1
   flutter:
     sdk: flutter
@@ -39,3 +39,11 @@ dev_dependencies:
 
 topics:
   - camera
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {
+    camera_avfoundation: {path: ../../camera/camera_avfoundation},
+    camera_platform_interface: {path: ../../camera/camera_platform_interface},
+   }

packages/camera/camera/test/camera_preview_test.dart

@@ -122,6 +122,12 @@ class FakeController extends ValueNotifier<CameraValue>
 
   @override
   CameraDescription get description => value.description;
+
+  @override
+  FileFormat? get fileFormat => null;
+
+  @override
+  Future<void> setFileFormat(FileFormat format) async {}
 }
 
 void main() {

packages/camera/camera/test/camera_test.dart

@@ -1401,6 +1401,50 @@ void main() {
             'This is a test error message',
           )));
     });
+
+    test('setFileFormat() calls $CameraPlatform', () async {
+      final CameraController cameraController = CameraController(
+          const CameraDescription(
+              name: 'cam',
+              lensDirection: CameraLensDirection.front,
+              sensorOrientation: 90),
+          ResolutionPreset.max);
+      await cameraController.initialize();
+
+      await cameraController.setFileFormat(FileFormat.jpeg);
+
+      verify(CameraPlatform.instance
+              .setFileFormat(cameraController.cameraId, FileFormat.jpeg))
+          .called(1);
+    });
+
+    test('setFileFormat() throws $CameraException on $PlatformException',
+        () async {
+      final CameraController cameraController = CameraController(
+          const CameraDescription(
+              name: 'cam',
+              lensDirection: CameraLensDirection.front,
+              sensorOrientation: 90),
+          ResolutionPreset.max);
+      await cameraController.initialize();
+
+      when(CameraPlatform.instance
+              .setFileFormat(cameraController.cameraId, FileFormat.jpeg))
+          .thenThrow(
+        PlatformException(
+          code: 'TEST_ERROR',
+          message: 'This is a test error message',
+        ),
+      );
+
+      expect(
+          cameraController.setFileFormat(FileFormat.jpeg),
+          throwsA(isA<CameraException>().having(
+            (CameraException error) => error.description,
+            'TEST_ERROR',
+            'This is a test error message',
+          )));
+    });
   });
 }
 
@@ -1554,6 +1598,11 @@ class MockCameraPlatform extends Mock
         Invocation.method(#setExposureOffset, <Object?>[cameraId, offset]),
         returnValue: Future<double>.value(1.0),
       ) as Future<double>;
+
+  @override
+  Future<void> setFileFormat(int cameraId, FileFormat format) async =>
+      super.noSuchMethod(
+          Invocation.method(#setFileFormat, <Object?>[cameraId, format]));
 }
 
 class MockCameraDescription extends CameraDescription {

packages/camera/camera_avfoundation/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.14
+
+* Adds support to HEIF format
+
 ## 0.9.13+7
 
 * Fixes inverted orientation strings.

packages/camera/camera_avfoundation/example/integration_test/camera_test.dart

@@ -319,4 +319,25 @@ void main() {
 
     expect(await completer.future, isNotNull);
   });
+
+  // Test fileFormat is respected when taking a picture.
+  testWidgets('Capture specific image output formats',
+      (WidgetTester tester) async {
+    final List<CameraDescription> cameras =
+        await CameraPlatform.instance.availableCameras();
+    if (cameras.isEmpty) {
+      return;
+    }
+    for (final CameraDescription cameraDescription in cameras) {
+      for (final FileFormat fileFormat in FileFormat.values) {
+        final CameraController controller =
+            CameraController(cameraDescription, ResolutionPreset.low);
+        await controller.initialize();
+        await controller.setFileFormat(fileFormat);
+        final XFile file = await controller.takePicture();
+        await controller.dispose();
+        expect(file.path.endsWith(fileFormat.name()), true);
+      }
+    }
+  });
 }

packages/camera/camera_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj

@@ -376,7 +376,7 @@
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
@@ -386,7 +386,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 		9872F2A25E8A171A111468CD /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -495,7 +495,11 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = RunnerTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "dev.flutter.plugins.cameraExample.camera-exampleTests";
@@ -521,7 +525,11 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = RunnerTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "dev.flutter.plugins.cameraExample.camera-exampleTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -648,7 +656,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -670,7 +681,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",

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

@@ -104,4 +104,12 @@ - (void)testFLTGetStringForUIDeviceOrientation {
   XCTAssertEqualObjects(@"portraitUp", FLTGetStringForUIDeviceOrientation(-1));
 }
 
+#pragma mark - file format tests
+
+- (void)testFLTGetFileFormatForString {
+  XCTAssertEqual(FCPFileFormatJPEG, FCPGetFileFormatFromString(@"jpg"));
+  XCTAssertEqual(FCPFileFormatHEIF, FCPGetFileFormatFromString(@"heif"));
+  XCTAssertEqual(FCPFileFormatInvalid, FCPGetFileFormatFromString(@"unknown"));
+}
+
 @end