Replace Quality indices with VideoQuality/VideoQualityData class

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

@@ -9,7 +9,7 @@
 import androidx.camera.video.FallbackStrategy;
 import androidx.camera.video.Quality;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.FallbackStrategyHostApi;
-import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoQualityConstraint;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoQuality;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoResolutionFallbackRule;
 
 /**
@@ -28,20 +28,20 @@ public class FallbackStrategyHostApiImpl implements FallbackStrategyHostApi {
   public static class FallbackStrategyProxy {
     /** Creates an instance of {@link FallbackStrategy}. */
     public @NonNull FallbackStrategy create(
-        @NonNull VideoQualityConstraint videoQualityConstraint,
+        @NonNull VideoQuality videoQuality,
         @NonNull VideoResolutionFallbackRule fallbackRule) {
-      Quality videoQuality =
-          QualitySelectorHostApiImpl.getQualityFromVideoQualityConstraint(videoQualityConstraint);
+      Quality quality =
+          QualitySelectorHostApiImpl.getQualityFromVideoQuality(videoQuality);
 
       switch (fallbackRule) {
         case HIGHER_QUALITY_OR_LOWER_THAN:
-          return FallbackStrategy.higherQualityOrLowerThan(videoQuality);
+          return FallbackStrategy.higherQualityOrLowerThan(quality);
         case HIGHER_QUALITY_THAN:
-          return FallbackStrategy.higherQualityThan(videoQuality);
+          return FallbackStrategy.higherQualityThan(quality);
         case LOWER_QUALITY_OR_HIGHER_THAN:
-          return FallbackStrategy.lowerQualityOrHigherThan(videoQuality);
+          return FallbackStrategy.lowerQualityOrHigherThan(quality);
         case LOWER_QUALITY_THAN:
-          return FallbackStrategy.lowerQualityThan(videoQuality);
+          return FallbackStrategy.lowerQualityThan(quality);
       }
       throw new IllegalArgumentException(
           "Specified fallback rule " + fallbackRule + " unrecognized.");
@@ -75,9 +75,9 @@ public FallbackStrategyHostApiImpl(@NonNull InstanceManager instanceManager) {
   @Override
   public void create(
       @NonNull Long identifier,
-      @NonNull VideoQualityConstraint videoQualityConstraint,
+      @NonNull VideoQuality videoQuality,
       @NonNull VideoResolutionFallbackRule fallbackRule) {
     instanceManager.addDartCreatedInstance(
-        proxy.create(videoQualityConstraint, fallbackRule), identifier);
+        proxy.create(videoQuality, fallbackRule), identifier);
   }
 }

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

@@ -116,7 +116,7 @@ private LiveDataSupportedType(final int index) {
    *
    * See https://developer.android.com/reference/androidx/camera/video/Quality.
    */
-  public enum Quality {
+  public enum VideoQuality {
     SD(0),
     HD(1),
     FHD(2),
@@ -126,7 +126,7 @@ public enum Quality {
 
     final int index;
 
-    private Quality(final int index) {
+    private VideoQuality(final int index) {
       this.index = index;
     }
   }
@@ -471,34 +471,34 @@ ArrayList<Object> toList() {
    *
    * Generated class from Pigeon that represents data sent in messages.
    */
-  public static final class QualityData {
-    private @NonNull Quality quality;
+  public static final class VideoQualityData {
+    private @NonNull VideoQuality quality;
 
-    public @NonNull Quality getQuality() {
+    public @NonNull VideoQuality getQuality() {
       return quality;
     }
 
-    public void setQuality(@NonNull Quality setterArg) {
+    public void setQuality(@NonNull VideoQuality setterArg) {
       if (setterArg == null) {
         throw new IllegalStateException("Nonnull field \"quality\" is null.");
       }
       this.quality = setterArg;
     }
 
     /** Constructor is non-public to enforce null safety; use Builder. */
-    QualityData() {}
+    VideoQualityData() {}
 
     public static final class Builder {
 
-      private @Nullable Quality quality;
+      private @Nullable VideoQuality quality;
 
-      public @NonNull Builder setQuality(@NonNull Quality setterArg) {
+      public @NonNull Builder setQuality(@NonNull VideoQuality setterArg) {
         this.quality = setterArg;
         return this;
       }
 
-      public @NonNull QualityData build() {
-        QualityData pigeonReturn = new QualityData();
+      public @NonNull VideoQualityData build() {
+        VideoQualityData pigeonReturn = new VideoQualityData();
         pigeonReturn.setQuality(quality);
         return pigeonReturn;
       }
@@ -511,10 +511,10 @@ ArrayList<Object> toList() {
       return toListResult;
     }
 
-    static @NonNull QualityData fromList(@NonNull ArrayList<Object> list) {
-      QualityData pigeonResult = new QualityData();
+    static @NonNull VideoQualityData fromList(@NonNull ArrayList<Object> list) {
+      VideoQualityData pigeonResult = new VideoQualityData();
       Object quality = list.get(0);
-      pigeonResult.setQuality(quality == null ? null : Quality.values()[(int) quality]);
+      pigeonResult.setQuality(quality == null ? null : VideoQuality.values()[(int) quality]);
       return pigeonResult;
     }
   }
@@ -2823,22 +2823,22 @@ private QualitySelectorHostApiCodec() {}
     protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) {
       switch (type) {
         case (byte) 128:
-          return QualityData.fromList((ArrayList<Object>) readValue(buffer));
-        case (byte) 129:
           return ResolutionInfo.fromList((ArrayList<Object>) readValue(buffer));
+        case (byte) 129:
+          return VideoQualityData.fromList((ArrayList<Object>) readValue(buffer));
         default:
           return super.readValueOfType(type, buffer);
       }
     }
 
     @Override
     protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) {
-      if (value instanceof QualityData) {
+      if (value instanceof ResolutionInfo) {
         stream.write(128);
-        writeValue(stream, ((QualityData) value).toList());
-      } else if (value instanceof ResolutionInfo) {
-        stream.write(129);
         writeValue(stream, ((ResolutionInfo) value).toList());
+      } else if (value instanceof VideoQualityData) {
+        stream.write(129);
+        writeValue(stream, ((VideoQualityData) value).toList());
       } else {
         super.writeValue(stream, value);
       }
@@ -2848,10 +2848,10 @@ protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) {
   /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
   public interface QualitySelectorHostApi {
 
-    void create(@NonNull Long identifier, @NonNull List<QualityData> videoQualityConstraintIndexList, @Nullable Long fallbackStrategyId);
+    void create(@NonNull Long identifier, @NonNull List<VideoQualityData> videoQualityDataList, @Nullable Long fallbackStrategyId);
 
     @NonNull 
-    ResolutionInfo getResolution(@NonNull Long cameraInfoId, @NonNull Quality quality);
+    ResolutionInfo getResolution(@NonNull Long cameraInfoId, @NonNull VideoQuality quality);
 
     /** The codec used by QualitySelectorHostApi. */
     static @NonNull MessageCodec<Object> getCodec() {
@@ -2869,10 +2869,10 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable QualitySel
                 ArrayList<Object> wrapped = new ArrayList<Object>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
                 Number identifierArg = (Number) args.get(0);
-                List<QualityData> videoQualityConstraintIndexListArg = (List<QualityData>) args.get(1);
+                List<VideoQualityData> videoQualityDataListArg = (List<VideoQualityData>) args.get(1);
                 Number fallbackStrategyIdArg = (Number) args.get(2);
                 try {
-                  api.create((identifierArg == null) ? null : identifierArg.longValue(), videoQualityConstraintIndexListArg, (fallbackStrategyIdArg == null) ? null : fallbackStrategyIdArg.longValue());
+                  api.create((identifierArg == null) ? null : identifierArg.longValue(), videoQualityDataListArg, (fallbackStrategyIdArg == null) ? null : fallbackStrategyIdArg.longValue());
                   wrapped.add(0, null);
                 }
  catch (Throwable exception) {
@@ -2895,7 +2895,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable QualitySel
                 ArrayList<Object> wrapped = new ArrayList<Object>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
                 Number cameraInfoIdArg = (Number) args.get(0);
-                Quality qualityArg = args.get(1) == null ? null : Quality.values()[(int) args.get(1)];
+                VideoQuality qualityArg = args.get(1) == null ? null : VideoQuality.values()[(int) args.get(1)];
                 try {
                   ResolutionInfo output = api.getResolution((cameraInfoIdArg == null) ? null : cameraInfoIdArg.longValue(), qualityArg);
                   wrapped.add(0, output);
@@ -2915,7 +2915,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable QualitySel
   /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
   public interface FallbackStrategyHostApi {
 
-    void create(@NonNull Long identifier, @NonNull Quality quality, @NonNull VideoResolutionFallbackRule fallbackRule);
+    void create(@NonNull Long identifier, @NonNull VideoQuality quality, @NonNull VideoResolutionFallbackRule fallbackRule);
 
     /** The codec used by FallbackStrategyHostApi. */
     static @NonNull MessageCodec<Object> getCodec() {
@@ -2933,7 +2933,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable FallbackSt
                 ArrayList<Object> wrapped = new ArrayList<Object>();
                 ArrayList<Object> args = (ArrayList<Object>) message;
                 Number identifierArg = (Number) args.get(0);
-                Quality qualityArg = args.get(1) == null ? null : Quality.values()[(int) args.get(1)];
+                VideoQuality qualityArg = args.get(1) == null ? null : VideoQuality.values()[(int) args.get(1)];
                 VideoResolutionFallbackRule fallbackRuleArg = args.get(2) == null ? null : VideoResolutionFallbackRule.values()[(int) args.get(2)];
                 try {
                   api.create((identifierArg == null) ? null : identifierArg.longValue(), qualityArg, fallbackRuleArg);

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

@@ -11,9 +11,10 @@
 import androidx.camera.video.FallbackStrategy;
 import androidx.camera.video.Quality;
 import androidx.camera.video.QualitySelector;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoQuality;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoQualityData;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.QualitySelectorHostApi;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.ResolutionInfo;
-import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoQualityConstraint;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -34,13 +35,12 @@ public class QualitySelectorHostApiImpl implements QualitySelectorHostApi {
   public static class QualitySelectorProxy {
     /** Creates an instance of {@link QualitySelector}. */
     public @NonNull QualitySelector create(
-        @NonNull List<Long> videoQualityConstraintIndexList,
+        @NonNull List<VideoQualityData> videoQualityDataList,
         @Nullable FallbackStrategy fallbackStrategy) {
-      // Convert each index of VideoQualityConstraint to Quality.
+      // Convert each index of VideoQuality to Quality.
       List<Quality> qualityList = new ArrayList<Quality>();
-      for (int i = 0; i < videoQualityConstraintIndexList.size(); i++) {
-        int qualityIndex = ((Number) videoQualityConstraintIndexList.get(i)).intValue();
-        qualityList.add(getQualityConstant(qualityIndex));
+      for (VideoQualityData videoQualityData : videoQualityDataList) {
+        qualityList.add(getQualityFromVideoQuality(videoQualityData.getQuality()));
       }
 
       boolean fallbackStrategySpecified = fallbackStrategy != null;
@@ -58,12 +58,6 @@ public static class QualitySelectorProxy {
           ? QualitySelector.fromOrderedList(qualityList, fallbackStrategy)
           : QualitySelector.fromOrderedList(qualityList);
     }
-
-    /** Converts from index of {@link VideoQualityConstraint} to {@link Quality}. */
-    private Quality getQualityConstant(@NonNull int qualityIndex) {
-      VideoQualityConstraint quality = VideoQualityConstraint.values()[qualityIndex];
-      return getQualityFromVideoQualityConstraint(quality);
-    }
   }
 
   /**
@@ -94,11 +88,11 @@ public QualitySelectorHostApiImpl(@NonNull InstanceManager instanceManager) {
   @Override
   public void create(
       @NonNull Long identifier,
-      @NonNull List<Long> videoQualityConstraintIndexList,
+      @NonNull List<VideoQualityData> videoQualityDataList,
       @Nullable Long fallbackStrategyIdentifier) {
     instanceManager.addDartCreatedInstance(
         proxy.create(
-            videoQualityConstraintIndexList,
+            videoQualityDataList,
             fallbackStrategyIdentifier == null
                 ? null
                 : Objects.requireNonNull(instanceManager.getInstance(fallbackStrategyIdentifier))),
@@ -111,24 +105,24 @@ public void create(
    */
   @Override
   public @NonNull ResolutionInfo getResolution(
-      @NonNull Long cameraInfoIdentifier, @NonNull VideoQualityConstraint quality) {
+      @NonNull Long cameraInfoIdentifier, @NonNull VideoQuality quality) {
     final Size result =
         QualitySelector.getResolution(
             Objects.requireNonNull(instanceManager.getInstance(cameraInfoIdentifier)),
-            getQualityFromVideoQualityConstraint(quality));
+            getQualityFromVideoQuality(quality));
     return new ResolutionInfo.Builder()
         .setWidth(Long.valueOf(result.getWidth()))
         .setHeight(Long.valueOf(result.getHeight()))
         .build();
   }
 
   /**
-   * Converts the specified {@link VideoQualityConstraint} to a {@link Quality} that is understood
+   * Converts the specified {@link VideoQuality to a {@link Quality} that is understood
    * by CameraX.
    */
-  public static @NonNull Quality getQualityFromVideoQualityConstraint(
-      @NonNull VideoQualityConstraint videoQualityConstraint) {
-    switch (videoQualityConstraint) {
+  public static @NonNull Quality getQualityFromVideoQuality(
+      @NonNull VideoQuality videoQuality) {
+    switch (videoQuality) {
       case SD:
         return Quality.SD;
       case HD:
@@ -143,8 +137,8 @@ public void create(
         return Quality.HIGHEST;
     }
     throw new IllegalArgumentException(
-        "VideoQualityConstraint "
-            + videoQualityConstraint
+        "VideoQuality "
+            + videoQuality
             + " is unhandled by QualitySelectorHostApiImpl.");
   }
 }

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

@@ -11,7 +11,7 @@
 
 import androidx.camera.video.FallbackStrategy;
 import androidx.camera.video.Quality;
-import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoQualityConstraint;
+import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoQuality;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.VideoResolutionFallbackRule;
 import org.junit.After;
 import org.junit.Before;
@@ -48,11 +48,11 @@ public void hostApiCreate_makesCallToCreateExpectedFallbackStrategy() {
 
     try (MockedStatic<FallbackStrategy> mockedFallbackStrategy =
         mockStatic(FallbackStrategy.class)) {
-      for (VideoQualityConstraint videoQualityConstraint : VideoQualityConstraint.values()) {
+      for (VideoQuality videoQuality : VideoQuality.values()) {
         for (VideoResolutionFallbackRule fallbackRule : VideoResolutionFallbackRule.values()) {
-          // Determine expected Quality based on videoQualityConstraint being tested.
+          // Determine expected Quality based on videoQuality being tested.
           Quality convertedQuality = null;
-          switch (videoQualityConstraint) {
+          switch (videoQuality) {
             case SD:
               convertedQuality = Quality.SD;
               break;
@@ -73,8 +73,8 @@ public void hostApiCreate_makesCallToCreateExpectedFallbackStrategy() {
               break;
             default:
               fail(
-                  "The VideoQualityConstraint "
-                      + videoQualityConstraint.toString()
+                  "The VideoQuality "
+                      + videoQuality.toString()
                       + "is unhandled by this test.");
           }
           // Set Quality as final local variable to avoid error about using non-final (or effecitvely final) local variables in lambda expressions.
@@ -108,7 +108,7 @@ public void hostApiCreate_makesCallToCreateExpectedFallbackStrategy() {
                       + fallbackRule.toString()
                       + "is unhandled by this test.");
           }
-          hostApi.create(instanceIdentifier, videoQualityConstraint, fallbackRule);
+          hostApi.create(instanceIdentifier, videoQuality, fallbackRule);
           assertEquals(instanceManager.getInstance(instanceIdentifier), mockFallbackStrategy);
 
           // Clear/reset FallbackStrategy mock and InstanceManager.