Aug 23, 2021 · Apr 8, 2021 · Apr 8, 2021 · Apr 20, 2021 · Apr 8, 2021 · Apr 9, 2021
diff --git a/.../camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraCaptureCallback.java b/.../camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraCaptureCallback.java
  private final CaptureTimeoutsWrapper captureTimeouts;

  private CameraCaptureCallback(
 @NonNull CameraCaptureStateListener cameraStateListener,
 @NonNull CaptureTimeoutsWrapper captureTimeouts) {
      @NonNull CameraCaptureStateListener cameraStateListener,
      @NonNull CaptureTimeoutsWrapper captureTimeouts) {
    cameraState = CameraState.STATE_PREVIEW;
    this.cameraStateListener = cameraStateListener;
    this.captureTimeouts = captureTimeouts;
   * @return a configured instance of the {@link CameraCaptureCallback} class.
   */
  public static CameraCaptureCallback create(
 @NonNull CameraCaptureStateListener cameraStateListener,
 @NonNull CaptureTimeoutsWrapper captureTimeouts) {
      @NonNull CameraCaptureStateListener cameraStateListener,
      @NonNull CaptureTimeoutsWrapper captureTimeouts) {
    return new CameraCaptureCallback(cameraStateListener, captureTimeouts);
  }


    if (cameraState != CameraState.STATE_PREVIEW) {
      Log.d(
 TAG,
 "CameraCaptureCallback | state: "
 + cameraState
 + " | afState: "
 + afState
 + " | aeState: "
 + aeState);
          TAG,
          "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 == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED
                || afState == CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED) {
          handleWaitingFocusState(aeState);
        } else if (captureTimeouts.getPreCaptureFocusing().getIsExpired()) {
          Log.w(TAG, "Focus timeout, moving on with capture");
          handleWaitingFocusState(aeState);
        {
          if (afState == null) {
            return;
          } else if (afState == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED
              || afState == CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED) {
            handleWaitingFocusState(aeState);
          } else if (captureTimeouts.getPreCaptureFocusing().getIsExpired()) {
            Log.w(TAG, "Focus timeout, moving on with capture");
            handleWaitingFocusState(aeState);
          }

          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);
        } else if (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
          Log.w(TAG, "Metering timeout waiting for pre-capture to start, moving on with capture");

          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);
          } else if (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
            Log.w(TAG, "Metering timeout waiting for pre-capture to start, moving on with capture");

            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 (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
          Log.w(
                  TAG, "Metering timeout waiting for pre-capture to finish, moving on with capture");
          cameraStateListener.onConverged();
        {
          // CONTROL_AE_STATE can be null on some devices
          if (aeState == null || aeState != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
            cameraStateListener.onConverged();
          } else if (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
            Log.w(
                TAG, "Metering timeout waiting for pre-capture to finish, moving on with capture");
            cameraStateListener.onConverged();
          }

          break;
        }

        break;
      }
    }
  }


  @Override
  public void onCaptureProgressed(
 @NonNull CameraCaptureSession session,
 @NonNull CaptureRequest request,
 @NonNull CaptureResult partialResult) {
      @NonNull CameraCaptureSession session,
      @NonNull CaptureRequest request,
      @NonNull CaptureResult partialResult) {
    process(partialResult);
  }

  @Override
  public void onCaptureCompleted(
 @NonNull CameraCaptureSession session,
 @NonNull CaptureRequest request,
 @NonNull TotalCaptureResult result) {
      @NonNull CameraCaptureSession session,
      @NonNull CaptureRequest request,
      @NonNull TotalCaptureResult result) {
    process(result);
  }

     */
    void onPrecapture();
  }
 }
 }
diff --git a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraProperties.java b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraProperties.java
  private final String cameraName;

  public CameraPropertiesImpl(String cameraName, CameraManager cameraManager)
 throws CameraAccessException {
      throws CameraAccessException {
    this.cameraName = cameraName;
    this.cameraCharacteristics = cameraManager.getCameraCharacteristics(cameraName);
  }
  @Override
  public double getControlAutoExposureCompensationStep() {
    Rational rational =
 cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP);
        cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP);

    return rational == null ? 0.0 : rational.doubleValue();
  }
  @Override
  public Rect getSensorInfoPreCorrectionActiveArraySize() {
    return cameraCharacteristics.get(
 CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE);
        CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE);
  }

  @Override
  @Override
  public int[] getAvailableNoiseReductionModes() {
    return cameraCharacteristics.get(
 CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES);
        CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES);
  }
 }
 }
diff --git a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java

 import android.app.Activity;
 import android.content.Context;
 import android.graphics.ImageFormat;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCharacteristics;
 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;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

  private CameraUtils() {}

  /**
   * Gets the {@link CameraManager} singleton.
   *
   * @param context The context to get the {@link CameraManager} singleton from.
   * @return The {@link CameraManager} singleton.
   */
  static CameraManager getCameraManager(Context context) {
    return (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
  static PlatformChannel.DeviceOrientation getDeviceOrientationFromDegrees(int degrees) {
    // Round to the nearest 90 degrees.
    degrees = (int) (Math.round(degrees / 90.0) * 90) % 360;
    // Determine the corresponding device orientation.
    switch (degrees) {
      case 90:
        return PlatformChannel.DeviceOrientation.LANDSCAPE_LEFT;
      case 180:
        return PlatformChannel.DeviceOrientation.PORTRAIT_DOWN;
      case 270:
        return PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT;
      case 0:
      default:
        return PlatformChannel.DeviceOrientation.PORTRAIT_UP;
    }
  }

  /**
   * Serializes the {@link PlatformChannel.DeviceOrientation} to a string value.
   *
   * @param orientation The orientation to serialize.
   * @return The serialized orientation.
   * @throws UnsupportedOperationException when the provided orientation not have a corresponding
   *     string value.
   */
  static String serializeDeviceOrientation(PlatformChannel.DeviceOrientation orientation) {
    if (orientation == null)
      throw new UnsupportedOperationException("Could not serialize null device orientation.");
        return "landscapeRight";
      default:
        throw new UnsupportedOperationException(
 "Could not serialize device orientation: " + orientation.toString());
            "Could not serialize device orientation: " + orientation.toString());
    }
  }

  /**
   * Deserializes a string value to its corresponding {@link PlatformChannel.DeviceOrientation}
   * value.
   *
   * @param orientation The string value to deserialize.
   * @return The deserialized orientation.
   * @throws UnsupportedOperationException when the provided string value does not have a
   *     corresponding {@link PlatformChannel.DeviceOrientation}.
   */
  static PlatformChannel.DeviceOrientation deserializeDeviceOrientation(String orientation) {
    if (orientation == null)
      throw new UnsupportedOperationException("Could not deserialize null device orientation.");
        return PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT;
      default:
        throw new UnsupportedOperationException(
 "Could not deserialize device orientation: " + orientation);
            "Could not deserialize device orientation: " + orientation);
    }
  }

  /**
   * Gets all the available cameras for the device.
   *
   * @param activity The current Android activity.
   * @return A map of all the available cameras, with their name as their key.
   * @throws CameraAccessException when the camera could not be accessed.
   */
  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(
        Arrays.asList(streamConfigurationMap.getOutputSizes(ImageFormat.JPEG)),
        new CompareSizesByArea());
  }

  public static List<Map<String, Object>> getAvailableCameras(Activity activity)
 throws CameraAccessException {
      throws CameraAccessException {
    CameraManager cameraManager = (CameraManager) activity.getSystemService(Context.CAMERA_SERVICE);
    String[] cameraNames = cameraManager.getCameraIdList();
    List<Map<String, Object>> cameras = new ArrayList<>();
    }
    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) {
      // We cast here to ensure the multiplications won't overflow.
      return Long.signum(
          (long) lhs.getWidth() * lhs.getHeight() - (long) rhs.getWidth() * rhs.getHeight());
    }
  }
 }
diff --git a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/ImageSaver.java b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/ImageSaver.java
      return new FileOutputStream(file);
    }
  }
 }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,8 +24,8 @@ class CameraCaptureCallback extends CaptureCallback {
		private final CaptureTimeoutsWrapper captureTimeouts;

		private CameraCaptureCallback(
		@NonNull CameraCaptureStateListener cameraStateListener,
		@NonNull CaptureTimeoutsWrapper captureTimeouts) {
		@NonNull CameraCaptureStateListener cameraStateListener,
		@NonNull CaptureTimeoutsWrapper captureTimeouts) {
		cameraState = CameraState.STATE_PREVIEW;
		this.cameraStateListener = cameraStateListener;
		this.captureTimeouts = captureTimeouts;
Expand All		@@ -40,8 +40,8 @@ private CameraCaptureCallback(
		* @return a configured instance of the {@link CameraCaptureCallback} class.
		*/
		public static CameraCaptureCallback create(
		@NonNull CameraCaptureStateListener cameraStateListener,
		@NonNull CaptureTimeoutsWrapper captureTimeouts) {
		@NonNull CameraCaptureStateListener cameraStateListener,
		@NonNull CaptureTimeoutsWrapper captureTimeouts) {
		return new CameraCaptureCallback(cameraStateListener, captureTimeouts);
		}

Expand DownExpand Up		@@ -69,63 +69,63 @@ private void process(CaptureResult result) {

		if (cameraState != CameraState.STATE_PREVIEW) {
		Log.d(
		TAG,
		"CameraCaptureCallback \| state: "
		+ cameraState
		+ " \| afState: "
		+ afState
		+ " \| aeState: "
		+ aeState);
		TAG,
		"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 == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED
		\|\| afState == CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED) {
		handleWaitingFocusState(aeState);
		} else if (captureTimeouts.getPreCaptureFocusing().getIsExpired()) {
		Log.w(TAG, "Focus timeout, moving on with capture");
		handleWaitingFocusState(aeState);
		{
		if (afState == null) {
		return;
		} else if (afState == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED
		\|\| afState == CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED) {
		handleWaitingFocusState(aeState);
		} else if (captureTimeouts.getPreCaptureFocusing().getIsExpired()) {
		Log.w(TAG, "Focus timeout, moving on with capture");
		handleWaitingFocusState(aeState);
		}

		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);
		} else if (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
		Log.w(TAG, "Metering timeout waiting for pre-capture to start, moving on with capture");

		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);
		} else if (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
		Log.w(TAG, "Metering timeout waiting for pre-capture to start, moving on with capture");

		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 (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
		Log.w(
		TAG, "Metering timeout waiting for pre-capture to finish, moving on with capture");
		cameraStateListener.onConverged();
		{
		// CONTROL_AE_STATE can be null on some devices
		if (aeState == null \|\| aeState != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
		cameraStateListener.onConverged();
		} else if (captureTimeouts.getPreCaptureMetering().getIsExpired()) {
		Log.w(
		TAG, "Metering timeout waiting for pre-capture to finish, moving on with capture");
		cameraStateListener.onConverged();
		}

		break;
		}

		break;
		}
		}
		}

Expand All		@@ -140,17 +140,17 @@ private void handleWaitingFocusState(Integer aeState) {

		@Override
		public void onCaptureProgressed(
		@NonNull CameraCaptureSession session,
		@NonNull CaptureRequest request,
		@NonNull CaptureResult partialResult) {
		@NonNull CameraCaptureSession session,
		@NonNull CaptureRequest request,
		@NonNull CaptureResult partialResult) {
		process(partialResult);
		}

		@Override
		public void onCaptureCompleted(
		@NonNull CameraCaptureSession session,
		@NonNull CaptureRequest request,
		@NonNull TotalCaptureResult result) {
		@NonNull CameraCaptureSession session,
		@NonNull CaptureRequest request,
		@NonNull TotalCaptureResult result) {
		process(result);
		}

Expand All		@@ -165,4 +165,4 @@ interface CameraCaptureStateListener {
		*/
		void onPrecapture();
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -246,7 +246,7 @@ class CameraPropertiesImpl implements CameraProperties {
		private final String cameraName;

		public CameraPropertiesImpl(String cameraName, CameraManager cameraManager)
		throws CameraAccessException {
		throws CameraAccessException {
		this.cameraName = cameraName;
		this.cameraCharacteristics = cameraManager.getCameraCharacteristics(cameraName);
		}
Expand All		@@ -270,7 +270,7 @@ public Range<Integer> getControlAutoExposureCompensationRange() {
		@Override
		public double getControlAutoExposureCompensationStep() {
		Rational rational =
		cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP);
		cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP);

		return rational == null ? 0.0 : rational.doubleValue();
		}
Expand DownExpand Up		@@ -330,7 +330,7 @@ public Size getSensorInfoPixelArraySize() {
		@Override
		public Rect getSensorInfoPreCorrectionActiveArraySize() {
		return cameraCharacteristics.get(
		CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE);
		CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE);
		}

		@Override
Expand All		@@ -346,6 +346,6 @@ public int getHardwareLevel() {
		@Override
		public int[] getAvailableNoiseReductionModes() {
		return cameraCharacteristics.get(
		CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES);
		CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES);
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,12 +6,20 @@

		import android.app.Activity;
		import android.content.Context;
		import android.graphics.ImageFormat;
		import android.hardware.camera2.CameraAccessException;
		import android.hardware.camera2.CameraCharacteristics;
		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;
		import java.util.Comparator;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;
Expand All		@@ -21,24 +29,23 @@ public final class CameraUtils {

		private CameraUtils() {}

		/**
		* Gets the {@link CameraManager} singleton.
		*
		* @param context The context to get the {@link CameraManager} singleton from.
		* @return The {@link CameraManager} singleton.
		*/
		static CameraManager getCameraManager(Context context) {
		return (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
		static PlatformChannel.DeviceOrientation getDeviceOrientationFromDegrees(int degrees) {
		// Round to the nearest 90 degrees.
		degrees = (int) (Math.round(degrees / 90.0) * 90) % 360;
		// Determine the corresponding device orientation.
		switch (degrees) {
		case 90:
		return PlatformChannel.DeviceOrientation.LANDSCAPE_LEFT;
		case 180:
		return PlatformChannel.DeviceOrientation.PORTRAIT_DOWN;
		case 270:
		return PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT;
		case 0:
		default:
		return PlatformChannel.DeviceOrientation.PORTRAIT_UP;
		}
		}

		/**
		* Serializes the {@link PlatformChannel.DeviceOrientation} to a string value.
		*
		* @param orientation The orientation to serialize.
		* @return The serialized orientation.
		* @throws UnsupportedOperationException when the provided orientation not have a corresponding
		* string value.
		*/
		static String serializeDeviceOrientation(PlatformChannel.DeviceOrientation orientation) {
		if (orientation == null)
		throw new UnsupportedOperationException("Could not serialize null device orientation.");
Expand All		@@ -53,19 +60,10 @@ static String serializeDeviceOrientation(PlatformChannel.DeviceOrientation orien
		return "landscapeRight";
		default:
		throw new UnsupportedOperationException(
		"Could not serialize device orientation: " + orientation.toString());
		"Could not serialize device orientation: " + orientation.toString());
		}
		}

		/**
		* Deserializes a string value to its corresponding {@link PlatformChannel.DeviceOrientation}
		* value.
		*
		* @param orientation The string value to deserialize.
		* @return The deserialized orientation.
		* @throws UnsupportedOperationException when the provided string value does not have a
		* corresponding {@link PlatformChannel.DeviceOrientation}.
		*/
		static PlatformChannel.DeviceOrientation deserializeDeviceOrientation(String orientation) {
		if (orientation == null)
		throw new UnsupportedOperationException("Could not deserialize null device orientation.");
Expand All		@@ -80,19 +78,29 @@ static PlatformChannel.DeviceOrientation deserializeDeviceOrientation(String ori
		return PlatformChannel.DeviceOrientation.LANDSCAPE_RIGHT;
		default:
		throw new UnsupportedOperationException(
		"Could not deserialize device orientation: " + orientation);
		"Could not deserialize device orientation: " + orientation);
		}
		}

		/**
		* Gets all the available cameras for the device.
		*
		* @param activity The current Android activity.
		* @return A map of all the available cameras, with their name as their key.
		* @throws CameraAccessException when the camera could not be accessed.
		*/
		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(
		Arrays.asList(streamConfigurationMap.getOutputSizes(ImageFormat.JPEG)),
		new CompareSizesByArea());
		}

		public static List<Map<String, Object>> getAvailableCameras(Activity activity)
		throws CameraAccessException {
		throws CameraAccessException {
		CameraManager cameraManager = (CameraManager) activity.getSystemService(Context.CAMERA_SERVICE);
		String[] cameraNames = cameraManager.getCameraIdList();
		List<Map<String, Object>> cameras = new ArrayList<>();
Expand All		@@ -119,4 +127,52 @@ 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) {
		// We cast here to ensure the multiplications won't overflow.
		return Long.signum(
		(long) lhs.getWidth() * lhs.getHeight() - (long) rhs.getWidth() * rhs.getHeight());
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -102,4 +102,4 @@ public static FileOutputStream create(File file) throws FileNotFoundException {
		return new FileOutputStream(file);
		}
		}
		}
		}