From d971e62dfe61487331284e227aedde18380ed8ae Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 12 Feb 2024 15:24:37 -0500 Subject: [PATCH 1/2] Add accurate default values to CameraInitializedEvent --- packages/camera/camera_android_camerax/CHANGELOG.md | 5 +++++ .../lib/src/android_camera_camerax.dart | 13 +++++-------- packages/camera/camera_android_camerax/pubspec.yaml | 2 +- .../test/android_camera_camerax_test.dart | 8 ++------ 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index a96bfcefd993..123bbc0c1626 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.5.0+34 + +* Modifies `CameraInitializedEvent` that is sent when camera is initialized to indicate that the initial focus + and exposure modes are auto and that developers may set focus points for both modes. + ## 0.5.0+32 * Removes all remaining `unawaited` calls to fix potential race conditions and updates the diff --git a/packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart b/packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart index b05788d68a43..69ba2e6e5808 100644 --- a/packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart +++ b/packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart @@ -330,16 +330,13 @@ class AndroidCameraCameraX extends CameraPlatform { final ResolutionInfo previewResolutionInfo = await preview!.getResolutionInfo(); - // Retrieve exposure and focus mode configurations: - // TODO(camsim99): Implement support for retrieving exposure mode configuration. - // https://github.com/flutter/flutter/issues/120468 + // Mark auto-focus, auto-exposure and setting points for focus & exposure + // as available operations as CameraX does its best across devices to + // support these by default. const ExposureMode exposureMode = ExposureMode.auto; - const bool exposurePointSupported = false; - - // TODO(camsim99): Implement support for retrieving focus mode configuration. - // https://github.com/flutter/flutter/issues/120467 const FocusMode focusMode = FocusMode.auto; - const bool focusPointSupported = false; + const bool exposurePointSupported = true; + const bool focusPointSupported = true; cameraEventStreamController.add(CameraInitializedEvent( cameraId, diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml index c9da17866935..1103be84b2d7 100644 --- a/packages/camera/camera_android_camerax/pubspec.yaml +++ b/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+32 +version: 0.5.0+34 environment: sdk: ">=3.0.0 <4.0.0" diff --git a/packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart b/packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart index bc6a0d1c6a3b..da8d28a7c329 100644 --- a/packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart +++ b/packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart @@ -734,19 +734,15 @@ void main() { startListeningForDeviceOrientationChange: (_, __) {}, ); - // TODO(camsim99): Modify this when camera configuration is supported and - // default values no longer being used. - // https://github.com/flutter/flutter/issues/120468 - // https://github.com/flutter/flutter/issues/120467 final CameraInitializedEvent testCameraInitializedEvent = CameraInitializedEvent( cameraId, resolutionWidth.toDouble(), resolutionHeight.toDouble(), ExposureMode.auto, - false, + true, FocusMode.auto, - false); + true); // Call createCamera. when(mockPreview.setSurfaceProvider()).thenAnswer((_) async => cameraId); From 44ccb32e522866e67cf8bf192a5a018cba6d958f Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 21 Feb 2024 09:47:08 -0800 Subject: [PATCH 2/2] Bump version --- packages/camera/camera_android_camerax/CHANGELOG.md | 6 +++--- packages/camera/camera_android_camerax/pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index 123bbc0c1626..0b9c5d71b810 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,7 +1,7 @@ -## 0.5.0+34 +## 0.5.0+35 -* Modifies `CameraInitializedEvent` that is sent when camera is initialized to indicate that the initial focus - and exposure modes are auto and that developers may set focus points for both modes. +* Modifies `CameraInitializedEvent` that is sent when the camera is initialized to indicate that the initial focus + and exposure modes are auto and that developers may set focus and exposure points. ## 0.5.0+32 diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml index 1103be84b2d7..ecc1a4cdde87 100644 --- a/packages/camera/camera_android_camerax/pubspec.yaml +++ b/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.0.0 <4.0.0"