rename extension

packages/camera/camera/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 0.10.6
 
-* Add support to HEIC format to iOS
+* Add support to HEIF format to iOS
 
 ## 0.10.5+5
 

packages/camera/camera_avfoundation/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## NEXT
 
-* Add support to HEIC format
+* Add support to HEIF format
 
 ## 0.9.13+6
 

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

@@ -99,13 +99,13 @@ - (void)testCaptureToFile_mustSetExtensionToHeicIfAvailablePhotoCodecTypesContai
     if (@available(iOS 11.0, *)) {
         XCTestExpectation *expectation =
             [self expectationWithDescription:
-                      @"Test must set extension to heic if availablePhotoCodecTypes contains HEVC."];
+                      @"Test must set extension to heif if availablePhotoCodecTypes contains 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 setImageExtension:ImageExtensionHEIC];
+        [cam setImageExtension:ImageExtensionHEIF];
 
         // Set photo settings to HEVC
         AVCapturePhotoSettings *settings =

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

@@ -132,7 +132,7 @@ extern OSType FLTGetVideoFormatFromString(NSString *videoFormatString);
  */
 typedef NS_ENUM(NSInteger, ImageExtension) {
   ImageExtensionJPEG,
-  ImageExtensionHEIC,
+  ImageExtensionHEIF,
 };
 
 #pragma mark - image extension

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

@@ -155,8 +155,8 @@ OSType FLTGetVideoFormatFromString(NSString *videoFormatString) {
 ImageExtension FLTGetImageExtensionFromString(NSString *extensionString) {
   if ([extensionString isEqualToString:@"jpg"]) {
     return ImageExtensionJPEG;
-  } else if ([extensionString isEqualToString:@"heic"]) {
-    return ImageExtensionHEIC;
+  } else if ([extensionString isEqualToString:@"heif"]) {
+    return ImageExtensionHEIF;
   } else {
     NSError *error = [NSError
         errorWithDomain:NSCocoaErrorDomain

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

@@ -264,12 +264,12 @@ - (void)captureToFile:(FLTThreadSafeFlutterResult *)result {
     [settings setHighResolutionPhotoEnabled:YES];
   }
 
-  if (_imageExtension == ImageExtensionHEIC) {
+  if (_imageExtension == ImageExtensionHEIF) {
     if (@available(iOS 11.0, *)) {
         if ([self.capturePhotoOutput.availablePhotoCodecTypes containsObject:AVVideoCodecTypeHEVC]) {
             settings = [AVCapturePhotoSettings
                 photoSettingsWithFormat:@{AVVideoCodecKey : AVVideoCodecTypeHEVC}];
-            extension = @"heic";
+            extension = @"heif";
       }
     }
   }

packages/camera/camera_avfoundation/lib/src/avfoundation_camera.dart

@@ -14,8 +14,7 @@ import 'package:stream_transform/stream_transform.dart';
 import 'type_conversion.dart';
 import 'utils.dart';
 
-const MethodChannel _channel =
-    MethodChannel('plugins.flutter.io/camera_avfoundation');
+const MethodChannel _channel = MethodChannel('plugins.flutter.io/camera_avfoundation');
 
 /// An iOS implementation of [CameraPlatform] based on AVFoundation.
 class AVFoundationCamera extends CameraPlatform {
@@ -29,8 +28,7 @@ class AVFoundationCamera extends CameraPlatform {
   /// The name of the channel that device events from the platform side are
   /// sent on.
   @visibleForTesting
-  static const String deviceEventChannelName =
-      'plugins.flutter.io/camera_avfoundation/fromPlatform';
+  static const String deviceEventChannelName = 'plugins.flutter.io/camera_avfoundation/fromPlatform';
 
   /// The controller we need to broadcast the different events coming
   /// from handleMethodCall, specific to camera events.
@@ -40,16 +38,14 @@ class AVFoundationCamera extends CameraPlatform {
   /// This is only exposed for test purposes. It shouldn't be used by clients of
   /// the plugin as it may break or change at any time.
   @visibleForTesting
-  final StreamController<CameraEvent> cameraEventStreamController =
-      StreamController<CameraEvent>.broadcast();
+  final StreamController<CameraEvent> cameraEventStreamController = StreamController<CameraEvent>.broadcast();
 
   /// The controller we need to broadcast the different events coming
   /// from handleMethodCall, specific to general device events.
   ///
   /// It is a `broadcast` because multiple controllers will connect to
   /// different stream views of this Controller.
-  late final StreamController<DeviceEvent> _deviceEventStreamController =
-      _createDeviceEventStreamController();
+  late final StreamController<DeviceEvent> _deviceEventStreamController = _createDeviceEventStreamController();
 
   StreamController<DeviceEvent> _createDeviceEventStreamController() {
     // Set up the method handler lazily.
@@ -65,14 +61,13 @@ class AVFoundationCamera extends CameraPlatform {
   StreamController<CameraImageData>? _frameStreamController;
 
   Stream<CameraEvent> _cameraEvents(int cameraId) =>
-      cameraEventStreamController.stream
-          .where((CameraEvent event) => event.cameraId == cameraId);
+      cameraEventStreamController.stream.where((CameraEvent event) => event.cameraId == cameraId);
 
   @override
   Future<List<CameraDescription>> availableCameras() async {
     try {
-      final List<Map<dynamic, dynamic>>? cameras = await _channel
-          .invokeListMethod<Map<dynamic, dynamic>>('availableCameras');
+      final List<Map<dynamic, dynamic>>? cameras =
+          await _channel.invokeListMethod<Map<dynamic, dynamic>>('availableCameras');
 
       if (cameras == null) {
         return <CameraDescription>[];
@@ -81,8 +76,7 @@ class AVFoundationCamera extends CameraPlatform {
       return cameras.map((Map<dynamic, dynamic> camera) {
         return CameraDescription(
           name: camera['name']! as String,
-          lensDirection:
-              parseCameraLensDirection(camera['lensFacing']! as String),
+          lensDirection: parseCameraLensDirection(camera['lensFacing']! as String),
           sensorOrientation: camera['sensorOrientation']! as int,
         );
       }).toList();
@@ -98,12 +92,9 @@ class AVFoundationCamera extends CameraPlatform {
     bool enableAudio = false,
   }) async {
     try {
-      final Map<String, dynamic>? reply = await _channel
-          .invokeMapMethod<String, dynamic>('create', <String, dynamic>{
+      final Map<String, dynamic>? reply = await _channel.invokeMapMethod<String, dynamic>('create', <String, dynamic>{
         'cameraName': cameraDescription.name,
-        'resolutionPreset': resolutionPreset != null
-            ? _serializeResolutionPreset(resolutionPreset)
-            : null,
+        'resolutionPreset': resolutionPreset != null ? _serializeResolutionPreset(resolutionPreset) : null,
         'enableAudio': enableAudio,
       });
 
@@ -120,10 +111,8 @@ class AVFoundationCamera extends CameraPlatform {
     ImageExtension imageExtension = ImageExtension.jpeg,
   }) {
     _channels.putIfAbsent(cameraId, () {
-      final MethodChannel channel = MethodChannel(
-          'plugins.flutter.io/camera_avfoundation/camera$cameraId');
-      channel.setMethodCallHandler(
-          (MethodCall call) => handleCameraMethodCall(call, cameraId));
+      final MethodChannel channel = MethodChannel('plugins.flutter.io/camera_avfoundation/camera$cameraId');
+      channel.setMethodCallHandler((MethodCall call) => handleCameraMethodCall(call, cameraId));
       return channel;
     });
 
@@ -201,8 +190,7 @@ class AVFoundationCamera extends CameraPlatform {
 
   @override
   Stream<DeviceOrientationChangedEvent> onDeviceOrientationChanged() {
-    return _deviceEventStreamController.stream
-        .whereType<DeviceOrientationChangedEvent>();
+    return _deviceEventStreamController.stream.whereType<DeviceOrientationChangedEvent>();
   }
 
   @override
@@ -212,10 +200,7 @@ class AVFoundationCamera extends CameraPlatform {
   ) async {
     await _channel.invokeMethod<String>(
       'lockCaptureOrientation',
-      <String, dynamic>{
-        'cameraId': cameraId,
-        'orientation': serializeDeviceOrientation(orientation)
-      },
+      <String, dynamic>{'cameraId': cameraId, 'orientation': serializeDeviceOrientation(orientation)},
     );
   }
 
@@ -245,14 +230,11 @@ class AVFoundationCamera extends CameraPlatform {
   }
 
   @override
-  Future<void> prepareForVideoRecording() =>
-      _channel.invokeMethod<void>('prepareForVideoRecording');
+  Future<void> prepareForVideoRecording() => _channel.invokeMethod<void>('prepareForVideoRecording');
 
   @override
-  Future<void> startVideoRecording(int cameraId,
-      {Duration? maxVideoDuration}) async {
-    return startVideoCapturing(
-        VideoCaptureOptions(cameraId, maxDuration: maxVideoDuration));
+  Future<void> startVideoRecording(int cameraId, {Duration? maxVideoDuration}) async {
+    return startVideoCapturing(VideoCaptureOptions(cameraId, maxDuration: maxVideoDuration));
   }
 
   @override
@@ -297,22 +279,18 @@ class AVFoundationCamera extends CameraPlatform {
       );
 
   @override
-  Future<void> resumeVideoRecording(int cameraId) =>
-      _channel.invokeMethod<void>(
+  Future<void> resumeVideoRecording(int cameraId) => _channel.invokeMethod<void>(
         'resumeVideoRecording',
         <String, dynamic>{'cameraId': cameraId},
       );
 
   @override
-  Stream<CameraImageData> onStreamedFrameAvailable(int cameraId,
-      {CameraImageStreamOptions? options}) {
-    _frameStreamController =
-        _createStreamController(onListen: _onFrameStreamListen);
+  Stream<CameraImageData> onStreamedFrameAvailable(int cameraId, {CameraImageStreamOptions? options}) {
+    _frameStreamController = _createStreamController(onListen: _onFrameStreamListen);
     return _frameStreamController!.stream;
   }
 
-  StreamController<CameraImageData> _createStreamController(
-      {Function()? onListen}) {
+  StreamController<CameraImageData> _createStreamController({Function()? onListen}) {
     return StreamController<CameraImageData>(
       onListen: onListen ?? () {},
       onPause: _onFrameStreamPauseResume,
@@ -331,17 +309,14 @@ class AVFoundationCamera extends CameraPlatform {
   }
 
   void _startStreamListener() {
-    const EventChannel cameraEventChannel =
-        EventChannel('plugins.flutter.io/camera_avfoundation/imageStream');
-    _platformImageStreamSubscription =
-        cameraEventChannel.receiveBroadcastStream().listen((dynamic imageData) {
+    const EventChannel cameraEventChannel = EventChannel('plugins.flutter.io/camera_avfoundation/imageStream');
+    _platformImageStreamSubscription = cameraEventChannel.receiveBroadcastStream().listen((dynamic imageData) {
       try {
         _channel.invokeMethod<void>('receivedImageStreamData');
       } on PlatformException catch (e) {
         throw CameraException(e.code, e.message);
       }
-      _frameStreamController!
-          .add(cameraImageFromPlatformData(imageData as Map<dynamic, dynamic>));
+      _frameStreamController!.add(cameraImageFromPlatformData(imageData as Map<dynamic, dynamic>));
     });
   }
 
@@ -353,13 +328,11 @@ class AVFoundationCamera extends CameraPlatform {
   }
 
   void _onFrameStreamPauseResume() {
-    throw CameraException('InvalidCall',
-        'Pause and resume are not supported for onStreamedFrameAvailable');
+    throw CameraException('InvalidCall', 'Pause and resume are not supported for onStreamedFrameAvailable');
   }
 
   @override
-  Future<void> setFlashMode(int cameraId, FlashMode mode) =>
-      _channel.invokeMethod<void>(
+  Future<void> setFlashMode(int cameraId, FlashMode mode) => _channel.invokeMethod<void>(
         'setFlashMode',
         <String, dynamic>{
           'cameraId': cameraId,
@@ -368,8 +341,7 @@ class AVFoundationCamera extends CameraPlatform {
       );
 
   @override
-  Future<void> setExposureMode(int cameraId, ExposureMode mode) =>
-      _channel.invokeMethod<void>(
+  Future<void> setExposureMode(int cameraId, ExposureMode mode) => _channel.invokeMethod<void>(
         'setExposureMode',
         <String, dynamic>{
           'cameraId': cameraId,
@@ -437,8 +409,7 @@ class AVFoundationCamera extends CameraPlatform {
   }
 
   @override
-  Future<void> setFocusMode(int cameraId, FocusMode mode) =>
-      _channel.invokeMethod<void>(
+  Future<void> setFocusMode(int cameraId, FocusMode mode) => _channel.invokeMethod<void>(
         'setFocusMode',
         <String, dynamic>{
           'cameraId': cameraId,
@@ -514,8 +485,7 @@ class AVFoundationCamera extends CameraPlatform {
   }
 
   @override
-  Future<void> setDescriptionWhileRecording(
-      CameraDescription description) async {
+  Future<void> setDescriptionWhileRecording(CameraDescription description) async {
     await _channel.invokeMethod<double>(
       'setDescriptionWhileRecording',
       <String, dynamic>{
@@ -580,8 +550,8 @@ class AVFoundationCamera extends CameraPlatform {
     switch (imageExtension) {
       case ImageExtension.jpeg:
         return 'jpeg';
-      case ImageExtension.heic:
-        return 'heic';
+      case ImageExtension.heif:
+        return 'heif';
     }
   }
 
@@ -590,8 +560,8 @@ class AVFoundationCamera extends CameraPlatform {
     switch (call.method) {
       case 'orientation_changed':
         final Map<String, Object?> arguments = _getArgumentDictionary(call);
-        _deviceEventStreamController.add(DeviceOrientationChangedEvent(
-            deserializeDeviceOrientation(arguments['orientation']! as String)));
+        _deviceEventStreamController
+            .add(DeviceOrientationChangedEvent(deserializeDeviceOrientation(arguments['orientation']! as String)));
         break;
       default:
         throw MissingPluginException();
@@ -635,9 +605,7 @@ class AVFoundationCamera extends CameraPlatform {
         cameraEventStreamController.add(VideoRecordedEvent(
           cameraId,
           XFile(arguments['path']! as String),
-          arguments['maxVideoDuration'] != null
-              ? Duration(milliseconds: arguments['maxVideoDuration']! as int)
-              : null,
+          arguments['maxVideoDuration'] != null ? Duration(milliseconds: arguments['maxVideoDuration']! as int) : null,
         ));
         break;
       case 'error':

packages/camera/camera_platform_interface/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 2.5.3
 
-* Add support to HEIC format to iOS
+* Add support to HEIF format to iOS
 
 ## 2.5.2
 

packages/camera/camera_platform_interface/lib/src/platform_interface/camera_platform.dart

@@ -63,7 +63,7 @@ abstract class CameraPlatform extends PlatformInterface {
   /// On Web this parameter is currently not supported.
   ///
   /// [imageExtension] is used to specify the image extension used.
-  /// [ImageExtension.jpeg] and [ImageExtension.heic] are availables
+  /// [ImageExtension.jpeg] and [ImageExtension.heif] are availables
   /// only in iOS 11.0+.
   Future<void> initializeCamera(
     int cameraId, {
@@ -104,13 +104,11 @@ abstract class CameraPlatform extends PlatformInterface {
   /// Implementations for this:
   /// - Should support all 4 orientations.
   Stream<DeviceOrientationChangedEvent> onDeviceOrientationChanged() {
-    throw UnimplementedError(
-        'onDeviceOrientationChanged() is not implemented.');
+    throw UnimplementedError('onDeviceOrientationChanged() is not implemented.');
   }
 
   /// Locks the capture orientation.
-  Future<void> lockCaptureOrientation(
-      int cameraId, DeviceOrientation orientation) {
+  Future<void> lockCaptureOrientation(int cameraId, DeviceOrientation orientation) {
     throw UnimplementedError('lockCaptureOrientation() is not implemented.');
   }
 
@@ -147,8 +145,7 @@ abstract class CameraPlatform extends PlatformInterface {
   /// Please see [VideoCaptureOptions] for documentation on the
   /// configuration options.
   Future<void> startVideoCapturing(VideoCaptureOptions options) {
-    return startVideoRecording(options.cameraId,
-        maxVideoDuration: options.maxDuration);
+    return startVideoRecording(options.cameraId, maxVideoDuration: options.maxDuration);
   }
 
   /// Stops the video recording and returns the file where it was saved.
@@ -176,8 +173,7 @@ abstract class CameraPlatform extends PlatformInterface {
   ///
   // TODO(bmparr): Add options to control streaming settings (e.g.,
   // resolution and FPS).
-  Stream<CameraImageData> onStreamedFrameAvailable(int cameraId,
-      {CameraImageStreamOptions? options}) {
+  Stream<CameraImageData> onStreamedFrameAvailable(int cameraId, {CameraImageStreamOptions? options}) {
     throw UnimplementedError('onStreamedFrameAvailable() is not implemented.');
   }
 
@@ -276,8 +272,7 @@ abstract class CameraPlatform extends PlatformInterface {
 
   /// Sets the active camera while recording.
   Future<void> setDescriptionWhileRecording(CameraDescription description) {
-    throw UnimplementedError(
-        'setDescriptionWhileRecording() is not implemented.');
+    throw UnimplementedError('setDescriptionWhileRecording() is not implemented.');
   }
 
   /// Returns a widget showing a live camera preview.