Merge pull request flutter#6 from bottlepay/fix/refactoring

Draft: Refactor camera features into CameraFeature classes

Author: acoutts

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java

@@ -5,17 +5,19 @@
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
 import android.hardware.camera2.TotalCaptureResult;
+import android.util.Log;
 import androidx.annotation.NonNull;
 
 class CameraCaptureCallback extends CaptureCallback {
   interface CameraCaptureStateListener {
     void onConverged();
+
     void onPrecapture();
+
     void onPrecaptureTimeout();
   }
 
   private final CameraCaptureStateListener cameraStateListener;
-
   private CameraState cameraState;
   private PictureCaptureRequest pictureCaptureRequest;
 
@@ -24,11 +26,9 @@ public static CameraCaptureCallback create(
     return new CameraCaptureCallback(cameraStateListener);
   }
 
-  private CameraCaptureCallback(
-      @NonNull CameraCaptureStateListener cameraStateListener) {
+  private CameraCaptureCallback(@NonNull CameraCaptureStateListener cameraStateListener) {
     cameraState = CameraState.STATE_PREVIEW;
     this.cameraStateListener = cameraStateListener;
-    this.pictureCaptureRequest = pictureCaptureRequest;
   }
 
   public CameraState getCameraState() {
@@ -37,11 +37,6 @@ public CameraState getCameraState() {
 
   public void setCameraState(@NonNull CameraState state) {
     cameraState = state;
-
-    if (pictureCaptureRequest != null && state == CameraState.STATE_WAITING_PRECAPTURE_DONE) {
-      pictureCaptureRequest.setState(
-          PictureCaptureRequestState.STATE_WAITING_PRECAPTURE_DONE);
-    }
   }
 
   public void setPictureCaptureRequest(@NonNull PictureCaptureRequest pictureCaptureRequest) {
@@ -52,53 +47,64 @@ private void process(CaptureResult result) {
     Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
     Integer afState = result.get(CaptureResult.CONTROL_AF_STATE);
 
+    if (cameraState != CameraState.STATE_PREVIEW) {
+      Log.i(
+          "Camera",
+          "CameraCaptureCallback | state: "
+              + cameraState
+              + " | afState: "
+              + afState
+              + " | aeState: "
+              + aeState);
+    }
+
     switch (cameraState) {
       case STATE_PREVIEW:
-      {
-        // We have nothing to do when the camera preview is working normally.
-        break;
-      }
+        {
+          // We have nothing to do when the camera preview is working normally.
+          break;
+        }
       case STATE_WAITING_FOCUS:
-      {
-        if (afState == null) {
-          return;
-        } else if (afState == CaptureRequest.CONTROL_AF_STATE_PASSIVE_SCAN
-            || afState == CaptureRequest.CONTROL_AF_STATE_FOCUSED_LOCKED
-            || afState == CaptureRequest.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED) {
-          // CONTROL_AE_STATE can be null on some devices
-
-          if (aeState == null || aeState == CaptureRequest.CONTROL_AE_STATE_CONVERGED) {
-            cameraStateListener.onConverged();
-          } else {
-            cameraStateListener.onPrecapture();
+        {
+          if (afState == null) {
+            return;
+          } else if (afState == CaptureRequest.CONTROL_AF_STATE_FOCUSED_LOCKED
+              || afState == CaptureRequest.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED) {
+            // CONTROL_AE_STATE can be null on some devices
+
+            if (aeState == null || aeState == CaptureRequest.CONTROL_AE_STATE_CONVERGED) {
+              cameraStateListener.onConverged();
+            } else {
+              cameraStateListener.onPrecapture();
+            }
           }
+          break;
         }
-        break;
-      }
 
       case STATE_WAITING_PRECAPTURE_START:
-      {
-        // CONTROL_AE_STATE can be null on some devices
-        if (aeState == null
-            || aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED
-            || aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE
-            || aeState == CaptureResult.CONTROL_AE_STATE_FLASH_REQUIRED) {
-          setCameraState(CameraState.STATE_WAITING_PRECAPTURE_DONE);
+        {
+          // CONTROL_AE_STATE can be null on some devices
+          if (aeState == null
+              || aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED
+              || aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE
+              || aeState == CaptureResult.CONTROL_AE_STATE_FLASH_REQUIRED) {
+            setCameraState(CameraState.STATE_WAITING_PRECAPTURE_DONE);
+          }
+          break;
         }
-        break;
-      }
 
       case STATE_WAITING_PRECAPTURE_DONE:
-      {
-        // CONTROL_AE_STATE can be null on some devices
-        if (aeState == null || aeState != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
-          cameraStateListener.onConverged();
-        } else if (pictureCaptureRequest != null && pictureCaptureRequest.hitPreCaptureTimeout()) {
-          // Log.i(TAG, "===> Hit precapture timeout");
-          cameraStateListener.onPrecaptureTimeout();
+        {
+          // CONTROL_AE_STATE can be null on some devices
+          if (aeState == null || aeState != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
+            cameraStateListener.onConverged();
+          } else if (pictureCaptureRequest != null
+              && pictureCaptureRequest.hitPreCaptureTimeout()) {
+            // Log.i(TAG, "===> Hit precapture timeout");
+            cameraStateListener.onPrecaptureTimeout();
+          }
+          break;
         }
-        break;
-      }
     }
   }
 

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraCaptureCallback.java

@@ -42,6 +42,10 @@ public interface CameraProperties {
   Rect getSensorInfoPreCorrectionActiveArraySize();
 
   int getSensorOrientation();
+
+  int getHardwareLevel();
+
+  int[] getAvailableNoiseReductionModes();
 }
 
 class CameraPropertiesImpl implements CameraProperties {
@@ -136,4 +140,20 @@ public Rect getSensorInfoPreCorrectionActiveArraySize() {
   public int getSensorOrientation() {
     return cameraCharacteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
   }
+
+  /**
+   * Returns the hardware level of the camera.
+   *
+   * @return
+   */
+  @Override
+  public int getHardwareLevel() {
+    return cameraCharacteristics.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
+  }
+
+  @Override
+  public int[] getAvailableNoiseReductionModes() {
+    return cameraCharacteristics.get(
+        CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES);
+  }
 }

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraProperties.java

@@ -12,10 +12,8 @@
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CameraMetadata;
 import android.hardware.camera2.params.StreamConfigurationMap;
-import android.media.CamcorderProfile;
 import android.util.Size;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
-import io.flutter.plugins.camera.types.ResolutionPreset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -86,16 +84,6 @@ static PlatformChannel.DeviceOrientation deserializeDeviceOrientation(String ori
     }
   }
 
-  static Size computeBestPreviewSize(String cameraName, ResolutionPreset preset) {
-    if (preset.ordinal() > ResolutionPreset.high.ordinal()) {
-      preset = ResolutionPreset.high;
-    }
-
-    CamcorderProfile profile =
-        getBestAvailableCamcorderProfileForResolutionPreset(cameraName, preset);
-    return new Size(profile.videoFrameWidth, profile.videoFrameHeight);
-  }
-
   static Size computeBestCaptureSize(StreamConfigurationMap streamConfigurationMap) {
     // For still image captures, we use the largest available size.
     return Collections.max(
@@ -132,45 +120,6 @@ public static List<Map<String, Object>> getAvailableCameras(Activity activity)
     return cameras;
   }
 
-  static CamcorderProfile getBestAvailableCamcorderProfileForResolutionPreset(
-      String cameraName, ResolutionPreset preset) {
-    int cameraId = Integer.parseInt(cameraName);
-    switch (preset) {
-        // All of these cases deliberately fall through to get the best available profile.
-      case max:
-        if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_HIGH)) {
-          return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_HIGH);
-        }
-      case ultraHigh:
-        if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_2160P)) {
-          return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_2160P);
-        }
-      case veryHigh:
-        if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_1080P)) {
-          return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_1080P);
-        }
-      case high:
-        if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_720P)) {
-          return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_720P);
-        }
-      case medium:
-        if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_480P)) {
-          return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_480P);
-        }
-      case low:
-        if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_QVGA)) {
-          return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_QVGA);
-        }
-      default:
-        if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_LOW)) {
-          return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_LOW);
-        } else {
-          throw new IllegalArgumentException(
-              "No capture session available for current capture session.");
-        }
-    }
-  }
-
   private static class CompareSizesByArea implements Comparator<Size> {
     @Override
     public int compare(Size lhs, Size rhs) {

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java

@@ -11,12 +11,12 @@
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugins.camera.types.ExposureMode;
-import io.flutter.plugins.camera.types.FocusMode;
+import io.flutter.plugins.camera.features.autofocus.FocusMode;
+import io.flutter.plugins.camera.features.exposurelock.ExposureMode;
 import java.util.HashMap;
 import java.util.Map;
 
-class DartMessenger {
+public class DartMessenger {
   @Nullable private MethodChannel cameraChannel;
   @Nullable private MethodChannel deviceChannel;
 
@@ -46,7 +46,7 @@ public DartMessenger(BinaryMessenger messenger, long cameraId) {
     deviceChannel = new MethodChannel(messenger, "flutter.io/cameraPlugin/device");
   }
 
-  void sendDeviceOrientationChangeEvent(PlatformChannel.DeviceOrientation orientation) {
+  public void sendDeviceOrientationChangeEvent(PlatformChannel.DeviceOrientation orientation) {
     assert (orientation != null);
     this.send(
         DeviceEventType.ORIENTATION_CHANGED,

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java

@@ -15,10 +15,10 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugins.camera.CameraPermissions.PermissionsRegistry;
-import io.flutter.plugins.camera.types.ExposureMode;
-import io.flutter.plugins.camera.types.FlashMode;
-import io.flutter.plugins.camera.types.FocusMode;
-import io.flutter.plugins.camera.types.ResolutionPreset;
+import io.flutter.plugins.camera.features.autofocus.FocusMode;
+import io.flutter.plugins.camera.features.exposurelock.ExposureMode;
+import io.flutter.plugins.camera.features.flash.FlashMode;
+import io.flutter.plugins.camera.features.resolution.ResolutionPreset;
 import io.flutter.view.TextureRegistry;
 import java.util.HashMap;
 import java.util.Map;