Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
2b7aa9b
Base classes to support Android camera features
mvanbeusekom Apr 8, 2021
f780742
Fixed formatting
mvanbeusekom Apr 8, 2021
76bc5bd
Applied feedback from PR
mvanbeusekom Apr 20, 2021
0bbed99
Added Android FPS range, resolution and sensor orientation features
mvanbeusekom Apr 8, 2021
1ba738d
Use mockito-inline
mvanbeusekom Apr 9, 2021
de4e70f
Merge remote-tracking branch 'upstream/master' into camera-android/fp…
mvanbeusekom Apr 21, 2021
728346a
Fix issue Pixel 4A
mvanbeusekom May 26, 2021
c014fe3
Merge remote-tracking branch 'upstream/master' into camera-android/fp…
mvanbeusekom May 31, 2021
84f5e73
Added API documentation
mvanbeusekom May 31, 2021
f763f77
Processed feedback on PR
mvanbeusekom May 31, 2021
4a7c73a
Fix formatting
mvanbeusekom May 31, 2021
a890919
Fix formatting
mvanbeusekom May 31, 2021
f60a0d3
Merge remote-tracking branch 'upstream/master'
BeMacized Jun 8, 2021
55a6702
Only exclude 60 FPS limit for Pixel 4a
mvanbeusekom Jun 8, 2021
cd53321
Removed redundant empty line
mvanbeusekom Jun 8, 2021
35831d3
Fixed comment
mvanbeusekom Jun 8, 2021
a9f3142
Test Pixel 4a workaround
mvanbeusekom Jun 8, 2021
551800e
Add tests for orientation updates
mvanbeusekom Jun 10, 2021
68cbc56
Fix formatting
mvanbeusekom Jun 10, 2021
1b137c2
Fix formatting
mvanbeusekom Jun 10, 2021
6514a00
Added missing license header
mvanbeusekom Jun 10, 2021
baae5f6
Add feature classes for exposure- and focus point functionality.
BeMacized Jun 10, 2021
cae8a90
Merge remote-tracking branch 'upstream/master'
BeMacized Jun 11, 2021
94fed08
Added noise reduction feature
BeMacized Jun 14, 2021
be05e67
Merge branch 'camera-android/noise_reduction_feature' into camera-and…
BeMacized Jun 14, 2021
a68b9fb
Merge branch 'camera-android/exposure_focus_point_features' into came…
BeMacized Jun 14, 2021
e5253c1
Merge remote-tracking branch 'origin/camera-android/fps_resolution_se…
BeMacized Jun 14, 2021
4f169ab
Implemented PR feedback
BeMacized Jun 15, 2021
3a68294
Implemented PR feedback
BeMacized Jun 15, 2021
70dbbd5
Add supporting functionality for android refactor
BeMacized Jun 15, 2021
8e65f33
Merge branch 'camera-android/exposure_focus_point_features' into came…
BeMacized Jun 16, 2021
2c64ea2
Merge branch 'camera-android/noise_reduction_feature' into camera-and…
BeMacized Jun 16, 2021
ab332ee
Update packages/camera/camera/android/src/main/java/io/flutter/plugin…
BeMacized Jun 16, 2021
bc16dd3
Update packages/camera/camera/android/src/main/java/io/flutter/plugin…
BeMacized Jun 16, 2021
a85e312
Update packages/camera/camera/android/src/main/java/io/flutter/plugin…
BeMacized Jun 16, 2021
84d6db2
Update packages/camera/camera/android/src/main/java/io/flutter/plugin…
BeMacized Jun 16, 2021
071e879
Update packages/camera/camera/android/src/main/java/io/flutter/plugin…
BeMacized Jun 16, 2021
273762b
Update packages/camera/camera/android/src/test/java/io/flutter/plugin…
BeMacized Jun 16, 2021
e9e9bc5
Update packages/camera/camera/android/src/test/java/io/flutter/plugin…
BeMacized Jun 16, 2021
1af5437
Update packages/camera/camera/android/src/test/java/io/flutter/plugin…
BeMacized Jun 16, 2021
b49b743
Added documentation to DartMessenger
mvanbeusekom Jun 16, 2021
5b8c0d8
Update packages/camera/camera/android/src/main/java/io/flutter/plugin…
BeMacized Jun 16, 2021
62a2f21
Add missing CaptureTimeoutsWrapper documentation
BeMacized Jun 16, 2021
43c0716
Update packages/camera/camera/android/src/main/java/io/flutter/plugin…
BeMacized Jun 16, 2021
24c6c9a
Added documentation to the CameraCaptureCallback
mvanbeusekom Jun 16, 2021
fc2d78b
Merge branch 'camera-android/supporting_functionality' of github.com:…
mvanbeusekom Jun 16, 2021
b2536d4
Add missing documentation for ImageSaver runnable
BeMacized Jun 16, 2021
1748503
Merge remote-tracking branch 'origin/camera-android/supporting_functi…
BeMacized Jun 16, 2021
3118680
Update packages/camera/camera/android/src/main/java/io/flutter/plugin…
BeMacized Jun 16, 2021
7dbbdce
Added documentation to the CameraFeatureFactory
mvanbeusekom Jun 16, 2021
2b2bea3
Configure log tag in one place and optimised loggin
mvanbeusekom Jun 16, 2021
96d285b
Android rework finalization (wip)
BeMacized Jun 16, 2021
81920e0
Progress on final implementation of android rework
BeMacized Jun 16, 2021
6fe67da
Update tests
BeMacized Jun 16, 2021
7f0180e
Accept cameraName as String
mvanbeusekom Jun 16, 2021
24af367
Format
mvanbeusekom Jun 16, 2021
a987711
Changes required for integrating main camera class
BeMacized Jun 16, 2021
66a713d
Merge branch 'camera-android/fps_resolution_sensor_features' into cam…
BeMacized Jun 16, 2021
ce9df6c
Changes required for integrating main camera class
BeMacized Jun 16, 2021
32cb969
Remove debug statement
BeMacized Jun 16, 2021
44acbf7
Merge branch 'camera-android/supporting_functionality' into camera-an…
BeMacized Jun 16, 2021
dd3416b
Updated pubspec version and changelog
BeMacized Jun 16, 2021
d215ac7
Merge branch 'master' into camera-android/supporting_functionality
BeMacized Jun 22, 2021
d10397a
Merge branch 'camera-android/supporting_functionality' into camera-an…
BeMacized Jun 22, 2021
914b187
Merge branch 'master' into camera-android/supporting_functionality
BeMacized Jun 24, 2021
6e13430
Merge branch 'camera-android/supporting_functionality' into camera-an…
BeMacized Jun 24, 2021
9282d9a
Remove unused classes after refactor
BeMacized Jun 28, 2021
cb3a35c
Fix camera orientation issues
BeMacized Jun 28, 2021
5cfbf1c
Merge branch 'camera-android/final-rework-implementation' into fix/ca…
BeMacized Jun 28, 2021
5e3eac8
Fix unit tests
BeMacized Jun 29, 2021
9779a28
Fix rotation issues with exposure- and focus point features.
BeMacized Jul 8, 2021
90000ce
Fix unit tests & Format
BeMacized Jul 12, 2021
3b7f053
Add unit tests for metering rectangle rotation
BeMacized Jul 12, 2021
6bb305e
Merge branch 'master' into camera-android/final-rework-implementation
BeMacized Jul 12, 2021
8e44421
Merge branch 'camera-android/final-rework-implementation' into fix/ca…
BeMacized Jul 12, 2021
36d7173
Revert adjustments to platform interface to prevent unnecessary break…
BeMacized Jul 13, 2021
a2607d1
Revert naming refactor
BeMacized Jul 13, 2021
9fb1019
Update project.pbxproj
BeMacized Jul 13, 2021
777c696
Undo version bump
BeMacized Jul 13, 2021
6c8f16e
Merge branch 'camera-android/final-rework-implementation' into fix/ca…
BeMacized Jul 13, 2021
5d9fb6d
Updated changelog and pubspec version
BeMacized Jul 13, 2021
890605a
Merge branch 'fix/camera-orientation' into camera-android/final-rewor…
BeMacized Jul 13, 2021
7c916c2
Merge branch 'master' into camera-android/final-rework-implementation
BeMacized Jul 22, 2021
a3adf8f
Expand camera platform interface to support pausing the camera preview.
BeMacized Jul 26, 2021
98378d3
Add Android & iOS implementations for pausing the camera preview
BeMacized Jul 26, 2021
d78cab8
Merge branch 'master' into camera/preview-pause-interface
BeMacized Jul 26, 2021
6d12128
Merge branch 'camera/preview-pause-interface' into camera/preview-pau…
BeMacized Jul 26, 2021
d11acf0
Merge branch 'master' into camera/preview-pause-impl
BeMacized Aug 24, 2021
08137da
Fix formatting
BeMacized Aug 24, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/camera/camera/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
dependencies {
compileOnly 'androidx.annotation:annotation:1.1.0'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-inline:3.5.13'
testImplementation 'org.mockito:mockito-inline:3.11.0'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'org.robolectric:robolectric:4.3'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

package io.flutter.plugins.camera;

import android.annotation.TargetApi;
import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.params.MeteringRectangle;
import android.os.Build;
import android.util.Size;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import java.util.Arrays;

/**
* Utility class offering functions to calculate values regarding the camera boundaries.
*
* <p>The functions are used to calculate focus and exposure settings.
*/
public final class CameraRegionUtils {

/**
* Obtains the boundaries for the currently active camera, that can be used for calculating
* MeteringRectangle instances required for setting focus or exposure settings.
*
* @param cameraProperties - Collection of the characteristics for the current camera device.
* @param requestBuilder - The request builder for the current capture request.
* @return The boundaries for the current camera device.
*/
public static Size getCameraBoundaries(
@NonNull CameraProperties cameraProperties, @NonNull CaptureRequest.Builder requestBuilder) {
// No distortion correction support
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
&& supportsDistortionCorrection(cameraProperties)) {
// Get the current distortion correction mode
Integer distortionCorrectionMode =
requestBuilder.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 = cameraProperties.getSensorInfoPreCorrectionActiveArraySize();
} else {
rect = cameraProperties.getSensorInfoActiveArraySize();
}

// Return camera boundaries
return rect == null ? null : new Size(rect.width(), rect.height());
} else {
// Return camera boundaries
return cameraProperties.getSensorInfoPixelArraySize();
}
}

/**
* Converts a point into a {@link MeteringRectangle} with the supplied coordinates as the centre
* point.
*
* <p>Since the Camera API (due to cross-platform constraints) only accepts a point when
* configuring a specific focus or exposure area and Android requires a rectangle to configure
* these settings there is a need to convert the point into a rectangle. This method will create
* the required rectangle with an arbitrarily size that is a 10th of the current viewport and the
* coordinates as the centre point.
*
* @param boundaries - The camera boundaries to calculate the metering rectangle for.
* @param x x - 1 >= coordinate >= 0
* @param y y - 1 >= coordinate >= 0
* @return The dimensions of the metering rectangle based on the supplied coordinates and
* boundaries.
*/
public static MeteringRectangle convertPointToMeteringRectangle(
@NonNull Size boundaries, double x, double y) {
assert (boundaries.getWidth() > 0 && boundaries.getHeight() > 0);
assert (x >= 0 && x <= 1);
assert (y >= 0 && y <= 1);

// Interpolate the target coordinate
int targetX = (int) Math.round(x * ((double) (boundaries.getWidth() - 1)));
int targetY = (int) Math.round(y * ((double) (boundaries.getHeight() - 1)));
// Since the Camera API only allows Determine the dimensions of the metering rectangle (10th of
// the viewport)
int targetWidth = (int) Math.round(((double) boundaries.getWidth()) / 10d);
int targetHeight = (int) Math.round(((double) boundaries.getHeight()) / 10d);
// Adjust target coordinate to represent top-left corner of metering rectangle
targetX -= targetWidth / 2;
targetY -= targetHeight / 2;
// Adjust target coordinate as to not fall out of bounds
if (targetX < 0) targetX = 0;
if (targetY < 0) targetY = 0;
int maxTargetX = boundaries.getWidth() - 1 - targetWidth;
int maxTargetY = boundaries.getHeight() - 1 - targetHeight;
if (targetX > maxTargetX) targetX = maxTargetX;
if (targetY > maxTargetY) targetY = maxTargetY;

// Build the metering rectangle
return MeteringRectangleFactory.create(targetX, targetY, targetWidth, targetHeight, 1);
}

@TargetApi(Build.VERSION_CODES.P)
private static boolean supportsDistortionCorrection(CameraProperties cameraProperties) {
int[] availableDistortionCorrectionModes =
cameraProperties.getDistortionCorrectionAvailableModes();
if (availableDistortionCorrectionModes == null) {
availableDistortionCorrectionModes = new int[0];
}
long nonOffModesSupported =
Arrays.stream(availableDistortionCorrectionModes)
.filter((value) -> value != CaptureRequest.DISTORTION_CORRECTION_MODE_OFF)
.count();
return nonOffModesSupported > 0;
}

/** Factory class that assists in creating a {@link MeteringRectangle} instance. */
static class MeteringRectangleFactory {
/**
* Creates a new instance of the {@link MeteringRectangle} class.
*
* <p>This method is visible for testing purposes only and should never be used outside this *
* class.
*
* @param x coordinate >= 0
* @param y coordinate >= 0
* @param width width >= 0
* @param height height >= 0
* @param meteringWeight weight between {@value MeteringRectangle#METERING_WEIGHT_MIN} and
* {@value MeteringRectangle#METERING_WEIGHT_MAX} inclusively
* @return new instance of the {@link MeteringRectangle} class.
* @throws IllegalArgumentException if any of the parameters were negative
*/
@VisibleForTesting
public static MeteringRectangle create(
int x, int y, int width, int height, int meteringWeight) {
return new MeteringRectangle(x, y, width, height, meteringWeight);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,36 @@

import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.params.MeteringRectangle;
import android.util.Log;
import androidx.annotation.NonNull;
import android.util.Size;
import io.flutter.plugins.camera.CameraProperties;
import io.flutter.plugins.camera.CameraRegionUtils;
import io.flutter.plugins.camera.features.CameraFeature;
import io.flutter.plugins.camera.features.Point;
import io.flutter.plugins.camera.types.CameraRegions;

/** Exposure point controls where in the frame exposure metering will come from. */
public class ExposurePointFeature extends CameraFeature<Point> {

private final CameraRegions cameraRegions;
private Point currentSetting = new Point(0.0, 0.0);
private Size cameraBoundaries;
private Point exposurePoint;
private MeteringRectangle exposureRectangle;

/**
* Creates a new instance of the {@link ExposurePointFeature}.
*
* @param cameraProperties Collection of the characteristics for the current camera device.
* @param cameraRegions Utility class to assist in calculating exposure boundaries.
*/
public ExposurePointFeature(CameraProperties cameraProperties, CameraRegions cameraRegions) {
public ExposurePointFeature(CameraProperties cameraProperties) {
super(cameraProperties);
this.cameraRegions = cameraRegions;
}

/**
* Sets the camera boundaries that are required for the exposure point feature to function.
*
* @param cameraBoundaries - The camera boundaries to set.
*/
public void setCameraBoundaries(Size cameraBoundaries) {
this.cameraBoundaries = cameraBoundaries;
this.buildExposureRectangle();
}

@Override
Expand All @@ -37,23 +45,19 @@ public String getDebugName() {

@Override
public Point getValue() {
return currentSetting;
return exposurePoint;
}

@Override
public void setValue(@NonNull Point value) {
this.currentSetting = value;

if (value.x == null || value.y == null) {
cameraRegions.resetAutoExposureMeteringRectangle();
} else {
cameraRegions.setAutoExposureMeteringRectangleFromPoint(value.x, value.y);
}
public void setValue(Point value) {
this.exposurePoint = value == null || value.x == null || value.y == null ? null : value;
this.buildExposureRectangle();
}

// Whether or not this camera can set the exposure point.
@Override
public boolean checkIsSupported() {
if (cameraBoundaries == null) return false;
Integer supportedRegions = cameraProperties.getControlMaxRegionsAutoExposure();
return supportedRegions != null && supportedRegions > 0;
}
Expand All @@ -63,16 +67,21 @@ public void updateBuilder(CaptureRequest.Builder requestBuilder) {
if (!checkIsSupported()) {
return;
}

MeteringRectangle aeRect = null;
try {
aeRect = cameraRegions.getAEMeteringRectangle();
} catch (Exception e) {
Log.w("Camera", "Unable to retrieve the Auto Exposure metering rectangle.", e);
}

requestBuilder.set(
CaptureRequest.CONTROL_AE_REGIONS,
aeRect == null ? null : new MeteringRectangle[] {aeRect});
exposureRectangle == null ? null : new MeteringRectangle[] {exposureRectangle});
}

private void buildExposureRectangle() {
if (!checkIsSupported()) {
return;
}
if (this.exposurePoint == null) {
this.exposureRectangle = null;
} else {
this.exposureRectangle =
CameraRegionUtils.convertPointToMeteringRectangle(
this.cameraBoundaries, this.exposurePoint.x, this.exposurePoint.y);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

package io.flutter.plugins.camera.features.focuspoint;

import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.params.MeteringRectangle;
import android.util.Size;
import io.flutter.plugins.camera.CameraProperties;
import io.flutter.plugins.camera.CameraRegionUtils;
import io.flutter.plugins.camera.features.CameraFeature;
import io.flutter.plugins.camera.features.Point;

/** Focus point controls where in the frame focus will come from. */
public class FocusPointFeature extends CameraFeature<Point> {

private Size cameraBoundaries;
private Point focusPoint;
private MeteringRectangle focusRectangle;

/**
* Creates a new instance of the {@link FocusPointFeature}.
*
* @param cameraProperties Collection of the characteristics for the current camera device.
*/
public FocusPointFeature(CameraProperties cameraProperties) {
super(cameraProperties);
}

/**
* Sets the camera boundaries that are required for the focus point feature to function.
*
* @param cameraBoundaries - The camera boundaries to set.
*/
public void setCameraBoundaries(Size cameraBoundaries) {
this.cameraBoundaries = cameraBoundaries;
this.buildFocusRectangle();
}

@Override
public String getDebugName() {
return "FocusPointFeature";
}

@Override
public Point getValue() {
return focusPoint;
}

@Override
public void setValue(Point value) {
this.focusPoint = value == null || value.x == null || value.y == null ? null : value;
this.buildFocusRectangle();
}

// Whether or not this camera can set the exposure point.
@Override
public boolean checkIsSupported() {
if (cameraBoundaries == null) return false;
Integer supportedRegions = cameraProperties.getControlMaxRegionsAutoFocus();
return supportedRegions != null && supportedRegions > 0;
}

@Override
public void updateBuilder(CaptureRequest.Builder requestBuilder) {
if (!checkIsSupported()) {
return;
}
requestBuilder.set(
CaptureRequest.CONTROL_AF_REGIONS,
focusRectangle == null ? null : new MeteringRectangle[] {focusRectangle});
}

private void buildFocusRectangle() {
if (!checkIsSupported()) {
return;
}
if (this.focusPoint == null) {
this.focusRectangle = null;
} else {
this.focusRectangle =
CameraRegionUtils.convertPointToMeteringRectangle(
this.cameraBoundaries, this.focusPoint.x, this.focusPoint.y);
}
}
}
Loading