[camera] android-rework part 5: Android FPS range, resolution and sensor orientation features

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/features/fpsrange/FpsRangeFeature.java

@@ -5,6 +5,7 @@
 package io.flutter.plugins.camera.features.fpsrange;
 
 import android.hardware.camera2.CaptureRequest;
+import android.os.Build;
 import android.util.Range;
 import io.flutter.plugins.camera.CameraProperties;
 import io.flutter.plugins.camera.features.CameraFeature;
@@ -14,6 +15,7 @@
  * API.
  */
 public class FpsRangeFeature extends CameraFeature<Range<Integer>> {
+  private static final Range<Integer> MAX_PIXEL4A_RANGE = new Range<>(30, 30);
   private Range<Integer> currentSetting;
 
   /**
@@ -24,27 +26,35 @@ public class FpsRangeFeature extends CameraFeature<Range<Integer>> {
   public FpsRangeFeature(CameraProperties cameraProperties) {
     super(cameraProperties);
 
-    Range<Integer>[] ranges = cameraProperties.getControlAutoExposureAvailableTargetFpsRanges();
+    if (isPixel4A()) {
+      // HACK: There is a bug in the Pixel 4A where it cannot support 60fps modes
+      // even though they are reported as supported by
+      // `getControlAutoExposureAvailableTargetFpsRanges`.
+      // For max device compatibility we will keep FPS under 60 even if they report they are
+      // capable of achieving 60 fps. Highest working FPS is 30.
+      // https://issuetracker.google.com/issues/189237151
+      currentSetting = MAX_PIXEL4A_RANGE;
+    } else {
+      Range<Integer>[] ranges = cameraProperties.getControlAutoExposureAvailableTargetFpsRanges();
 
-    if (ranges != null) {
-      for (Range<Integer> range : ranges) {
-        int upper = range.getUpper();
+      if (ranges != null) {
+        for (Range<Integer> range : ranges) {
+          int upper = range.getUpper();
 
-        // There is a bug in the Pixel 4A where it cannot support 60fps modes
-        // even though they are reported as supported by
-        // `getControlAutoExposureAvailableTargetFpsRanges`.
-        // For max device compatibility we will keep FPS under 60 even if they report they are
-        // capable of achieving 60 fps.
-        // https://issuetracker.google.com/issues/189237151
-        if (upper >= 10 && upper < 60) {
-          if (currentSetting == null || upper > currentSetting.getUpper()) {
-            currentSetting = range;
+          if (upper >= 10) {
+            if (currentSetting == null || upper > currentSetting.getUpper()) {
+              currentSetting = range;
+            }
           }
         }
       }
     }
   }
 
+  private boolean isPixel4A() {
+    return Build.BRAND.equals("google") && Build.MODEL.equals("Pixel 4a");
+  }
+
   @Override
   public String getDebugName() {
     return "FpsRangeFeature";

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java

@@ -30,14 +30,18 @@ public class ResolutionFeature extends CameraFeature<ResolutionPreset> {
    *
    * @param cameraProperties Collection of characteristics for the current camera device.
    * @param resolutionPreset Platform agnostic enum containing resolution information.
-   * @param cameraId Camera identifier of the camera for which to configure the resolution.
+   * @param cameraName Camera identifier of the camera for which to configure the resolution.
    */
   public ResolutionFeature(
-      CameraProperties cameraProperties, ResolutionPreset resolutionPreset, int cameraId) {
+      CameraProperties cameraProperties, ResolutionPreset resolutionPreset, String cameraName) {
     super(cameraProperties);
     this.currentSetting = resolutionPreset;
-    this.cameraId = cameraId;
-
+    try {
+      this.cameraId = Integer.parseInt(cameraName, 10);
+    } catch (NumberFormatException e) {
+      this.cameraId = -1;
+      return;
+    }
     configureResolution(resolutionPreset, cameraId);
   }
 
@@ -54,6 +58,10 @@ public ResolutionFeature(
    */
   public static CamcorderProfile getBestAvailableCamcorderProfileForResolutionPreset(
       int cameraId, ResolutionPreset preset) {
+    if (cameraId < 0) {
+      throw new AssertionError(
+          "getBestAvailableCamcorderProfileForResolutionPreset can only be used with valid (>=0) camera identifiers.");
+    }
 
     switch (preset) {
         // All of these cases deliberately fall through to get the best available profile.
@@ -103,10 +111,12 @@ static Size computeBestPreviewSize(int cameraId, ResolutionPreset preset) {
   }
 
   private void configureResolution(ResolutionPreset resolutionPreset, int cameraId) {
+    if (!checkIsSupported()) {
+      return;
+    }
     recordingProfile =
         getBestAvailableCamcorderProfileForResolutionPreset(cameraId, resolutionPreset);
     captureSize = new Size(recordingProfile.videoFrameWidth, recordingProfile.videoFrameHeight);
-
     previewSize = computeBestPreviewSize(cameraId, resolutionPreset);
   }
 
@@ -129,7 +139,7 @@ public void setValue(ResolutionPreset value) {
   // Always supported
   @Override
   public boolean checkIsSupported() {
-    return true;
+    return cameraId >= 0;
   }
 
   @Override
@@ -157,7 +167,7 @@ public Size getPreviewSize() {
   }
 
   /**
-   * Get the optimal capture size based on the configured resolution.
+   * Gets the optimal capture size based on the configured resolution.
    *
    * @return The optimal capture size.
    */

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/features/sensororientation/DeviceOrientationManager.java

@@ -19,6 +19,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
+import io.flutter.embedding.engine.systemchannels.PlatformChannel.DeviceOrientation;
 import io.flutter.plugins.camera.DartMessenger;
 
 /**
@@ -153,13 +154,7 @@ private void startSensorListener() {
         new OrientationEventListener(activity, SensorManager.SENSOR_DELAY_NORMAL) {
           @Override
           public void onOrientationChanged(int angle) {
-            if (!isSystemAutoRotationLocked()) {
-              PlatformChannel.DeviceOrientation newOrientation = calculateSensorOrientation(angle);
-              if (!newOrientation.equals(lastOrientation)) {
-                lastOrientation = newOrientation;
-                messenger.sendDeviceOrientationChangeEvent(newOrientation);
-              }
-            }
+            handleSensorOrientationChange(angle);
           }
         };
     if (orientationEventListener.canDetectOrientation()) {
@@ -175,19 +170,62 @@ private void startUIListener() {
         new BroadcastReceiver() {
           @Override
           public void onReceive(Context context, Intent intent) {
-            if (isSystemAutoRotationLocked()) {
-              PlatformChannel.DeviceOrientation orientation = getUIOrientation();
-              if (!orientation.equals(lastOrientation)) {
-                lastOrientation = orientation;
-                messenger.sendDeviceOrientationChangeEvent(orientation);
-              }
-            }
+            handleUIOrientationChange();
           }
         };
     activity.registerReceiver(broadcastReceiver, orientationIntentFilter);
     broadcastReceiver.onReceive(activity, null);
   }
 
+  /**
+   * Handles orientation changes based on information from the device's sensors.
+   *
+   * <p>This method is visible for testing purposes only and should never be used outside this
+   * class.
+   *
+   * @param angle of the current orientation.
+   */
+  @VisibleForTesting
+  void handleSensorOrientationChange(int angle) {
+    if (!isAccelerometerRotationLocked()) {
+      PlatformChannel.DeviceOrientation orientation = calculateSensorOrientation(angle);
+      lastOrientation = handleOrientationChange(orientation, lastOrientation, messenger);
+    }
+  }
+
+  /**
+   * Handles orientation changes based on change events triggered by the OrientationIntentFilter.
+   *
+   * <p>This method is visible for testing purposes only and should never be used outside this
+   * class.
+   */
+  @VisibleForTesting
+  void handleUIOrientationChange() {
+    if (isAccelerometerRotationLocked()) {
+      PlatformChannel.DeviceOrientation orientation = getUIOrientation();
+      lastOrientation = handleOrientationChange(orientation, lastOrientation, messenger);
+    }
+  }
+
+  /**
+   * Handles orientation changes coming from either the device's sensors or the
+   * OrientationIntentFilter.
+   *
+   * <p>This method is visible for testing purposes only and should never be used outside this
+   * class.
+   */
+  @VisibleForTesting
+  static DeviceOrientation handleOrientationChange(
+      DeviceOrientation newOrientation,
+      DeviceOrientation previousOrientation,
+      DartMessenger messenger) {
+    if (!newOrientation.equals(previousOrientation)) {
+      messenger.sendDeviceOrientationChangeEvent(newOrientation);
+    }
+
+    return newOrientation;
+  }
+
   private void stopSensorListener() {
     if (orientationEventListener == null) {
       return;
@@ -204,7 +242,7 @@ private void stopUIListener() {
     broadcastReceiver = null;
   }
 
-  private boolean isSystemAutoRotationLocked() {
+  private boolean isAccelerometerRotationLocked() {
     return android.provider.Settings.System.getInt(
             activity.getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0)
         != 1;

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/features/fpsrange/FpsRangeFeaturePixel4aTest.java

@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.camera.features.fpsrange;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import android.os.Build;
+import android.util.Range;
+import io.flutter.plugins.camera.CameraProperties;
+import io.flutter.plugins.camera.utils.TestUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class FpsRangeFeaturePixel4aTest {
+  @Test
+  public void ctor_should_initialize_fps_range_with_30_when_device_is_pixel_4a() {
+    TestUtils.setFinalStatic(Build.class, "BRAND", "google");
+    TestUtils.setFinalStatic(Build.class, "MODEL", "Pixel 4a");
+
+    FpsRangeFeature fpsRangeFeature = new FpsRangeFeature(mock(CameraProperties.class));
+    Range<Integer> range = fpsRangeFeature.getValue();
+    assertEquals(30, (int) range.getLower());
+    assertEquals(30, (int) range.getUpper());
+  }
+}

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/features/fpsrange/FpsRangeFeatureTest.java

@@ -13,11 +13,27 @@
 import static org.mockito.Mockito.when;
 
 import android.hardware.camera2.CaptureRequest;
+import android.os.Build;
 import android.util.Range;
 import io.flutter.plugins.camera.CameraProperties;
+import io.flutter.plugins.camera.utils.TestUtils;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class FpsRangeFeatureTest {
+  @Before
+  public void before() {
+    TestUtils.setFinalStatic(Build.class, "BRAND", "Test Brand");
+    TestUtils.setFinalStatic(Build.class, "MODEL", "Test Model");
+  }
+
+  @After
+  public void after() {
+    TestUtils.setFinalStatic(Build.class, "BRAND", null);
+    TestUtils.setFinalStatic(Build.class, "MODEL", null);
+  }
+
   @Test
   public void ctor_should_initialize_fps_range_with_highest_upper_value_from_range_array() {
     FpsRangeFeature fpsRangeFeature = createTestInstance();

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/features/resolution/ResolutionFeatureTest.java

@@ -17,7 +17,7 @@
 import org.mockito.MockedStatic;
 
 public class ResolutionFeatureTest {
-  private static final int cameraId = 1;
+  private static final String cameraName = "1";
   private CamcorderProfile mockProfileLow;
   private MockedStatic<CamcorderProfile> mockedStaticProfile;
 
@@ -82,7 +82,7 @@ public void after() {
   public void getDebugName_should_return_the_name_of_the_feature() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     ResolutionFeature resolutionFeature =
-        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraId);
+        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraName);
 
     assertEquals("ResolutionFeature", resolutionFeature.getDebugName());
   }
@@ -91,7 +91,7 @@ public void getDebugName_should_return_the_name_of_the_feature() {
   public void getValue_should_return_initial_value_when_not_set() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     ResolutionFeature resolutionFeature =
-        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraId);
+        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraName);
 
     assertEquals(ResolutionPreset.max, resolutionFeature.getValue());
   }
@@ -100,7 +100,7 @@ public void getValue_should_return_initial_value_when_not_set() {
   public void getValue_should_echo_setValue() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     ResolutionFeature resolutionFeature =
-        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraId);
+        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraName);
 
     resolutionFeature.setValue(ResolutionPreset.high);
 
@@ -111,7 +111,7 @@ public void getValue_should_echo_setValue() {
   public void checkIsSupport_returns_true() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     ResolutionFeature resolutionFeature =
-        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraId);
+        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraName);
 
     assertTrue(resolutionFeature.checkIsSupported());
   }