[camerax] Implements setExposureMode

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.0+35
+
+* Implements `setExposureMode`.
+
 ## 0.5.0+34
 
 * Implements `setFocusPoint`, `setExposurePoint`, and `setExposureOffset`.

packages/camera/camera_android_camerax/README.md

@@ -34,10 +34,6 @@ and thus, the plugin will fall back to 480p if configured with a
 
 `setExposureMode`is unimplemented.
 
-### Focus mode configuration \[[Issue #120467][120467]\]
-
-`setFocusMode` is unimplemented.
-
 ### Setting maximum duration and stream options for video capture
 
 Calling `startVideoCapturing` with `VideoCaptureOptions` configured with

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java

@@ -29,6 +29,9 @@ public final class CameraAndroidCameraxPlugin implements FlutterPlugin, Activity
   @VisibleForTesting @Nullable public SystemServicesHostApiImpl systemServicesHostApiImpl;
   @VisibleForTesting @Nullable public MeteringPointHostApiImpl meteringPointHostApiImpl;
 
+  @VisibleForTesting @Nullable
+  public Camera2CameraControlHostApiImpl camera2CameraControlHostApiImpl;
+
   @VisibleForTesting
   public @Nullable DeviceOrientationManagerHostApiImpl deviceOrientationManagerHostApiImpl;
 
@@ -120,6 +123,11 @@ public void setUp(
     cameraControlHostApiImpl =
         new CameraControlHostApiImpl(binaryMessenger, instanceManager, context);
     GeneratedCameraXLibrary.CameraControlHostApi.setup(binaryMessenger, cameraControlHostApiImpl);
+    camera2CameraControlHostApiImpl = new Camera2CameraControlHostApiImpl(instanceManager, context);
+    GeneratedCameraXLibrary.Camera2CameraControlHostApi.setup(
+        binaryMessenger, camera2CameraControlHostApiImpl);
+    GeneratedCameraXLibrary.CaptureRequestOptionsHostApi.setup(
+        binaryMessenger, new CaptureRequestOptionsHostApiImpl(instanceManager));
     GeneratedCameraXLibrary.FocusMeteringActionHostApi.setup(
         binaryMessenger, new FocusMeteringActionHostApiImpl(instanceManager));
     GeneratedCameraXLibrary.FocusMeteringResultHostApi.setup(
@@ -217,6 +225,9 @@ public void updateContext(@NonNull Context context) {
     if (cameraControlHostApiImpl != null) {
       cameraControlHostApiImpl.setContext(context);
     }
+    if (camera2CameraControlHostApiImpl != null) {
+      camera2CameraControlHostApiImpl.setContext(context);
+    }
   }
 
   /** Sets {@code LifecycleOwner} that is used to control the lifecycle of the camera by CameraX. */

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CaptureRequestOptionsHostApiImpl.java

@@ -110,8 +110,8 @@ public void create(@NonNull Long identifier, @NonNull Map<Long, Object> options)
     Map<CaptureRequestKeySupportedType, Object> decodedOptions =
         new HashMap<CaptureRequestKeySupportedType, Object>();
     for (Map.Entry<Long, Object> option : options.entrySet()) {
-      decodedOptions.put(
-          CaptureRequestKeySupportedType.values()[option.getKey().intValue()], option.getValue());
+      Integer index = ((Number) option.getKey()).intValue();
+      decodedOptions.put(CaptureRequestKeySupportedType.values()[index], option.getValue());
     }
     instanceManager.addDartCreatedInstance(proxy.create(decodedOptions), identifier);
   }

packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/CameraAndroidCameraxPluginTest.java

@@ -169,6 +169,8 @@ public void onAttachedToActivity_setsActivityAsNeededAndPermissionsRegistry() {
         mock(ImageAnalysisHostApiImpl.class);
     final CameraControlHostApiImpl mockCameraControlHostApiImpl =
         mock(CameraControlHostApiImpl.class);
+    final Camera2CameraControlHostApiImpl mockCamera2CameraControlHostApiImpl =
+        mock(Camera2CameraControlHostApiImpl.class);
 
     when(flutterPluginBinding.getApplicationContext()).thenReturn(mockContext);
 
@@ -180,6 +182,7 @@ public void onAttachedToActivity_setsActivityAsNeededAndPermissionsRegistry() {
     plugin.imageAnalysisHostApiImpl = mockImageAnalysisHostApiImpl;
     plugin.cameraControlHostApiImpl = mockCameraControlHostApiImpl;
     plugin.liveDataHostApiImpl = mock(LiveDataHostApiImpl.class);
+    plugin.camera2CameraControlHostApiImpl = mockCamera2CameraControlHostApiImpl;
 
     plugin.onAttachedToEngine(flutterPluginBinding);
     plugin.onDetachedFromActivityForConfigChanges();
@@ -191,6 +194,7 @@ public void onAttachedToActivity_setsActivityAsNeededAndPermissionsRegistry() {
     verify(mockImageCaptureHostApiImpl).setContext(mockContext);
     verify(mockImageAnalysisHostApiImpl).setContext(mockContext);
     verify(mockCameraControlHostApiImpl).setContext(mockContext);
+    verify(mockCamera2CameraControlHostApiImpl).setContext(mockContext);
   }
 
   @Test
@@ -259,6 +263,8 @@ public void onReattachedToActivityForConfigChanges_setsActivityAndPermissionsReg
         mock(CameraControlHostApiImpl.class);
     final DeviceOrientationManagerHostApiImpl mockDeviceOrientationManagerHostApiImpl =
         mock(DeviceOrientationManagerHostApiImpl.class);
+    final Camera2CameraControlHostApiImpl mockCamera2CameraControlHostApiImpl =
+        mock(Camera2CameraControlHostApiImpl.class);
     final MeteringPointHostApiImpl mockMeteringPointHostApiImpl =
         mock(MeteringPointHostApiImpl.class);
     final ArgumentCaptor<PermissionsRegistry> permissionsRegistryCaptor =
@@ -277,6 +283,7 @@ public void onReattachedToActivityForConfigChanges_setsActivityAndPermissionsReg
     plugin.deviceOrientationManagerHostApiImpl = mockDeviceOrientationManagerHostApiImpl;
     plugin.meteringPointHostApiImpl = mockMeteringPointHostApiImpl;
     plugin.liveDataHostApiImpl = mock(LiveDataHostApiImpl.class);
+    plugin.camera2CameraControlHostApiImpl = mockCamera2CameraControlHostApiImpl;
 
     plugin.onAttachedToEngine(flutterPluginBinding);
     plugin.onReattachedToActivityForConfigChanges(activityPluginBinding);
@@ -294,6 +301,7 @@ public void onReattachedToActivityForConfigChanges_setsActivityAndPermissionsReg
     verify(mockImageCaptureHostApiImpl).setContext(mockActivity);
     verify(mockImageAnalysisHostApiImpl).setContext(mockActivity);
     verify(mockCameraControlHostApiImpl).setContext(mockActivity);
+    verify(mockCamera2CameraControlHostApiImpl).setContext(mockActivity);
 
     // Check permissions registry reference is set.
     verify(mockSystemServicesHostApiImpl)
@@ -347,6 +355,8 @@ public void onDetachedFromActivity_setsContextReferencesBasedOnFlutterPluginBind
     final ImageCaptureHostApiImpl mockImageCaptureHostApiImpl = mock(ImageCaptureHostApiImpl.class);
     final CameraControlHostApiImpl mockCameraControlHostApiImpl =
         mock(CameraControlHostApiImpl.class);
+    final Camera2CameraControlHostApiImpl mockCamera2CameraControlHostApiImpl =
+        mock(Camera2CameraControlHostApiImpl.class);
     final ArgumentCaptor<PermissionsRegistry> permissionsRegistryCaptor =
         ArgumentCaptor.forClass(PermissionsRegistry.class);
 
@@ -360,6 +370,7 @@ public void onDetachedFromActivity_setsContextReferencesBasedOnFlutterPluginBind
     plugin.imageAnalysisHostApiImpl = mockImageAnalysisHostApiImpl;
     plugin.cameraControlHostApiImpl = mockCameraControlHostApiImpl;
     plugin.liveDataHostApiImpl = mock(LiveDataHostApiImpl.class);
+    plugin.camera2CameraControlHostApiImpl = mockCamera2CameraControlHostApiImpl;
 
     plugin.onAttachedToEngine(flutterPluginBinding);
     plugin.onDetachedFromActivity();
@@ -371,5 +382,6 @@ public void onDetachedFromActivity_setsContextReferencesBasedOnFlutterPluginBind
     verify(mockImageCaptureHostApiImpl).setContext(mockContext);
     verify(mockImageAnalysisHostApiImpl).setContext(mockContext);
     verify(mockCameraControlHostApiImpl).setContext(mockContext);
+    verify(mockCamera2CameraControlHostApiImpl).setContext(mockContext);
   }
 }

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

@@ -393,8 +393,10 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
                 children: <Widget>[
                   TextButton(
                     style: styleAuto,
-                    onPressed:
-                        () {}, // TODO(camsim99): Add functionality back here.
+                    onPressed: controller != null
+                        ? () =>
+                            onSetExposureModeButtonPressed(ExposureMode.auto)
+                        : null,
                     onLongPress: () {
                       if (controller != null) {
                         CameraPlatform.instance
@@ -406,8 +408,10 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
                   ),
                   TextButton(
                     style: styleLocked,
-                    onPressed:
-                        () {}, // TODO(camsim99): Add functionality back here.
+                    onPressed: controller != null
+                        ? () =>
+                            onSetExposureModeButtonPressed(ExposureMode.locked)
+                        : null,
                     child: const Text('LOCKED'),
                   ),
                   TextButton(

packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart

@@ -14,12 +14,14 @@ import 'package:stream_transform/stream_transform.dart';
 
 import 'analyzer.dart';
 import 'camera.dart';
+import 'camera2_camera_control.dart';
 import 'camera_control.dart';
 import 'camera_info.dart';
 import 'camera_selector.dart';
 import 'camera_state.dart';
 import 'camerax_library.g.dart';
 import 'camerax_proxy.dart';
+import 'capture_request_options.dart';
 import 'device_orientation_manager.dart';
 import 'exposure_state.dart';
 import 'fallback_strategy.dart';
@@ -548,6 +550,24 @@ class AndroidCameraCameraX extends CameraPlatform {
         point: point, meteringMode: FocusMeteringAction.flagAf);
   }
 
+  /// Sets the exposure mode for taking pictures.
+  ///
+  /// [cameraId] is not used.
+  @override
+  Future<void> setExposureMode(int cameraId, ExposureMode mode) async {
+    final Camera2CameraControl camera2Control =
+        proxy.getCamera2CameraControl(cameraControl);
+    final bool lockExposureMode = mode == ExposureMode.locked;
+
+    final CaptureRequestOptions captureRequestOptions = proxy
+        .createCaptureRequestOptions(<(
+      CaptureRequestKeySupportedType,
+      Object?
+    )>[(CaptureRequestKeySupportedType.controlAeLock, lockExposureMode)]);
+
+    await camera2Control.addCaptureRequestOptions(captureRequestOptions);
+  }
+
   /// Gets the maximum supported zoom level for the selected camera.
   ///
   /// [cameraId] not used.

packages/camera/camera_android_camerax/lib/src/camerax_proxy.dart

@@ -5,10 +5,13 @@
 import 'dart:ui' show Size;
 
 import 'analyzer.dart';
+import 'camera2_camera_control.dart';
+import 'camera_control.dart';
 import 'camera_info.dart';
 import 'camera_selector.dart';
 import 'camera_state.dart';
 import 'camerax_library.g.dart';
+import 'capture_request_options.dart';
 import 'device_orientation_manager.dart';
 import 'fallback_strategy.dart';
 import 'focus_metering_action.dart';
@@ -52,6 +55,8 @@ class CameraXProxy {
         _startListeningForDeviceOrientationChange,
     this.setPreviewSurfaceProvider = _setPreviewSurfaceProvider,
     this.getDefaultDisplayRotation = _getDefaultDisplayRotation,
+    this.getCamera2CameraControl = _getCamera2CameraControl,
+    this.createCaptureRequestOptions = _createCaptureRequestOptions,
     this.createMeteringPoint = _createMeteringPoint,
     this.createFocusMeteringAction = _createFocusMeteringAction,
   });
@@ -142,6 +147,15 @@ class CameraXProxy {
   /// rotation constants.
   Future<int> Function() getDefaultDisplayRotation;
 
+  /// Get [Camera2CameraControl] instance from [cameraControl].
+  Camera2CameraControl Function(CameraControl cameraControl)
+      getCamera2CameraControl;
+
+  /// Create [CapureRequestOptions] with specified options.
+  CaptureRequestOptions Function(
+          List<(CaptureRequestKeySupportedType, Object?)> options)
+      createCaptureRequestOptions;
+
   /// Returns a [MeteringPoint] with the specified coordinates based on
   /// [cameraInfo].
   MeteringPoint Function(double x, double y, CameraInfo cameraInfo)
@@ -255,6 +269,16 @@ class CameraXProxy {
     return DeviceOrientationManager.getDefaultDisplayRotation();
   }
 
+  static Camera2CameraControl _getCamera2CameraControl(
+      CameraControl cameraControl) {
+    return Camera2CameraControl(cameraControl: cameraControl);
+  }
+
+  static CaptureRequestOptions _createCaptureRequestOptions(
+      List<(CaptureRequestKeySupportedType, Object?)> options) {
+    return CaptureRequestOptions(requestedOptions: options);
+  }
+
   static MeteringPoint _createMeteringPoint(
       double x, double y, CameraInfo cameraInfo) {
     return MeteringPoint(x: x, y: y, cameraInfo: cameraInfo);

packages/camera/camera_android_camerax/pubspec.yaml

@@ -2,7 +2,7 @@ name: camera_android_camerax
 description: Android implementation of the camera plugin using the CameraX library.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.5.0+34
+version: 0.5.0+35
 
 environment:
   sdk: ^3.1.0

packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart

@@ -9,13 +9,15 @@ import 'package:async/async.dart';
 import 'package:camera_android_camerax/camera_android_camerax.dart';
 import 'package:camera_android_camerax/src/analyzer.dart';
 import 'package:camera_android_camerax/src/camera.dart';
+import 'package:camera_android_camerax/src/camera2_camera_control.dart';
 import 'package:camera_android_camerax/src/camera_control.dart';
 import 'package:camera_android_camerax/src/camera_info.dart';
 import 'package:camera_android_camerax/src/camera_selector.dart';
 import 'package:camera_android_camerax/src/camera_state.dart';
 import 'package:camera_android_camerax/src/camera_state_error.dart';
 import 'package:camera_android_camerax/src/camerax_library.g.dart';
 import 'package:camera_android_camerax/src/camerax_proxy.dart';
+import 'package:camera_android_camerax/src/capture_request_options.dart';
 import 'package:camera_android_camerax/src/device_orientation_manager.dart';
 import 'package:camera_android_camerax/src/exposure_state.dart';
 import 'package:camera_android_camerax/src/fallback_strategy.dart';
@@ -78,6 +80,7 @@ import 'test_camerax_library.g.dart';
   MockSpec<TestInstanceManagerHostApi>(),
   MockSpec<TestSystemServicesHostApi>(),
   MockSpec<ZoomState>(),
+  MockSpec<Camera2CameraControl>(),
 ])
 @GenerateMocks(<Type>[], customMocks: <MockSpec<Object>>[
   MockSpec<LiveData<CameraState>>(as: #MockLiveCameraState),
@@ -2014,6 +2017,61 @@ void main() {
     expect(camera.captureOrientationLocked, isFalse);
   });
 
+  test('setExposureMode sets expected controlAeLock value via Camera2 interop',
+      () async {
+    final AndroidCameraCameraX camera = AndroidCameraCameraX();
+    const int cameraId = 78;
+    final MockCameraControl mockCameraControl = MockCameraControl();
+    final MockCamera2CameraControl mockCamera2CameraControl =
+        MockCamera2CameraControl();
+
+    // Set directly for test versus calling createCamera.
+    camera.camera = MockCamera();
+
+    // Tell plugin to create detached Camera2CameraControl and
+    // CaptureRequestOptions instances for testing.
+    camera.proxy = CameraXProxy(
+      getCamera2CameraControl: (CameraControl cameraControl) =>
+          cameraControl == mockCameraControl
+              ? mockCamera2CameraControl
+              : Camera2CameraControl.detached(cameraControl: cameraControl),
+      createCaptureRequestOptions:
+          (List<(CaptureRequestKeySupportedType, Object?)> options) =>
+              CaptureRequestOptions.detached(requestedOptions: options),
+    );
+
+    when(camera.camera!.getCameraControl())
+        .thenAnswer((_) async => mockCameraControl);
+
+    // Test auto mode.
+    await camera.setExposureMode(cameraId, ExposureMode.auto);
+
+    VerificationResult verificationResult =
+        verify(mockCamera2CameraControl.addCaptureRequestOptions(captureAny));
+    CaptureRequestOptions capturedCaptureRequestOptions =
+        verificationResult.captured.single as CaptureRequestOptions;
+    List<(CaptureRequestKeySupportedType, Object?)> requestedOptions =
+        capturedCaptureRequestOptions.requestedOptions;
+    expect(requestedOptions.length, equals(1));
+    expect(requestedOptions.first.$1,
+        equals(CaptureRequestKeySupportedType.controlAeLock));
+    expect(requestedOptions.first.$2, equals(false));
+
+    // Test locked mode.
+    clearInteractions(mockCamera2CameraControl);
+    await camera.setExposureMode(cameraId, ExposureMode.locked);
+
+    verificationResult =
+        verify(mockCamera2CameraControl.addCaptureRequestOptions(captureAny));
+    capturedCaptureRequestOptions =
+        verificationResult.captured.single as CaptureRequestOptions;
+    requestedOptions = capturedCaptureRequestOptions.requestedOptions;
+    expect(requestedOptions.length, equals(1));
+    expect(requestedOptions.first.$1,
+        equals(CaptureRequestKeySupportedType.controlAeLock));
+    expect(requestedOptions.first.$2, equals(true));
+  });
+
   test(
       'setExposurePoint clears current auto-exposure metering point as expected',
       () async {