Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
dec3d69
Merge remote-tracking branch 'upstream/main' into camx_occ
camsim99 May 1, 2023
0e0333b
Merge remote-tracking branch 'upstream/main'
camsim99 May 2, 2023
bd7ac99
Merge remote-tracking branch 'upstream/main'
camsim99 May 3, 2023
5c3363b
Merge remote-tracking branch 'upstream/main'
camsim99 May 10, 2023
fed9621
Undo changes
camsim99 May 10, 2023
5aabe34
Merge remote-tracking branch 'upstream/main'
camsim99 May 12, 2023
2b9a352
Merge remote-tracking branch 'upstream/main'
camsim99 May 25, 2023
a1173da
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cbc3d6b
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cae5a4c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 1, 2023
72283db
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
166a77c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
399780e
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 14, 2023
8d5d0e7
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 26, 2023
084d960
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 12, 2023
d2a59ac
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
a1422bf
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
bdd87a6
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 18, 2023
137a28b
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 19, 2023
bc0db5a
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 20, 2023
d04b466
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 21, 2023
a9cfe87
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 24, 2023
a32def1
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 2, 2023
4785148
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 14, 2023
7a8fc69
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 15, 2023
b02e15f
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 15, 2023
c6e5868
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 17, 2023
0c0065a
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 28, 2023
9dfe259
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 29, 2023
bfcc0df
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 30, 2023
b80cc86
Merge remote-tracking branch 'upstream/main'
camsim99 Sep 5, 2023
4663838
Merge remote-tracking branch 'upstream/main'
camsim99 Sep 13, 2023
33fe515
Merge remote-tracking branch 'upstream/main'
camsim99 Sep 21, 2023
0c34fb6
Merge remote-tracking branch 'upstream/main'
camsim99 Sep 26, 2023
b4b6347
Merge remote-tracking branch 'upstream/main'
camsim99 Sep 28, 2023
ea4387d
Merge remote-tracking branch 'upstream/main'
camsim99 Oct 9, 2023
5c22eb8
Merge remote-tracking branch 'upstream/main'
camsim99 Oct 10, 2023
49b4743
Merge remote-tracking branch 'upstream/main'
camsim99 Oct 24, 2023
87d1382
Merge remote-tracking branch 'upstream/main'
camsim99 Oct 25, 2023
4ba04e0
Merge remote-tracking branch 'upstream/main'
camsim99 Oct 25, 2023
dc8e8f3
Merge remote-tracking branch 'upstream/main'
camsim99 Oct 26, 2023
0493226
Change fallback strategies
camsim99 Oct 26, 2023
c4c908e
Bump version
camsim99 Oct 26, 2023
c6ea865
Update packages/camera/camera_android_camerax/CHANGELOG.md
camsim99 Oct 30, 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
5 changes: 5 additions & 0 deletions packages/camera/camera_android_camerax/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.5.0+21

* Changes fallback resolution strategies for camera use cases to look for a higher resolution if neither the desired
resolution nor any lower resolutions are available.

## 0.5.0+20

* Implements `setZoomLevel`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,8 @@ class AndroidCameraCameraX extends CameraPlatform {
/// closest lower resolution available.
ResolutionSelector? _getResolutionSelectorFromPreset(
ResolutionPreset? preset) {
const int fallbackRule = ResolutionStrategy.fallbackRuleClosestLower;
const int fallbackRule =
ResolutionStrategy.fallbackRuleClosestLowerThenHigher;

Size? boundSize;
ResolutionStrategy? resolutionStrategy;
Expand Down Expand Up @@ -937,7 +938,7 @@ class AndroidCameraCameraX extends CameraPlatform {
// We will choose the next highest video quality if the one desired
// is unavailable.
const VideoResolutionFallbackRule fallbackRule =
VideoResolutionFallbackRule.lowerQualityThan;
VideoResolutionFallbackRule.lowerQualityOrHigherThan;
final FallbackStrategy fallbackStrategy =
_shouldCreateDetachedObjectForTesting
? FallbackStrategy.detached(
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: camera_android_camerax
description: Android implementation of the camera plugin using the CameraX library.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.5.0+20
version: 0.5.0+21

environment:
sdk: ">=2.19.0 <4.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ void main() {
// resolution.
expectedResolutionStrategy ??= ResolutionStrategy.detached(
boundSize: expectedBoundSize,
fallbackRule: ResolutionStrategy.fallbackRuleClosestLower);
fallbackRule: ResolutionStrategy.fallbackRuleClosestLowerThenHigher);

expect(camera.preview!.resolutionSelector!.resolutionStrategy!.boundSize,
equals(expectedResolutionStrategy.boundSize));
Expand Down Expand Up @@ -431,7 +431,7 @@ void main() {
}

const VideoResolutionFallbackRule expectedFallbackRule =
VideoResolutionFallbackRule.lowerQualityThan;
VideoResolutionFallbackRule.lowerQualityOrHigherThan;
final FallbackStrategy expectedFallbackStrategy =
FallbackStrategy.detached(
quality: expectedVideoQuality,
Expand Down