Merged with master

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,20 @@
+
+## 0.6.5
+
+* Adds auto exposure support for Android and iOS implementations.
+
+## 0.6.4+3
+
+* Detect if selected camera supports auto focus and act accordingly on Android. This solves a problem where front facing cameras are not capturing the picture because auto focus is not supported.
+
+## 0.6.4+2
+
+* Set ImageStreamReader listener to null to prevent stale images when streaming images. 
+
+## 0.6.4+1
+
+* Added closeCaptureSession() to stopVideoRecording in Camera.java to fix an Android 6 crash
+
 ## 0.6.4
 
 * Adds auto exposure support for Android and iOS implementations.

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

@@ -33,6 +33,7 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import android.util.Range;
 import android.util.Rational;
 import android.util.Size;
@@ -95,6 +96,8 @@ public class Camera {
   private PictureCaptureRequest pictureCaptureRequest;
   private CameraRegions cameraRegions;
   private int exposureOffset;
+  private boolean useAutoFocus;
+  private Range<Integer> fpsRange;
 
   public Camera(
       final Activity activity,
@@ -939,132 +942,6 @@ private void updateFlash(FlashMode mode) {
     // Get flash
     flashMode = mode;
 
-  public void setExposureMode(@NonNull final Result result, ExposureMode mode)
-      throws CameraAccessException {
-    this.exposureMode = mode;
-    initPreviewCaptureBuilder();
-    cameraCaptureSession.setRepeatingRequest(captureRequestBuilder.build(), null, null);
-    result.success(null);
-  }
-
-  public void setExposurePoint(@NonNull final Result result, Double x, Double y)
-      throws CameraAccessException {
-    // Check if exposure point functionality is available.
-    if (!isExposurePointSupported()) {
-      result.error(
-          "setExposurePointFailed", "Device does not have exposure point capabilities", null);
-      return;
-    }
-    // Check if we are doing a reset or not
-    if (x == null || y == null) {
-      x = 0.5;
-      y = 0.5;
-    }
-    // Get the current region boundaries.
-    Size maxBoundaries = getRegionBoundaries();
-    if (maxBoundaries == null) {
-      result.error("setExposurePointFailed", "Could not determine max region boundaries", null);
-      return;
-    }
-    // Set the metering rectangle
-    cameraRegions.setAutoExposureMeteringRectangleFromPoint(x, y);
-    // Apply it
-    initPreviewCaptureBuilder();
-    this.cameraCaptureSession.setRepeatingRequest(
-        captureRequestBuilder.build(), pictureCaptureCallback, null);
-    result.success(null);
-  }
-
-  @TargetApi(VERSION_CODES.P)
-  private boolean supportsDistortionCorrection() throws CameraAccessException {
-    int[] availableDistortionCorrectionModes =
-        cameraManager
-            .getCameraCharacteristics(cameraDevice.getId())
-            .get(CameraCharacteristics.DISTORTION_CORRECTION_AVAILABLE_MODES);
-    if (availableDistortionCorrectionModes == null) availableDistortionCorrectionModes = new int[0];
-    long nonOffModesSupported =
-        Arrays.stream(availableDistortionCorrectionModes)
-            .filter((value) -> value != CaptureRequest.DISTORTION_CORRECTION_MODE_OFF)
-            .count();
-    return nonOffModesSupported > 0;
-  }
-
-  private Size getRegionBoundaries() throws CameraAccessException {
-    // No distortion correction support
-    if (android.os.Build.VERSION.SDK_INT < VERSION_CODES.P || !supportsDistortionCorrection()) {
-      return cameraManager
-          .getCameraCharacteristics(cameraDevice.getId())
-          .get(CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE);
-    }
-    // Get the current distortion correction mode
-    Integer distortionCorrectionMode =
-        captureRequestBuilder.get(CaptureRequest.DISTORTION_CORRECTION_MODE);
-    // Return the correct boundaries depending on the mode
-    android.graphics.Rect rect;
-    if (distortionCorrectionMode == null
-        || distortionCorrectionMode == CaptureRequest.DISTORTION_CORRECTION_MODE_OFF) {
-      rect =
-          cameraManager
-              .getCameraCharacteristics(cameraDevice.getId())
-              .get(CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE);
-    } else {
-      rect =
-          cameraManager
-              .getCameraCharacteristics(cameraDevice.getId())
-              .get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
-    }
-    return rect == null ? null : new Size(rect.width(), rect.height());
-  }
-
-  private boolean isExposurePointSupported() throws CameraAccessException {
-    Integer supportedRegions =
-        cameraManager
-            .getCameraCharacteristics(cameraDevice.getId())
-            .get(CameraCharacteristics.CONTROL_MAX_REGIONS_AE);
-    return supportedRegions != null && supportedRegions > 0;
-  }
-
-  public double getMinExposureOffset() throws CameraAccessException {
-    Range<Integer> range =
-        cameraManager
-            .getCameraCharacteristics(cameraDevice.getId())
-            .get(CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE);
-    double minStepped = range == null ? 0 : range.getLower();
-    double stepSize = getExposureOffsetStepSize();
-    return minStepped * stepSize;
-  }
-
-  public double getMaxExposureOffset() throws CameraAccessException {
-    Range<Integer> range =
-        cameraManager
-            .getCameraCharacteristics(cameraDevice.getId())
-            .get(CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE);
-    double maxStepped = range == null ? 0 : range.getUpper();
-    double stepSize = getExposureOffsetStepSize();
-    return maxStepped * stepSize;
-  }
-
-  public double getExposureOffsetStepSize() throws CameraAccessException {
-    Rational stepSize =
-        cameraManager
-            .getCameraCharacteristics(cameraDevice.getId())
-            .get(CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP);
-    return stepSize == null ? 0.0 : stepSize.doubleValue();
-  }
-
-  public void setExposureOffset(@NonNull final Result result, double offset)
-      throws CameraAccessException {
-    // Set the exposure offset
-    double stepSize = getExposureOffsetStepSize();
-    exposureOffset = (int) (offset / stepSize);
-    // Apply it
-    initPreviewCaptureBuilder();
-    this.cameraCaptureSession.setRepeatingRequest(captureRequestBuilder.build(), null, null);
-    result.success(offset);
-  }
-
-  private void initPreviewCaptureBuilder() {
-    captureRequestBuilder.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_MODE_AUTO);
     // Applying flash modes
     switch (flashMode) {
       case off:
@@ -1089,24 +966,6 @@ private void initPreviewCaptureBuilder() {
         captureRequestBuilder.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH);
         break;
     }
-    // Applying auto exposure
-    MeteringRectangle aeRect = cameraRegions.getAEMeteringRectangle();
-    captureRequestBuilder.set(
-        CaptureRequest.CONTROL_AE_REGIONS,
-        new MeteringRectangle[] {cameraRegions.getAEMeteringRectangle()});
-    switch (exposureMode) {
-      case locked:
-        captureRequestBuilder.set(CaptureRequest.CONTROL_AE_LOCK, true);
-        break;
-      case auto:
-      default:
-        captureRequestBuilder.set(CaptureRequest.CONTROL_AE_LOCK, false);
-        break;
-    }
-    captureRequestBuilder.set(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION, exposureOffset);
-    // Applying auto focus
-    captureRequestBuilder.set(
-        CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
   }
 
   public void startPreview() throws CameraAccessException {

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

@@ -8,11 +8,9 @@ public final class CameraRegions {
   private Size maxBoundaries;
 
   public CameraRegions(Size maxBoundaries) {
-    assert (maxBoundaries != null);
-    assert (maxBoundaries.getWidth() > 0);
-    assert (maxBoundaries.getHeight() > 0);
+    assert (maxBoundaries == null || maxBoundaries.getWidth() > 0);
+    assert (maxBoundaries == null || maxBoundaries.getHeight() > 0);
     this.maxBoundaries = maxBoundaries;
-    setAutoExposureMeteringRectangleFromPoint(0.5, 0.5);
   }
 
   public MeteringRectangle getAEMeteringRectangle() {
@@ -23,14 +21,20 @@ public Size getMaxBoundaries() {
     return this.maxBoundaries;
   }
 
+  public void resetAutoExposureMeteringRectangle() {
+    this.aeMeteringRectangle = null;
+  }
+
   public void setAutoExposureMeteringRectangleFromPoint(double x, double y) {
     this.aeMeteringRectangle = getMeteringRectangleForPoint(maxBoundaries, x, y);
   }
 
   public MeteringRectangle getMeteringRectangleForPoint(Size maxBoundaries, double x, double y) {
     assert (x >= 0 && x <= 1);
     assert (y >= 0 && y <= 1);
-    assert (maxBoundaries != null);
+    if (maxBoundaries == null)
+      throw new IllegalStateException(
+          "Functionality for managing metering rectangles is unavailable as this CameraRegions instance was initialized with null boundaries.");
 
     // Interpolate the target coordinate
     int targetX = (int) Math.round(x * ((double) (maxBoundaries.getWidth() - 1)));

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/CameraRegionsTest.java

@@ -1,6 +1,8 @@
 package io.flutter.plugins.camera;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import android.hardware.camera2.params.MeteringRectangle;
 import android.util.Size;
@@ -39,7 +41,7 @@ public void getMeteringRectangleForPoint_should_throw_for_y_lower_bound() {
     cameraRegions.getMeteringRectangleForPoint(new Size(10, 10), 0, -0.5);
   }
 
-  @Test(expected = AssertionError.class)
+  @Test(expected = IllegalStateException.class)
   public void getMeteringRectangleForPoint_should_throw_for_null_boundaries() {
     cameraRegions.getMeteringRectangleForPoint(null, 0, -0);
   }
@@ -68,11 +70,6 @@ public void getMeteringRectangleForPoint_should_return_valid_MeteringRectangle()
     assertEquals(new MeteringRectangle(89, 0, 10, 5, 1), r);
   }
 
-  @Test(expected = AssertionError.class)
-  public void constructor_should_throw_for_null_boundaries() {
-    new CameraRegions(null);
-  }
-
   @Test(expected = AssertionError.class)
   public void constructor_should_throw_for_0_width_boundary() {
     new CameraRegions(new Size(0, 50));
@@ -87,13 +84,22 @@ public void constructor_should_throw_for_0_height_boundary() {
   public void constructor_should_initialize() {
     CameraRegions cr = new CameraRegions(new Size(100, 50));
     assertEquals(new Size(100, 50), cr.getMaxBoundaries());
-    assertEquals(new MeteringRectangle(45, 23, 10, 5, 1), cr.getAEMeteringRectangle());
+    assertNull(cr.getAEMeteringRectangle());
   }
 
   @Test
-  public void setAutoExposureMeteringRectangleFromPoin_should_set_aeMeteringRectangle_for_point() {
+  public void setAutoExposureMeteringRectangleFromPoint_should_set_aeMeteringRectangle_for_point() {
     CameraRegions cr = new CameraRegions(new Size(100, 50));
     cr.setAutoExposureMeteringRectangleFromPoint(0, 0);
     assertEquals(new MeteringRectangle(0, 0, 10, 5, 1), cr.getAEMeteringRectangle());
   }
+
+  @Test
+  public void resetAutoExposureMeteringRectangle_should_reset_aeMeteringRectangle() {
+    CameraRegions cr = new CameraRegions(new Size(100, 50));
+    cr.setAutoExposureMeteringRectangleFromPoint(0, 0);
+    assertNotNull(cr.getAEMeteringRectangle());
+    cr.resetAutoExposureMeteringRectangle();
+    assertNull(cr.getAEMeteringRectangle());
+  }
 }

packages/camera/camera/pubspec.yaml

@@ -2,13 +2,13 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.6.4
+version: 0.6.5
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 
 dependencies:
   flutter:
     sdk: flutter
-  camera_platform_interface: '>=1.0.4 <1.3.0'
+  camera_platform_interface: ^1.2.0
   pedantic: ^1.8.0
 
 dev_dependencies:

packages/camera/camera/test/camera_test.dart

@@ -28,7 +28,7 @@ get mockAvailableCameras => [
 get mockInitializeCamera => 13;
 
 get mockOnCameraInitializedEvent =>
-    CameraInitializedEvent(13, 75, 75, ExposureMode.auto, false);
+    CameraInitializedEvent(13, 75, 75, ExposureMode.auto, true);
 
 get mockOnCameraClosingEvent => null;
 

packages/camera/camera_platform_interface/CHANGELOG.md

@@ -1,7 +1,11 @@
-## 1.3.0
+## 1.4.0
 
 - Added interface methods to support auto focus.
 
+## 1.3.0
+
+- Introduces an option to set the image format when initializing.
+
 ## 1.2.0
 
 - Added interface to support automatic exposure.

packages/camera/camera_platform_interface/lib/src/method_channel/method_channel_camera.dart

@@ -7,6 +7,7 @@ import 'dart:math';
 
 import 'package:camera_platform_interface/camera_platform_interface.dart';
 import 'package:camera_platform_interface/src/types/focus_mode.dart';
+import 'package:camera_platform_interface/src/types/image_format_group.dart';
 import 'package:camera_platform_interface/src/utils/utils.dart';
 import 'package:cross_file/cross_file.dart';
 import 'package:flutter/services.dart';

packages/camera/camera_platform_interface/lib/src/platform_interface/camera_platform.dart

@@ -9,6 +9,7 @@ import 'package:camera_platform_interface/camera_platform_interface.dart';
 import 'package:camera_platform_interface/src/method_channel/method_channel_camera.dart';
 import 'package:camera_platform_interface/src/types/exposure_mode.dart';
 import 'package:camera_platform_interface/src/types/focus_mode.dart';
+import 'package:camera_platform_interface/src/types/image_format_group.dart';
 import 'package:cross_file/cross_file.dart';
 import 'package:flutter/widgets.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';

packages/camera/camera_platform_interface/pubspec.yaml

@@ -3,7 +3,7 @@ description: A common platform interface for the camera plugin.
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera_platform_interface
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 1.3.0
+version: 1.4.0
 
 dependencies:
   flutter: