Skip to content

[camera_android] Provides a default exposure point if null #3718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Mairramer wants to merge 13 commits into from
Closed

[camera_android] Provides a default exposure point if null #3718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c59aad8
[camera] Provides a default exposure point if null
Mairramer Apr 16, 2023
7104437
[camera] fix format
Mairramer Apr 16, 2023
4f19599
Merge branch 'main' into camera_exposure_fix
Mairramer Apr 16, 2023
199c6f5
[camera] bump version
Mairramer Apr 16, 2023
64809d4
[camera] rollback tests
Mairramer Apr 16, 2023
941e115
[camera] Provides a default exposure point if null
Mairramer Apr 16, 2023
01cf260
Merge branch 'camera_exposure_fix' of https://github.com/Mairramer/pa…
Mairramer Apr 16, 2023
d0ec237
Update packages/camera/camera_android/CHANGELOG.md
Mairramer Apr 18, 2023
76f5c64
[camera] create a default imageStreamReader
Mairramer Apr 18, 2023
e88bf62
Merge branch 'main' into camera_exposure_fix
Mairramer Apr 18, 2023
9e7db5f
Merge branch 'main' into camera_exposure_fix
Mairramer Apr 27, 2023
3b8f6c9
Merge branch 'main' into camera_exposure_fix
Mairramer Apr 28, 2023
15ab95b
Merge branch 'main' into camera_exposure_fix
Mairramer Apr 28, 2023
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
Prev Previous commit
Next Next commit
[camera] fix format
  • Loading branch information
@Mairramer
Mairramer committed Apr 16, 2023
commit 71044377c261fa26647418a376838156ad882a53
6 changes: 3 additions & 3 deletions .../src/main/java/io/flutter/plugins/camera/features/exposurepoint/ExposurePointFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import io.flutter.plugins.camera.features.CameraFeature;
import io.flutter.plugins.camera.features.Point;
import io.flutter.plugins.camera.features.sensororientation.SensorOrientationFeature;
import java.util.Arrays;

/** Exposure point controls where in the frame exposure metering will come from. */
public class ExposurePointFeature extends CameraFeature<Point> {
Expand Down Expand Up @@ -78,7 +77,8 @@ public void updateBuilder(CaptureRequest.Builder requestBuilder) {
defaultExposureRectangle = requestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS);
}
if (exposureRectangle != null) {
requestBuilder.set(CaptureRequest.CONTROL_AE_REGIONS, new MeteringRectangle[] {exposureRectangle});
requestBuilder.set(
CaptureRequest.CONTROL_AE_REGIONS, new MeteringRectangle[] {exposureRectangle});
} else if (shouldReset(requestBuilder)) {
requestBuilder.set(CaptureRequest.CONTROL_AE_REGIONS, defaultExposureRectangle);
}
Expand All @@ -104,7 +104,7 @@ private void buildExposureRectangle() {
}
}

public boolean shouldReset(CaptureRequest.Builder requestBuilder) {
public boolean shouldReset(CaptureRequest.Builder requestBuilder) {
MeteringRectangle[] currentRectangles = requestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS);
return currentRectangles == null || currentRectangles.length == 0;
}
Expand Down
8 changes: 3 additions & 5 deletions .../test/java/io/flutter/plugins/camera/features/exposurepoint/ExposurePointFeatureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
Expand All @@ -30,7 +28,6 @@
import org.junit.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import java.util.Arrays;

public class ExposurePointFeatureTest {

Expand Down Expand Up @@ -321,7 +318,8 @@ public void testShouldResetReturnsFalse() {
CaptureRequest.Builder mockCaptureRequestBuilder = mock(CaptureRequest.Builder.class);
MeteringRectangle[] defaultRectangles = new MeteringRectangle[1];
defaultRectangles[0] = mock(MeteringRectangle.class);
when(mockCaptureRequestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS)).thenReturn(defaultRectangles);
when(mockCaptureRequestBuilder.get(CaptureRequest.CONTROL_AE_REGIONS))
.thenReturn(defaultRectangles);
mockCaptureRequestBuilder.set(CaptureRequest.CONTROL_AE_REGIONS, defaultRectangles);

ExposurePointFeature exposurePointFeature = mock(ExposurePointFeature.class);
Expand All @@ -331,4 +329,4 @@ public void testShouldResetReturnsFalse() {

assertFalse(exposurePointFeature.shouldReset(mockCaptureRequestBuilder));
}
}
}