[camera_avfoundation] Add lensType to CameraDescription #9959
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,7 @@ | ||
| ## 0.9.21+4 | ||
|
|
||
| * Add lensType to CameraDescription | ||
|
|
||
| ## 0.9.21+3 | ||
|
|
||
| * Removes code for versions of iOS older than 13.0. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -585,6 +585,8 @@ class _CameraExampleHomeState extends State<CameraExampleHome> | |
| } | ||
|
|
||
| onNewCameraSelected(description); | ||
|
|
||
| showInSnackBar('Selected lens type: ${description.lensType.name}.'); | ||
| } | ||
|
|
||
| if (_cameras.isEmpty) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -157,10 +157,24 @@ extension CameraPlugin: FCPCameraApi { | |
| @unknown default: | ||
| lensFacing = .external | ||
| } | ||
| print(device.deviceType) | ||
|
There was a problem hiding this comment. This |
||
| var lensType: FCPPlatformCameraLensType | ||
|
|
||
| switch device.deviceType { | ||
| case .builtInWideAngleCamera: | ||
| lensType = .wide | ||
| case .builtInUltraWideCamera: | ||
| lensType = .ultraWide | ||
| case .builtInTelephotoCamera: | ||
| lensType = .telephoto | ||
| default: | ||
| lensType = .unknown | ||
| } | ||
|
|
||
| let cameraDescription = FCPPlatformCameraDescription.make( | ||
| withName: device.uniqueID, | ||
| lensDirection: lensFacing, | ||
| lensType: lensType | ||
| ) | ||
| reply.append(cameraDescription) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,11 @@ - (AVCaptureDevicePosition)position { | |
| return self.device.position; | ||
| } | ||
|
|
||
| // Lens type | ||
| - (AVCaptureDeviceType)deviceType { | ||
| return self.device.deviceType; | ||
| } | ||
|
|
||
| // Format/Configuration | ||
| - (NSObject<FLTCaptureDeviceFormat> *)activeFormat { | ||
| return [[FLTDefaultCaptureDeviceFormat alloc] initWithFormat:self.device.activeFormat]; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,9 @@ NS_ASSUME_NONNULL_BEGIN | |
| // Position/Orientation | ||
| @property(nonatomic, readonly) AVCaptureDevicePosition position; | ||
|
|
||
| // Device type | ||
| @property(nonatomic, readonly) AVCaptureDeviceType deviceType; | ||
|
|
||
| // Format/Configuration | ||
| @property(nonatomic, retain) NSObject<FLTCaptureDeviceFormat> *activeFormat; | ||
| @property(nonatomic, readonly) NSArray<NSObject<FLTCaptureDeviceFormat> *> *formats; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| // 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. | ||
| // Autogenerated from Pigeon (v22.7.4), do not edit directly. | ||
| // See also: https://pub.dev/packages/pigeon | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
@@ -28,6 +28,23 @@ typedef NS_ENUM(NSUInteger, FCPPlatformCameraLensDirection) { | |
| - (instancetype)initWithValue:(FCPPlatformCameraLensDirection)value; | ||
| @end | ||
|
|
||
| typedef NS_ENUM(NSUInteger, FCPPlatformCameraLensType) { | ||
| /// A built-in wide-angle camera device type. | ||
| FCPPlatformCameraLensTypeWide = 0, | ||
| /// A built-in camera device type with a longer focal length than a wide-angle camera. | ||
| FCPPlatformCameraLensTypeTelephoto = 1, | ||
| /// A built-in camera device type with a shorter focal length than a wide-angle camera. | ||
| FCPPlatformCameraLensTypeUltraWide = 2, | ||
| /// Unknown camera device type. | ||
| FCPPlatformCameraLensTypeUnknown = 3, | ||
| }; | ||
|
|
||
| /// Wrapper for FCPPlatformCameraLensType to allow for nullability. | ||
| @interface FCPPlatformCameraLensTypeBox : NSObject | ||
| @property(nonatomic, assign) FCPPlatformCameraLensType value; | ||
| - (instancetype)initWithValue:(FCPPlatformCameraLensType)value; | ||
| @end | ||
|
|
||
| typedef NS_ENUM(NSUInteger, FCPPlatformDeviceOrientation) { | ||
| FCPPlatformDeviceOrientationPortraitUp = 0, | ||
| FCPPlatformDeviceOrientationLandscapeLeft = 1, | ||
|
|
@@ -124,79 +141,79 @@ typedef NS_ENUM(NSUInteger, FCPPlatformResolutionPreset) { | |
| /// `init` unavailable to enforce nonnull fields, see the `make` class method. | ||
| - (instancetype)init NS_UNAVAILABLE; | ||
| + (instancetype)makeWithName:(NSString *)name | ||
| lensDirection:(FCPPlatformCameraLensDirection)lensDirection | ||
| lensType:(FCPPlatformCameraLensType)lensType; | ||
| /// The name of the camera device. | ||
| @property(nonatomic, copy) NSString * name; | ||
| /// The direction the camera is facing. | ||
| @property(nonatomic, assign) FCPPlatformCameraLensDirection lensDirection; | ||
| /// The type of the camera lense | ||
| @property(nonatomic, assign) FCPPlatformCameraLensType lensType; | ||
| @end | ||
|
|
||
| @interface FCPPlatformCameraState : NSObject | ||
| /// `init` unavailable to enforce nonnull fields, see the `make` class method. | ||
| - (instancetype)init NS_UNAVAILABLE; | ||
| + (instancetype)makeWithPreviewSize:(FCPPlatformSize *)previewSize | ||
| exposureMode:(FCPPlatformExposureMode)exposureMode | ||
| focusMode:(FCPPlatformFocusMode)focusMode | ||
| exposurePointSupported:(BOOL )exposurePointSupported | ||
| focusPointSupported:(BOOL )focusPointSupported; | ||
| /// The size of the preview, in pixels. | ||
| @property(nonatomic, strong) FCPPlatformSize * previewSize; | ||
| /// The default exposure mode | ||
| @property(nonatomic, assign) FCPPlatformExposureMode exposureMode; | ||
| /// The default focus mode | ||
| @property(nonatomic, assign) FCPPlatformFocusMode focusMode; | ||
| /// Whether setting exposure points is supported. | ||
| @property(nonatomic, assign) BOOL exposurePointSupported; | ||
| /// Whether setting focus points is supported. | ||
| @property(nonatomic, assign) BOOL focusPointSupported; | ||
| @end | ||
|
|
||
| @interface FCPPlatformMediaSettings : NSObject | ||
| /// `init` unavailable to enforce nonnull fields, see the `make` class method. | ||
| - (instancetype)init NS_UNAVAILABLE; | ||
| + (instancetype)makeWithResolutionPreset:(FCPPlatformResolutionPreset)resolutionPreset | ||
| framesPerSecond:(nullable NSNumber *)framesPerSecond | ||
| videoBitrate:(nullable NSNumber *)videoBitrate | ||
| audioBitrate:(nullable NSNumber *)audioBitrate | ||
| enableAudio:(BOOL )enableAudio; | ||
| @property(nonatomic, assign) FCPPlatformResolutionPreset resolutionPreset; | ||
| @property(nonatomic, strong, nullable) NSNumber * framesPerSecond; | ||
| @property(nonatomic, strong, nullable) NSNumber * videoBitrate; | ||
| @property(nonatomic, strong, nullable) NSNumber * audioBitrate; | ||
| @property(nonatomic, assign) BOOL enableAudio; | ||
| @end | ||
|
|
||
| @interface FCPPlatformPoint : NSObject | ||
| /// `init` unavailable to enforce nonnull fields, see the `make` class method. | ||
| - (instancetype)init NS_UNAVAILABLE; | ||
| + (instancetype)makeWithX:(double )x | ||
| y:(double )y; | ||
| @property(nonatomic, assign) double x; | ||
| @property(nonatomic, assign) double y; | ||
| @end | ||
|
|
||
| @interface FCPPlatformSize : NSObject | ||
| /// `init` unavailable to enforce nonnull fields, see the `make` class method. | ||
| - (instancetype)init NS_UNAVAILABLE; | ||
| + (instancetype)makeWithWidth:(double )width | ||
| height:(double )height; | ||
| @property(nonatomic, assign) double width; | ||
| @property(nonatomic, assign) double height; | ||
| @end | ||
|
|
||
| /// The codec used by all APIs. | ||
| NSObject<FlutterMessageCodec> *FCPGetMessagesCodec(void); | ||
|
|
||
| @protocol FCPCameraApi | ||
| /// Returns the list of available cameras. | ||
| - (void)availableCamerasWithCompletion:(void (^)(NSArray<FCPPlatformCameraDescription *> *_Nullable, FlutterError *_Nullable))completion; | ||
| /// Create a new camera with the given settings, and returns its ID. | ||
| - (void)createCameraWithName:(NSString *)cameraName settings:(FCPPlatformMediaSettings *)settings completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion; | ||
| /// Initializes the camera with the given ID. | ||
| - (void)initializeCamera:(NSInteger)cameraId withImageFormat:(FCPPlatformImageFormatGroup)imageFormat completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Begins streaming frames from the camera. | ||
| - (void)startImageStreamWithCompletion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Stops streaming frames from the camera. | ||
|
|
@@ -210,53 +227,44 @@ NSObject<FlutterMessageCodec> *FCPGetMessagesCodec(void); | |
| /// and any associated resources can be cleaned up. | ||
| - (void)disposeCamera:(NSInteger)cameraId completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Locks the camera capture to the current device orientation. | ||
| - (void)lockCaptureOrientation:(FCPPlatformDeviceOrientation)orientation completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Unlocks camera capture orientation, allowing it to automatically adapt to | ||
| /// device orientation. | ||
| - (void)unlockCaptureOrientationWithCompletion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Takes a picture with the current settings, and returns the path to the | ||
| /// resulting file. | ||
| - (void)takePictureWithCompletion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion; | ||
| /// Does any preprocessing necessary before beginning to record video. | ||
| - (void)prepareForVideoRecordingWithCompletion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Begins recording video, optionally enabling streaming to Dart at the same | ||
| /// time. | ||
| - (void)startVideoRecordingWithStreaming:(BOOL)enableStream completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Stops recording video, and results the path to the resulting file. | ||
| - (void)stopVideoRecordingWithCompletion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion; | ||
| /// Pauses video recording. | ||
| - (void)pauseVideoRecordingWithCompletion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Resumes a previously paused video recording. | ||
| - (void)resumeVideoRecordingWithCompletion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Switches the camera to the given flash mode. | ||
| - (void)setFlashMode:(FCPPlatformFlashMode)mode completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Switches the camera to the given exposure mode. | ||
| - (void)setExposureMode:(FCPPlatformExposureMode)mode completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Anchors auto-exposure to the given point in (0,1) coordinate space. | ||
| /// | ||
| /// A null value resets to the default exposure point. | ||
| - (void)setExposurePoint:(nullable FCPPlatformPoint *)point completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Returns the minimum exposure offset supported by the camera. | ||
| - (void)getMinimumExposureOffset:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion; | ||
| /// Returns the maximum exposure offset supported by the camera. | ||
| - (void)getMaximumExposureOffset:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion; | ||
| /// Sets the exposure offset manually to the given value. | ||
| - (void)setExposureOffset:(double)offset completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Switches the camera to the given focus mode. | ||
| - (void)setFocusMode:(FCPPlatformFocusMode)mode completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Anchors auto-focus to the given point in (0,1) coordinate space. | ||
| /// | ||
| /// A null value resets to the default focus point. | ||
| - (void)setFocusPoint:(nullable FCPPlatformPoint *)point completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Returns the minimum zoom level supported by the camera. | ||
| - (void)getMinimumZoomLevel:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion; | ||
| /// Returns the maximum zoom level supported by the camera. | ||
|
|
@@ -270,40 +278,33 @@ NSObject<FlutterMessageCodec> *FCPGetMessagesCodec(void); | |
| /// Changes the camera used while recording video. | ||
| /// | ||
| /// This should only be called while video recording is active. | ||
| - (void)updateDescriptionWhileRecordingCameraName:(NSString *)cameraName completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Sets the file format used for taking pictures. | ||
| - (void)setImageFileFormat:(FCPPlatformImageFileFormat)format completion:(void (^)(FlutterError *_Nullable))completion; | ||
| @end | ||
|
|
||
| extern void SetUpFCPCameraApi(id<FlutterBinaryMessenger> binaryMessenger, NSObject<FCPCameraApi> *_Nullable api); | ||
|
|
||
| extern void SetUpFCPCameraApiWithSuffix(id<FlutterBinaryMessenger> binaryMessenger, NSObject<FCPCameraApi> *_Nullable api, NSString *messageChannelSuffix); | ||
|
|
||
|
|
||
| /// Handler for native callbacks that are not tied to a specific camera ID. | ||
| @interface FCPCameraGlobalEventApi : NSObject | ||
| - (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)binaryMessenger; | ||
| - (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)binaryMessenger messageChannelSuffix:(nullable NSString *)messageChannelSuffix; | ||
| /// Called when the device's physical orientation changes. | ||
| - (void)deviceOrientationChangedOrientation:(FCPPlatformDeviceOrientation)orientation completion:(void (^)(FlutterError *_Nullable))completion; | ||
| @end | ||
|
|
||
|
|
||
| /// Handler for native callbacks that are tied to a specific camera ID. | ||
| /// | ||
| /// This is intended to be initialized with the camera ID as a suffix. | ||
| @interface FCPCameraEventApi : NSObject | ||
| - (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)binaryMessenger; | ||
| - (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)binaryMessenger messageChannelSuffix:(nullable NSString *)messageChannelSuffix; | ||
| /// Called when the camera is inialitized for use. | ||
| - (void)initializedWithState:(FCPPlatformCameraState *)initialState completion:(void (^)(FlutterError *_Nullable))completion; | ||
| /// Called when an error occurs in the camera. | ||
| /// | ||
| /// This should be used for errors that occur outside of the context of | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line contains a syntax error and will cause a compilation failure. It seems like an incomplete assignment. To test the
.unknownlens type mapping, you could assign a device type that is not explicitly handled in theCameraPlugin's switch statement, for example.builtInDualCamera.