[camera_android_camerax] Retrieve lens direction from CameraX directly

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.29
+
+* Modifies lens direction logic to request the value from CameraX directly versus manual detection.
+
 ## 0.6.28
 
 * Adds more descriptive error to camera error stream when image capture fails.

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

@@ -5,7 +5,10 @@
 package io.flutter.plugins.camerax;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
 import androidx.camera.core.CameraInfo;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ExperimentalLensFacing;
 import androidx.camera.core.ExposureState;
 
 /**
@@ -23,6 +26,22 @@ public long sensorRotationDegrees(CameraInfo pigeonInstance) {
     return pigeonInstance.getSensorRotationDegrees();
   }
 
+  @Override
+  @OptIn(markerClass = ExperimentalLensFacing.class)
+  public LensFacing lensFacing(CameraInfo pigeonInstance) {
+    int lensFacing = pigeonInstance.getLensFacing();
+    switch (lensFacing) {
+      case CameraSelector.LENS_FACING_FRONT:
+        return LensFacing.FRONT;
+      case CameraSelector.LENS_FACING_BACK:
+        return LensFacing.BACK;
+      case CameraSelector.LENS_FACING_EXTERNAL:
+        return LensFacing.EXTERNAL;
+      default:
+        return LensFacing.UNKNOWN;
+    }
+  }
+
   @NonNull
   @Override
   public ExposureState exposureState(CameraInfo pigeonInstance) {

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraXLibrary.g.kt

@@ -2181,6 +2181,9 @@ abstract class PigeonApiCameraInfo(
    */
   abstract fun sensorRotationDegrees(pigeon_instance: androidx.camera.core.CameraInfo): Long
 
+  /** Returns the lens facing of this camera. */
+  abstract fun lensFacing(pigeon_instance: androidx.camera.core.CameraInfo): LensFacing
+
   /** Returns a ExposureState. */
   abstract fun exposureState(
       pigeon_instance: androidx.camera.core.CameraInfo
@@ -2263,23 +2266,26 @@ abstract class PigeonApiCameraInfo(
       val pigeon_identifierArg =
           pigeonRegistrar.instanceManager.addHostCreatedInstance(pigeon_instanceArg)
       val sensorRotationDegreesArg = sensorRotationDegrees(pigeon_instanceArg)
+      val lensFacingArg = lensFacing(pigeon_instanceArg)
       val exposureStateArg = exposureState(pigeon_instanceArg)
       val binaryMessenger = pigeonRegistrar.binaryMessenger
       val codec = pigeonRegistrar.codec
       val channelName = "dev.flutter.pigeon.camera_android_camerax.CameraInfo.pigeon_newInstance"
       val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
-      channel.send(listOf(pigeon_identifierArg, sensorRotationDegreesArg, exposureStateArg)) {
-        if (it is List<*>) {
-          if (it.size > 1) {
-            callback(
-                Result.failure(CameraXError(it[0] as String, it[1] as String, it[2] as String?)))
-          } else {
-            callback(Result.success(Unit))
+      channel.send(
+          listOf(pigeon_identifierArg, sensorRotationDegreesArg, lensFacingArg, exposureStateArg)) {
+            if (it is List<*>) {
+              if (it.size > 1) {
+                callback(
+                    Result.failure(
+                        CameraXError(it[0] as String, it[1] as String, it[2] as String?)))
+              } else {
+                callback(Result.success(Unit))
+              }
+            } else {
+              callback(Result.failure(CameraXLibraryPigeonUtils.createConnectionError(channelName)))
+            }
           }
-        } else {
-          callback(Result.failure(CameraXLibraryPigeonUtils.createConnectionError(channelName)))
-        }
-      }
     }
   }
 }

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

@@ -9,15 +9,18 @@
 import static org.mockito.Mockito.when;
 
 import androidx.camera.core.CameraInfo;
+import androidx.camera.core.CameraSelector;
 import androidx.camera.core.CameraState;
 import androidx.camera.core.ExposureState;
 import androidx.camera.core.ZoomState;
 import androidx.lifecycle.LiveData;
+import java.util.Arrays;
+import java.util.List;
 import org.junit.Test;
 
 public class CameraInfoTest {
   @Test
-  public void getSensorRotationDegrees_makesCallToRetrieveSensorRotationDegrees() {
+  public void sensorRotationDegrees_makesCallToRetrieveSensorRotationDegrees() {
     final PigeonApiCameraInfo api = new TestProxyApiRegistrar().getPigeonApiCameraInfo();
 
     final CameraInfo instance = mock(CameraInfo.class);
@@ -27,6 +30,41 @@ public void getSensorRotationDegrees_makesCallToRetrieveSensorRotationDegrees()
     assertEquals(value, api.sensorRotationDegrees(instance));
   }
 
+  @Test
+  public void lensFacing_makesCallToRetrieveLensFacing() {
+    final PigeonApiCameraInfo api = new TestProxyApiRegistrar().getPigeonApiCameraInfo();
+
+    final CameraInfo instance = mock(CameraInfo.class);
+    List<Integer> testedLensFacingValues =
+        Arrays.asList(
+            CameraSelector.LENS_FACING_BACK,
+            CameraSelector.LENS_FACING_FRONT,
+            CameraSelector.LENS_FACING_EXTERNAL,
+            CameraSelector.LENS_FACING_UNKNOWN);
+
+    for (int testedLensFacingValue : testedLensFacingValues) {
+      when(instance.getLensFacing()).thenReturn(testedLensFacingValue);
+
+      LensFacing expected;
+      switch (testedLensFacingValue) {
+        case CameraSelector.LENS_FACING_BACK:
+          expected = LensFacing.BACK;
+          break;
+        case CameraSelector.LENS_FACING_FRONT:
+          expected = LensFacing.FRONT;
+          break;
+        case CameraSelector.LENS_FACING_EXTERNAL:
+          expected = LensFacing.EXTERNAL;
+          break;
+        default:
+          expected = LensFacing.UNKNOWN;
+          break;
+      }
+
+      assertEquals(expected, api.lensFacing(instance));
+    }
+  }
+
   @SuppressWarnings("unchecked")
   @Test
   public void getCameraState_makesCallToRetrieveLiveCameraState() {

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

@@ -307,19 +307,17 @@ class AndroidCameraCameraX extends CameraPlatform {
     String? cameraName;
 
     for (final cameraInfo in cameraInfos) {
-      // Determine the lens direction by filtering the CameraInfo
-      // TODO(gmackall): replace this with call to CameraInfo.getLensFacing when changes containing that method are available
-      if ((await CameraSelector(
-        requireLensFacing: LensFacing.back,
-      ).filter(<CameraInfo>[cameraInfo])).isNotEmpty) {
-        cameraLensDirection = CameraLensDirection.back;
-      } else if ((await CameraSelector(
-        requireLensFacing: LensFacing.front,
-      ).filter(<CameraInfo>[cameraInfo])).isNotEmpty) {
-        cameraLensDirection = CameraLensDirection.front;
-      } else {
-        //Skip this CameraInfo as its lens direction is unknown
-        continue;
+      final LensFacing lensFacing = cameraInfo.lensFacing;
+      switch (lensFacing) {
+        case LensFacing.front:
+          cameraLensDirection = CameraLensDirection.front;
+        case LensFacing.back:
+          cameraLensDirection = CameraLensDirection.back;
+        case LensFacing.external:
+          cameraLensDirection = CameraLensDirection.external;
+        case LensFacing.unknown:
+          // Skip this CameraInfo as its lens direction is unknown
+          continue;
       }
 
       cameraSensorOrientation = cameraInfo.sensorRotationDegrees;

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

@@ -56,9 +56,14 @@ void setUpGenerics({BinaryMessenger? pigeonBinaryMessenger}) {
 
   camerax.CameraInfo.pigeon_setUpMessageHandlers(
     pigeon_newInstance:
-        (int sensorRotationDegrees, camerax.ExposureState exposureState) {
+        (
+          int sensorRotationDegrees,
+          camerax.LensFacing lensFacing,
+          camerax.ExposureState exposureState,
+        ) {
           return CameraInfo.detached(
             sensorRotationDegrees: sensorRotationDegrees,
+            lensFacing: lensFacing,
             exposureState: exposureState,
             pigeon_binaryMessenger: pigeonBinaryMessenger,
           );
@@ -101,6 +106,7 @@ class CameraInfo extends camerax.CameraInfo {
   /// create copies for an [PigeonInstanceManager].
   CameraInfo.detached({
     required super.sensorRotationDegrees,
+    required super.lensFacing,
     required super.exposureState,
     // ignore: non_constant_identifier_names
     super.pigeon_binaryMessenger,
@@ -121,6 +127,7 @@ class CameraInfo extends camerax.CameraInfo {
   CameraInfo pigeon_copy() {
     return CameraInfo.detached(
       sensorRotationDegrees: sensorRotationDegrees,
+      lensFacing: lensFacing,
       exposureState: exposureState,
       pigeon_binaryMessenger: pigeon_binaryMessenger,
     );

packages/camera/camera_android_camerax/lib/src/camerax_library.g.dart

@@ -2107,6 +2107,7 @@ class CameraInfo extends PigeonInternalProxyApiBaseClass {
     super.pigeon_binaryMessenger,
     super.pigeon_instanceManager,
     required this.sensorRotationDegrees,
+    required this.lensFacing,
     required this.exposureState,
   });
 
@@ -2117,14 +2118,21 @@ class CameraInfo extends PigeonInternalProxyApiBaseClass {
   /// (default) orientation.
   final int sensorRotationDegrees;
 
+  /// Returns the lens facing of this camera.
+  final LensFacing lensFacing;
+
   /// Returns a ExposureState.
   final ExposureState exposureState;
 
   static void pigeon_setUpMessageHandlers({
     bool pigeon_clearHandlers = false,
     BinaryMessenger? pigeon_binaryMessenger,
     PigeonInstanceManager? pigeon_instanceManager,
-    CameraInfo Function(int sensorRotationDegrees, ExposureState exposureState)?
+    CameraInfo Function(
+      int sensorRotationDegrees,
+      LensFacing lensFacing,
+      ExposureState exposureState,
+    )?
     pigeon_newInstance,
   }) {
     final _PigeonInternalProxyApiBaseCodec pigeonChannelCodec =
@@ -2157,7 +2165,12 @@ class CameraInfo extends PigeonInternalProxyApiBaseClass {
             arg_sensorRotationDegrees != null,
             'Argument for dev.flutter.pigeon.camera_android_camerax.CameraInfo.pigeon_newInstance was null, expected non-null int.',
           );
-          final ExposureState? arg_exposureState = (args[2] as ExposureState?);
+          final LensFacing? arg_lensFacing = (args[2] as LensFacing?);
+          assert(
+            arg_lensFacing != null,
+            'Argument for dev.flutter.pigeon.camera_android_camerax.CameraInfo.pigeon_newInstance was null, expected non-null LensFacing.',
+          );
+          final ExposureState? arg_exposureState = (args[3] as ExposureState?);
           assert(
             arg_exposureState != null,
             'Argument for dev.flutter.pigeon.camera_android_camerax.CameraInfo.pigeon_newInstance was null, expected non-null ExposureState.',
@@ -2167,12 +2180,14 @@ class CameraInfo extends PigeonInternalProxyApiBaseClass {
                 .addHostCreatedInstance(
                   pigeon_newInstance?.call(
                         arg_sensorRotationDegrees!,
+                        arg_lensFacing!,
                         arg_exposureState!,
                       ) ??
                       CameraInfo.pigeon_detached(
                         pigeon_binaryMessenger: pigeon_binaryMessenger,
                         pigeon_instanceManager: pigeon_instanceManager,
                         sensorRotationDegrees: arg_sensorRotationDegrees!,
+                        lensFacing: arg_lensFacing!,
                         exposureState: arg_exposureState!,
                       ),
                   arg_pigeon_instanceIdentifier!,
@@ -2264,6 +2279,7 @@ class CameraInfo extends PigeonInternalProxyApiBaseClass {
       pigeon_binaryMessenger: pigeon_binaryMessenger,
       pigeon_instanceManager: pigeon_instanceManager,
       sensorRotationDegrees: sensorRotationDegrees,
+      lensFacing: lensFacing,
       exposureState: exposureState,
     );
   }

packages/camera/camera_android_camerax/pigeons/camerax_library.dart

@@ -251,6 +251,9 @@ abstract class CameraInfo {
   /// (default) orientation.
   late int sensorRotationDegrees;
 
+  /// Returns the lens direction of this camera.
+  late LensFacing lensFacing;
+
   /// Returns a ExposureState.
   late ExposureState exposureState;
 

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.6.28
+version: 0.6.29
 
 environment:
   sdk: ^3.9.0