Skip to content

[camera_avfoundation]Allow to get all available cameras on iOS, such as dual camera, triple camera. #3721

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
wants to merge 3 commits into from
Closed

[camera_avfoundation]Allow to get all available cameras on iOS, such as dual camera, triple camera. #3721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd0cda7
Allow to get all available cameras, such as dual camera, triple camera.
Kylin3216 Apr 16, 2023
e4a25de
Merge branch 'main' into kylin
Kylin3216 Apr 17, 2023
7be9e7b
fix ios tests
Kylin3216 Apr 17, 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
4 changes: 4 additions & 0 deletions packages/camera/camera_avfoundation/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.9.14

* Allow to get all available cameras, such as dual camera, triple camera.

## 0.9.13+1

* Clarifies explanation of endorsement in README.
Expand Down
29 changes: 22 additions & 7 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/AvailableCamerasTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,20 @@ - (void)testAvailableCamerasShouldReturnAllCamerasOnMultiCameraIPhone {
OCMStub([telephotoCamera uniqueID]).andReturn(@"3");
OCMStub([telephotoCamera position]).andReturn(AVCaptureDevicePositionBack);

NSMutableArray *requiredTypes =
[@[ AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera ]
mutableCopy];
NSMutableArray *requiredTypes = [@[
AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInDualCamera,
AVCaptureDeviceTypeBuiltInTelephotoCamera
] mutableCopy];
if (@available(iOS 13.0, *)) {
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInTrueDepthCamera];
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInTripleCamera];
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInDualWideCamera];
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
}
if (@available(iOS 15.4, *)) {
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInLiDARDepthCamera];
}

id discoverySessionMock = OCMClassMock([AVCaptureDeviceDiscoverySession class]);
OCMStub([discoverySessionMock discoverySessionWithDeviceTypes:requiredTypes
mediaType:AVMediaTypeVideo
Expand Down Expand Up @@ -87,11 +94,19 @@ - (void)testAvailableCamerasShouldReturnOneCameraOnSingleCameraIPhone {
OCMStub([frontFacingCamera uniqueID]).andReturn(@"1");
OCMStub([frontFacingCamera position]).andReturn(AVCaptureDevicePositionFront);

NSMutableArray *requiredTypes =
[@[ AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera ]
mutableCopy];
NSMutableArray *requiredTypes = [@[
AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInDualCamera,
AVCaptureDeviceTypeBuiltInTelephotoCamera
] mutableCopy];
if (@available(iOS 13.0, *)) {
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInTrueDepthCamera];
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInTripleCamera];
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInDualWideCamera];
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
}
if (@available(iOS 15.4, *)) {
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInLiDARDepthCamera];
}

id discoverySessionMock = OCMClassMock([AVCaptureDeviceDiscoverySession class]);
Expand Down
13 changes: 10 additions & 3 deletions packages/camera/camera_avfoundation/ios/Classes/CameraPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,19 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
- (void)handleMethodCallAsync:(FlutterMethodCall *)call
result:(FLTThreadSafeFlutterResult *)result {
if ([@"availableCameras" isEqualToString:call.method]) {
NSMutableArray *discoveryDevices =
[@[ AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera ]
mutableCopy];
NSMutableArray *discoveryDevices = [@[
AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInDualCamera,
AVCaptureDeviceTypeBuiltInTelephotoCamera
] mutableCopy];
if (@available(iOS 13.0, *)) {
[discoveryDevices addObject:AVCaptureDeviceTypeBuiltInTrueDepthCamera];
[discoveryDevices addObject:AVCaptureDeviceTypeBuiltInTripleCamera];
[discoveryDevices addObject:AVCaptureDeviceTypeBuiltInDualWideCamera];
[discoveryDevices addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
}
if (@available(iOS 15.4, *)) {
[discoveryDevices addObject:AVCaptureDeviceTypeBuiltInLiDARDepthCamera];
}
AVCaptureDeviceDiscoverySession *discoverySession = [AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:discoveryDevices
mediaType:AVMediaTypeVideo
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_avfoundation/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: camera_avfoundation
description: iOS implementation of the camera plugin.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_avfoundation
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.9.13+1
version: 0.9.14

environment:
sdk: ">=2.18.0 <4.0.0"
Expand Down