Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b6729ac
Start implementation of setting points + offset
camsim99 Feb 2, 2024
14d1024
Finish adding intial impls
camsim99 Feb 5, 2024
975806b
Fix crashes
camsim99 Feb 5, 2024
a7181b2
Cleanup pt1
camsim99 Feb 6, 2024
ea5f15f
Cleanup pt2
camsim99 Feb 6, 2024
5fe2976
Self review
camsim99 Feb 6, 2024
e41a825
Add tests
camsim99 Feb 7, 2024
9736287
Merge remote-tracking branch 'upstream/main' into camx_fe
camsim99 Feb 7, 2024
38e88a8
Format
camsim99 Feb 7, 2024
2843626
Update readme + bump version
camsim99 Feb 7, 2024
35ebf13
Improve docs
camsim99 Feb 7, 2024
c2f75ec
Change metering point factory
camsim99 Feb 8, 2024
b8526e1
Self review
camsim99 Feb 8, 2024
928b4cd
Nits + lints
camsim99 Feb 8, 2024
3527d9e
Merge remote-tracking branch 'upstream/main' into camx_fe
camsim99 Feb 9, 2024
1d4d37e
Update video cap test
camsim99 Feb 9, 2024
35ab369
Fix nit
camsim99 Feb 12, 2024
0de865a
Update packages/camera/camera_android_camerax/lib/src/android_camera_…
camsim99 Feb 14, 2024
bb13a35
Address review
camsim99 Feb 14, 2024
1a601a4
Merge remote-tracking branch 'refs/remotes/origin/camx_fe' into camx_fe
camsim99 Feb 14, 2024
2c3c9ab
Update packages/camera/camera_android_camerax/test/android_camera_cam…
camsim99 Feb 20, 2024
6652171
Use absolute paths
camsim99 Feb 20, 2024
a08eed6
Merge remote-tracking branch 'refs/remotes/origin/camx_fe' into camx_fe
camsim99 Feb 20, 2024
c35fa15
Address nit + change getExposureOffsetStepSize to return 0
camsim99 Feb 21, 2024
fac3ff6
Merge remote-tracking branch 'upstream/main' into camx_fe
camsim99 Feb 21, 2024
077ee37
Change to -1
camsim99 Feb 21, 2024
ff3fc39
Update wording
camsim99 Feb 21, 2024
fc60e77
Undo platform interface changes
camsim99 Feb 21, 2024
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
Self review
  • Loading branch information
camsim99 committed Feb 8, 2024
commit b8526e1e0983a0864e92d9aa273e8d545cff4206
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ class AndroidCameraCameraX extends CameraPlatform {
/// This method will merge the current action's metering points with that
/// specified such that only one auto-exposure metering point and one
/// auto-focus metering point will be part of the action. This method would
/// also accommodatate at most on auto-white balance metering point, but that
/// also accommodate at most one auto-white balance metering point, but that
/// mode is currently unused in this plugin.
///
/// Thus, if [meteringPoint] is non-null, this action includes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ class MeteringPoint extends JavaObject {
InstanceManager? instanceManager,
required this.x,
required this.y,
required this.cameraInfo,
this.size,
required this.cameraInfo,
}) : super.detached(
binaryMessenger: binaryMessenger,
instanceManager: instanceManager,
) {
_api = _MeteringPointHostApiImpl(
binaryMessenger: binaryMessenger, instanceManager: instanceManager);
_api.createFromInstance(this, x, y, cameraInfo, size);
_api.createFromInstance(this, x, y, size, cameraInfo);
AndroidCameraXCameraFlutterApis.instance.ensureSetUp();
}

Expand All @@ -42,8 +42,8 @@ class MeteringPoint extends JavaObject {
InstanceManager? instanceManager,
required this.x,
required this.y,
required this.cameraInfo,
this.size,
required this.cameraInfo,
}) : super.detached(
binaryMessenger: binaryMessenger,
instanceManager: instanceManager,
Expand Down Expand Up @@ -108,7 +108,7 @@ class _MeteringPointHostApiImpl extends MeteringPointHostApi {
/// Creates a [MeteringPoint] instance with the specified [x] and [y]
/// coordinates as well as [size] if non-null.
Future<void> createFromInstance(MeteringPoint instance, double x, double y,
CameraInfo cameraInfo, double? size) {
double? size, CameraInfo cameraInfo) {
int? identifier = instanceManager.getIdentifier(instance);
identifier ??= instanceManager.addDartCreatedInstance(instance,
onCopy: (MeteringPoint original) {
Expand Down