[camera] Implemented ImageStream ImageFormat setting for Dart and Android

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java

@@ -138,15 +138,14 @@ private void prepareMediaRecorder(String outputFilePath) throws IOException {
   }
 
   @SuppressLint("MissingPermission")
-  public void open() throws CameraAccessException {
+  public void open(Integer imageStreamImageFormat) throws CameraAccessException {
     pictureImageReader =
-        ImageReader.newInstance(
-            captureSize.getWidth(), captureSize.getHeight(), ImageFormat.JPEG, 2);
-
+            ImageReader.newInstance(
+                    captureSize.getWidth(), captureSize.getHeight(), ImageFormat.JPEG, 2);
     // Used to steam image byte data to dart side.
     imageStreamReader =
-        ImageReader.newInstance(
-            previewSize.getWidth(), previewSize.getHeight(), ImageFormat.YUV_420_888, 2);
+            ImageReader.newInstance(
+                    previewSize.getWidth(), previewSize.getHeight(), imageStreamImageFormat != null? imageStreamImageFormat : ImageFormat.YUV_420_888, 2);
 
     cameraManager.openCamera(
         cameraName,

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java

@@ -78,7 +78,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull final Result result)
         {
           if (camera != null) {
             try {
-              camera.open();
+              camera.open(call.argument("imageStreamImageFormat"));
               result.success(null);
             } catch (Exception e) {
               handleException(e, result);

packages/camera/camera/example/lib/main.dart

@@ -283,6 +283,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
       cameraDescription,
       ResolutionPreset.medium,
       enableAudio: enableAudio,
+      imageStreamImageFormat: ImageFormatGroup.jpeg
     );
 
     // If the controller is updated then update the UI.

packages/camera/camera/example/pubspec.yaml

@@ -22,5 +22,5 @@ flutter:
   uses-material-design: true
 
 environment:
-  sdk: ">=2.0.0-dev.28.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
   flutter: ">=1.9.1+hotfix.4 <2.0.0"

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

@@ -36,6 +36,7 @@ class CameraValue {
     this.isTakingPicture,
     this.isStreamingImages,
     bool isRecordingPaused,
+    this.imageStreamImageFormat,
   }) : _isRecordingPaused = isRecordingPaused;
 
   /// Creates a new camera controller state for an uninitialized controller.
@@ -86,6 +87,11 @@ class CameraValue {
   /// When true [errorDescription] describes the error.
   bool get hasError => errorDescription != null;
 
+  /// The [ImageFormatGroup] describes the output of the raw image format.
+  ///
+  /// When null the imageFormat will fallback to the platforms default
+  final ImageFormatGroup imageStreamImageFormat;
+
   /// Creates a modified copy of the object.
   ///
   /// Explicitly specified fields get the specified value, all other fields get
@@ -98,6 +104,7 @@ class CameraValue {
     String errorDescription,
     Size previewSize,
     bool isRecordingPaused,
+    ImageFormatGroup imageStreamImageFormat,
   }) {
     return CameraValue(
       isInitialized: isInitialized ?? this.isInitialized,
@@ -107,6 +114,8 @@ class CameraValue {
       isTakingPicture: isTakingPicture ?? this.isTakingPicture,
       isStreamingImages: isStreamingImages ?? this.isStreamingImages,
       isRecordingPaused: isRecordingPaused ?? _isRecordingPaused,
+      imageStreamImageFormat:
+          imageStreamImageFormat ?? this.imageStreamImageFormat,
     );
   }
 
@@ -117,7 +126,8 @@ class CameraValue {
         'isInitialized: $isInitialized, '
         'errorDescription: $errorDescription, '
         'previewSize: $previewSize, '
-        'isStreamingImages: $isStreamingImages)';
+        'isStreamingImages: $isStreamingImages, '
+        'imageStreamImageFormat: $imageStreamImageFormat)';
   }
 }
 
@@ -134,6 +144,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     this.description,
     this.resolutionPreset, {
     this.enableAudio = true,
+    this.imageStreamImageFormat,
   }) : super(const CameraValue.uninitialized());
 
   /// The properties of the camera device controlled by this controller.
@@ -150,6 +161,11 @@ class CameraController extends ValueNotifier<CameraValue> {
   /// Whether to include audio when recording a video.
   final bool enableAudio;
 
+  /// The [ImageFormatGroup] describes the output of the raw image format.
+  ///
+  /// When null the imageFormat will fallback to the platforms default
+  final ImageFormatGroup imageStreamImageFormat;
+
   int _cameraId;
   bool _isDisposed = false;
   StreamSubscription<dynamic> _imageStreamSubscription;
@@ -190,12 +206,16 @@ class CameraController extends ValueNotifier<CameraValue> {
         );
       }).first;
 
-      await CameraPlatform.instance.initializeCamera(_cameraId);
+      await CameraPlatform.instance.initializeCamera(
+        _cameraId,
+        imageStreamImageFormat:
+            imageFormatGroupAsIntegerValue(imageStreamImageFormat),
+      );
 
       value = value.copyWith(
-        isInitialized: true,
-        previewSize: await previewSize,
-      );
+          isInitialized: true,
+          previewSize: await previewSize,
+          imageStreamImageFormat: imageStreamImageFormat);
     } on PlatformException catch (e) {
       throw CameraException(e.code, e.message);
     }

packages/camera/camera/lib/src/camera_image.dart

@@ -65,6 +65,12 @@ enum ImageFormatGroup {
   /// On iOS, this is `kCVPixelFormatType_32BGRA`. See
   /// https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers/kcvpixelformattype_32bgra?language=objc
   bgra8888,
+
+  /// 32-big RGB image encoded into JPEG bytes.
+  ///
+  /// On Android, this is `android.graphics.ImageFormat.JPEG`. See
+  /// https://developer.android.com/reference/android/graphics/ImageFormat#JPEG
+  jpeg,
 }
 
 /// Describes how pixels are represented in an image.
@@ -86,9 +92,13 @@ class ImageFormat {
 
 ImageFormatGroup _asImageFormatGroup(dynamic rawFormat) {
   if (defaultTargetPlatform == TargetPlatform.android) {
+    switch (rawFormat) {
     // android.graphics.ImageFormat.YUV_420_888
-    if (rawFormat == 35) {
-      return ImageFormatGroup.yuv420;
+      case 35:
+        return ImageFormatGroup.yuv420;
+    // android.graphics.ImageFormat.JPEG
+      case 256:
+        return ImageFormatGroup.jpeg;
     }
   }
 
@@ -106,6 +116,37 @@ ImageFormatGroup _asImageFormatGroup(dynamic rawFormat) {
   return ImageFormatGroup.unknown;
 }
 
+/// Converts [ImageFormatGroup] to integer definition of the raw format
+int imageFormatGroupAsIntegerValue(ImageFormatGroup imageFormatGroup) {
+  if (defaultTargetPlatform == TargetPlatform.iOS) {
+    switch (imageFormatGroup) {
+      // kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
+      case ImageFormatGroup.yuv420:
+        return 875704438;
+      // kCVPixelFormatType_32BGRA
+      case ImageFormatGroup.bgra8888:
+        return 1111970369;
+      case ImageFormatGroup.jpeg:
+      case ImageFormatGroup.unknown:
+        return 0;
+    }
+  } else if (defaultTargetPlatform == TargetPlatform.android) {
+    switch (imageFormatGroup) {
+    // kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
+      case ImageFormatGroup.yuv420:
+        return 35;
+    // kCVPixelFormatType_32BGRA
+      case ImageFormatGroup.bgra8888:
+      case ImageFormatGroup.unknown:
+        return 0;
+      case ImageFormatGroup.jpeg:
+        return 256;
+    }
+  }
+  // unknown ImageFormatGroup or unsupported platform
+  return 0;
+}
+
 /// A single complete image buffer from the platform camera.
 ///
 /// This class allows for direct application access to the pixel data of an

packages/camera/camera/pubspec.yaml

@@ -8,7 +8,8 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 dependencies:
   flutter:
     sdk: flutter
-  camera_platform_interface: ^1.0.0
+  camera_platform_interface:
+    path: ../camera_platform_interface
 
 dev_dependencies:
   path_provider: ^0.5.0
@@ -31,5 +32,5 @@ flutter:
         pluginClass: CameraPlugin
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
   flutter: ">=1.12.13+hotfix.5"

packages/camera/camera/test/camera_test.dart

@@ -311,6 +311,24 @@ void main() {
           )));
     });
   });
+
+  test('imageFormat can be set', () async {
+    CameraController cameraController = CameraController(
+      CameraDescription(
+          name: 'cam',
+          lensDirection: CameraLensDirection.back,
+          sensorOrientation: 90),
+      ResolutionPreset.max,
+      imageStreamImageFormat: ImageFormatGroup.jpeg,
+    );
+
+    await cameraController.initialize();
+    expect(cameraController.value.imageStreamImageFormat, ImageFormatGroup.jpeg);
+  });
+
+  // test('imageFormat throws $CameraException when uninitialized', () {
+  //   //TODO
+  // });
 }
 
 class MockCameraPlatform extends Mock

packages/camera/camera/test/camera_value_test.dart

@@ -96,7 +96,7 @@ void main() {
       );
 
       expect(cameraValue.toString(),
-          'CameraValue(isRecordingVideo: false, isInitialized: false, errorDescription: null, previewSize: Size(10.0, 10.0), isStreamingImages: false)');
+          'CameraValue(isRecordingVideo: false, isInitialized: false, errorDescription: null, previewSize: Size(10.0, 10.0), isStreamingImages: false, imageStreamImageFormat: null)');
     });
   });
 }

packages/camera/camera_platform_interface/lib/src/method_channel/method_channel_camera.dart

@@ -7,6 +7,7 @@ import 'dart:async';
 import 'package:camera_platform_interface/camera_platform_interface.dart';
 import 'package:camera_platform_interface/src/utils/utils.dart';
 import 'package:cross_file/cross_file.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:meta/meta.dart';
@@ -75,7 +76,7 @@ class MethodChannelCamera extends CameraPlatform {
   }
 
   @override
-  Future<void> initializeCamera(int cameraId) {
+  Future<void> initializeCamera(int cameraId, {int imageStreamImageFormat}) {
     _channels.putIfAbsent(cameraId, () {
       final channel = MethodChannel('flutter.io/cameraPlugin/camera$cameraId');
       channel.setMethodCallHandler(
@@ -93,6 +94,7 @@ class MethodChannelCamera extends CameraPlatform {
       'initialize',
       <String, dynamic>{
         'cameraId': cameraId,
+        'imageStreamImageFormat': imageStreamImageFormat,
       },
     );
 

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

@@ -52,7 +52,7 @@ abstract class CameraPlatform extends PlatformInterface {
   }
 
   /// Initializes the camera on the device.
-  Future<void> initializeCamera(int cameraId) {
+  Future<void> initializeCamera(int cameraId, {int imageStreamImageFormat}) {
     throw UnimplementedError('initializeCamera() is not implemented.');
   }