Merge "FPS range query API council feedback" into androidx-main

Author: Treehugger Robot

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInfoAdapter.kt

@@ -174,11 +174,9 @@ class CameraInfoAdapter @Inject constructor(
     override fun isFocusMeteringSupported(action: FocusMeteringAction) =
         focusMeteringControl.isFocusMeteringSupported(action)
 
-    override fun getSupportedFrameRateRanges(): List<Range<Int>> {
-        return cameraProperties
-            .metadata[CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES]?.toList()
-            ?: listOf()
-    }
+    override fun getSupportedFrameRateRanges(): Set<Range<Int>> = cameraProperties
+        .metadata[CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES]?.toSet()
+        ?: emptySet()
 
     override fun isZslSupported(): Boolean {
         Log.warn { "TODO: isZslSupported are not yet supported." }

camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/adapter/CameraInfoAdapterTest.kt

@@ -69,7 +69,7 @@ class CameraInfoAdapterTest {
     @Test
     fun getSupportedFpsRanges() {
         // Act.
-        val ranges: List<Range<Int>> = cameraInfoAdapter.supportedFrameRateRanges
+        val ranges: Set<Range<Int>> = cameraInfoAdapter.supportedFrameRateRanges
 
         // Assert.
         assertThat(ranges).containsExactly(

camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/interop/Camera2CameraInfoTest.kt

@@ -155,7 +155,7 @@ class Camera2CameraInfoTest {
                 throw NotImplementedError("Not used in testing")
             }
 
-            override fun getSupportedFrameRateRanges(): MutableList<Range<Int>> {
+            override fun getSupportedFrameRateRanges(): Set<Range<Int>> {
                 throw NotImplementedError("Not used in testing")
             }
 

camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraInfoImpl.java

@@ -69,6 +69,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -493,14 +494,14 @@ public Quirks getCameraQuirks() {
 
     @NonNull
     @Override
-    public List<Range<Integer>> getSupportedFrameRateRanges() {
+    public Set<Range<Integer>> getSupportedFrameRateRanges() {
         Range<Integer>[] availableTargetFpsRanges =
                 mCameraCharacteristicsCompat.get(
                         CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES);
         if (availableTargetFpsRanges != null) {
-            return Arrays.asList(availableTargetFpsRanges);
+            return new HashSet<>(Arrays.asList(availableTargetFpsRanges));
         } else {
-            return Collections.emptyList();
+            return Collections.emptySet();
         }
     }
 

camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CameraInfoImplTest.java

@@ -658,8 +658,8 @@ public void cameraInfo_canReturnSupportedFpsRanges() throws CameraAccessExceptio
         CameraInfo cameraInfo2 = new Camera2CameraInfoImpl(CAMERA2_ID,
                 mCameraManagerCompat);
 
-        List<Range<Integer>> resultFpsRanges0 = cameraInfo0.getSupportedFrameRateRanges();
-        List<Range<Integer>> resultFpsRanges2 = cameraInfo2.getSupportedFrameRateRanges();
+        Set<Range<Integer>> resultFpsRanges0 = cameraInfo0.getSupportedFrameRateRanges();
+        Set<Range<Integer>> resultFpsRanges2 = cameraInfo2.getSupportedFrameRateRanges();
 
         assertThat(resultFpsRanges0).containsExactly((Object[]) CAMERA0_AE_FPS_RANGES);
         assertThat(resultFpsRanges2).containsExactly((Object[]) CAMERA2_AE_FPS_RANGES);
@@ -673,7 +673,7 @@ public void cameraInfo_returnsEmptyFpsRanges_whenNotSupported()
         CameraInfo cameraInfo1 = new Camera2CameraInfoImpl(CAMERA1_ID,
                 mCameraManagerCompat);
 
-        List<Range<Integer>> resultFpsRanges1 = cameraInfo1.getSupportedFrameRateRanges();
+        Set<Range<Integer>> resultFpsRanges1 = cameraInfo1.getSupportedFrameRateRanges();
 
         assertThat(resultFpsRanges1).isEmpty();
     }

camera/camera-core/api/current.txt

@@ -47,7 +47,7 @@ package androidx.camera.core {
     method public default int getLensFacing();
     method public int getSensorRotationDegrees();
     method public int getSensorRotationDegrees(int);
-    method public default java.util.List<android.util.Range<java.lang.Integer!>!> getSupportedFrameRateRanges();
+    method public default java.util.Set<android.util.Range<java.lang.Integer!>!> getSupportedFrameRateRanges();
     method public androidx.lifecycle.LiveData<java.lang.Integer!> getTorchState();
     method public androidx.lifecycle.LiveData<androidx.camera.core.ZoomState!> getZoomState();
     method public boolean hasFlashUnit();

camera/camera-core/api/public_plus_experimental_current.txt

@@ -47,7 +47,7 @@ package androidx.camera.core {
     method public default int getLensFacing();
     method public int getSensorRotationDegrees();
     method public int getSensorRotationDegrees(int);
-    method public default java.util.List<android.util.Range<java.lang.Integer!>!> getSupportedFrameRateRanges();
+    method public default java.util.Set<android.util.Range<java.lang.Integer!>!> getSupportedFrameRateRanges();
     method public androidx.lifecycle.LiveData<java.lang.Integer!> getTorchState();
     method public androidx.lifecycle.LiveData<androidx.camera.core.ZoomState!> getZoomState();
     method public boolean hasFlashUnit();

camera/camera-core/api/restricted_current.txt

@@ -47,7 +47,7 @@ package androidx.camera.core {
     method public default int getLensFacing();
     method public int getSensorRotationDegrees();
     method public int getSensorRotationDegrees(int);
-    method public default java.util.List<android.util.Range<java.lang.Integer!>!> getSupportedFrameRateRanges();
+    method public default java.util.Set<android.util.Range<java.lang.Integer!>!> getSupportedFrameRateRanges();
     method public androidx.lifecycle.LiveData<java.lang.Integer!> getTorchState();
     method public androidx.lifecycle.LiveData<androidx.camera.core.ZoomState!> getZoomState();
     method public boolean hasFlashUnit();

camera/camera-core/src/main/java/androidx/camera/core/CameraInfo.java

@@ -34,7 +34,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
-import java.util.List;
+import java.util.Set;
 
 /**
  * An interface for retrieving camera information.
@@ -271,8 +271,8 @@ default boolean isZslSupported() {
     }
 
     /**
-     * Returns a list of the frame rate ranges, in frames per second, supported by this device's
-     * AE algorithm.
+     * Returns an unordered set of the frame rate ranges, in frames per second, supported by this
+     * device's AE algorithm.
      *
      * <p>These are the frame rate ranges that the AE algorithm on the device can support. When
      * CameraX is configured to run with the camera2 implementation, this list will be derived
@@ -284,12 +284,14 @@ default boolean isZslSupported() {
      * combination of use cases. If attempting to run the device using an unsupported range, there
      * may be stability issues or the device may quietly choose another frame rate operating range.
      *
-     * @return The list of FPS ranges supported by the device's AE algorithm
+     * <p>The returned set does not have any ordering guarantees and frame rate ranges may overlap.
+     *
+     * @return The set of FPS ranges supported by the device's AE algorithm
      * @see androidx.camera.video.VideoCapture.Builder#setTargetFrameRate(Range)
      */
     @NonNull
-    default List<Range<Integer>> getSupportedFrameRateRanges() {
-        return Collections.emptyList();
+    default Set<Range<Integer>> getSupportedFrameRateRanges() {
+        return Collections.emptySet();
     }
 
     /**

camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraInfoInternal.java

@@ -63,11 +63,12 @@
  */
 @RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
 public final class FakeCameraInfoInternal implements CameraInfoInternal {
-    private static final List<Range<Integer>> FAKE_FPS_RANGES = Collections.unmodifiableList(
-            Arrays.asList(
+    private static final Set<Range<Integer>> FAKE_FPS_RANGES = Collections.unmodifiableSet(
+            new HashSet<>(Arrays.asList(
                     new Range<>(12, 30),
                     new Range<>(30, 30),
                     new Range<>(60, 60))
+            )
     );
     private static final Set<DynamicRange> DEFAULT_DYNAMIC_RANGES = Collections.singleton(SDR);
     private final String mCameraId;
@@ -239,7 +240,7 @@ public Quirks getCameraQuirks() {
 
     @NonNull
     @Override
-    public List<Range<Integer>> getSupportedFrameRateRanges() {
+    public Set<Range<Integer>> getSupportedFrameRateRanges() {
         return FAKE_FPS_RANGES;
     }