[camera] Initial iOS Pigeon conversion #6553
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
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 |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ | |
| #import "FLTThreadSafeMethodChannel.h" | ||
| #import "FLTThreadSafeTextureRegistry.h" | ||
| #import "QueueUtils.h" | ||
| #import "messages.g.h" | ||
|
|
||
| static FlutterError *FlutterErrorFromNSError(NSError *error) { | ||
| return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code] | ||
|
|
@@ -35,6 +36,7 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar { | |
| CameraPlugin *instance = [[CameraPlugin alloc] initWithRegistry:[registrar textures] | ||
| messenger:[registrar messenger]]; | ||
| [registrar addMethodCallDelegate:instance channel:channel]; | ||
| SetUpFCPCameraApi([registrar messenger], instance); | ||
| } | ||
|
|
||
| - (instancetype)initWithRegistry:(NSObject<FlutterTextureRegistry> *)registry | ||
|
|
@@ -104,8 +106,12 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result | |
| }); | ||
| } | ||
|
|
||
| - (void)availableCamerasWithCompletion: | ||
| (nonnull void (^)(NSArray<FCPPlatformCameraDescription *> *_Nullable, | ||
| FlutterError *_Nullable))completion { | ||
| // This doesn't interact with FLTCam, so can use an arbitrary thread rather than | ||
| // captureSessionQueue. It should still not be done on the main thread, however. | ||
| dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ | ||
|
||
| NSMutableArray *discoveryDevices = | ||
| [@[ AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera ] | ||
| mutableCopy]; | ||
|
|
@@ -117,29 +123,30 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)re | |
| mediaType:AVMediaTypeVideo | ||
| position:AVCaptureDevicePositionUnspecified]; | ||
| NSArray<AVCaptureDevice *> *devices = discoverySession.devices; | ||
| NSMutableArray<FCPPlatformCameraDescription *> *reply = | ||
| [[NSMutableArray alloc] initWithCapacity:devices.count]; | ||
| for (AVCaptureDevice *device in devices) { | ||
| FCPPlatformCameraLensDirection lensFacing; | ||
| switch (device.position) { | ||
| case AVCaptureDevicePositionBack: | ||
| lensFacing = FCPPlatformCameraLensDirectionBack; | ||
| break; | ||
| case AVCaptureDevicePositionFront: | ||
| lensFacing = FCPPlatformCameraLensDirectionFront; | ||
| break; | ||
| case AVCaptureDevicePositionUnspecified: | ||
| lensFacing = FCPPlatformCameraLensDirectionExternal; | ||
| break; | ||
| } | ||
| [reply addObject:[FCPPlatformCameraDescription makeWithName:device.uniqueID | ||
| lensDirection:lensFacing]]; | ||
| } | ||
| completion(reply, nil); | ||
| }); | ||
| } | ||
|
|
||
| - (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)result { | ||
| if ([@"create" isEqualToString:call.method]) { | ||
| [self handleCreateMethodCall:call result:result]; | ||
| } else if ([@"startImageStream" isEqualToString:call.method]) { | ||
| [_camera startImageStreamWithMessenger:_messenger]; | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // 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 (v18.0.0), do not edit directly. | ||
| // See also: https://pub.dev/packages/pigeon | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| @protocol FlutterBinaryMessenger; | ||
| @protocol FlutterMessageCodec; | ||
| @class FlutterError; | ||
| @class FlutterStandardTypedData; | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| typedef NS_ENUM(NSUInteger, FCPPlatformCameraLensDirection) { | ||
| /// Front facing camera (a user looking at the screen is seen by the camera). | ||
| FCPPlatformCameraLensDirectionFront = 0, | ||
| /// Back facing camera (a user looking at the screen is not seen by the camera). | ||
| FCPPlatformCameraLensDirectionBack = 1, | ||
| /// External camera which may not be mounted to the device. | ||
| FCPPlatformCameraLensDirectionExternal = 2, | ||
| }; | ||
|
|
||
| /// Wrapper for FCPPlatformCameraLensDirection to allow for nullability. | ||
| @interface FCPPlatformCameraLensDirectionBox : NSObject | ||
| @property(nonatomic, assign) FCPPlatformCameraLensDirection value; | ||
| - (instancetype)initWithValue:(FCPPlatformCameraLensDirection)value; | ||
| @end | ||
|
|
||
| @class FCPPlatformCameraDescription; | ||
|
|
||
| @interface FCPPlatformCameraDescription : NSObject | ||
| /// `init` unavailable to enforce nonnull fields, see the `make` class method. | ||
| - (instancetype)init NS_UNAVAILABLE; | ||
| + (instancetype)makeWithName:(NSString *)name | ||
| lensDirection:(FCPPlatformCameraLensDirection)lensDirection; | ||
| /// The name of the camera device. | ||
| @property(nonatomic, copy) NSString *name; | ||
| /// The direction the camera is facing. | ||
| @property(nonatomic, assign) FCPPlatformCameraLensDirection lensDirection; | ||
| @end | ||
|
|
||
| /// The codec used by FCPCameraApi. | ||
| NSObject<FlutterMessageCodec> *FCPCameraApiGetCodec(void); | ||
|
|
||
| @protocol FCPCameraApi | ||
| /// Returns the list of available cameras. | ||
| - (void)availableCamerasWithCompletion:(void (^)(NSArray<FCPPlatformCameraDescription *> *_Nullable, | ||
| 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); | ||
|
|
||
| NS_ASSUME_NONNULL_END |
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 |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| // 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 (v18.0.0), do not edit directly. | ||
| // See also: https://pub.dev/packages/pigeon | ||
|
|
||
| #import "messages.g.h" | ||
|
|
||
| #if TARGET_OS_OSX | ||
| #import <FlutterMacOS/FlutterMacOS.h> | ||
| #else | ||
| #import <Flutter/Flutter.h> | ||
| #endif | ||
|
|
||
| #if !__has_feature(objc_arc) | ||
| #error File requires ARC to be enabled. | ||
| #endif | ||
|
|
||
| static NSArray *wrapResult(id result, FlutterError *error) { | ||
| if (error) { | ||
| return @[ | ||
| error.code ?: [NSNull null], error.message ?: [NSNull null], error.details ?: [NSNull null] | ||
| ]; | ||
| } | ||
| return @[ result ?: [NSNull null] ]; | ||
| } | ||
|
|
||
| static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) { | ||
| id result = array[key]; | ||
| return (result == [NSNull null]) ? nil : result; | ||
| } | ||
|
|
||
| @implementation FCPPlatformCameraLensDirectionBox | ||
| - (instancetype)initWithValue:(FCPPlatformCameraLensDirection)value { | ||
| self = [super init]; | ||
| if (self) { | ||
| _value = value; | ||
| } | ||
| return self; | ||
| } | ||
| @end | ||
|
|
||
| @interface FCPPlatformCameraDescription () | ||
| + (FCPPlatformCameraDescription *)fromList:(NSArray *)list; | ||
| + (nullable FCPPlatformCameraDescription *)nullableFromList:(NSArray *)list; | ||
| - (NSArray *)toList; | ||
| @end | ||
|
|
||
| @implementation FCPPlatformCameraDescription | ||
| + (instancetype)makeWithName:(NSString *)name | ||
| lensDirection:(FCPPlatformCameraLensDirection)lensDirection { | ||
| FCPPlatformCameraDescription *pigeonResult = [[FCPPlatformCameraDescription alloc] init]; | ||
| pigeonResult.name = name; | ||
| pigeonResult.lensDirection = lensDirection; | ||
| return pigeonResult; | ||
| } | ||
| + (FCPPlatformCameraDescription *)fromList:(NSArray *)list { | ||
| FCPPlatformCameraDescription *pigeonResult = [[FCPPlatformCameraDescription alloc] init]; | ||
| pigeonResult.name = GetNullableObjectAtIndex(list, 0); | ||
| pigeonResult.lensDirection = [GetNullableObjectAtIndex(list, 1) integerValue]; | ||
| return pigeonResult; | ||
| } | ||
| + (nullable FCPPlatformCameraDescription *)nullableFromList:(NSArray *)list { | ||
| return (list) ? [FCPPlatformCameraDescription fromList:list] : nil; | ||
| } | ||
| - (NSArray *)toList { | ||
| return @[ | ||
| self.name ?: [NSNull null], | ||
| @(self.lensDirection), | ||
| ]; | ||
| } | ||
| @end | ||
|
|
||
| @interface FCPCameraApiCodecReader : FlutterStandardReader | ||
| @end | ||
| @implementation FCPCameraApiCodecReader | ||
| - (nullable id)readValueOfType:(UInt8)type { | ||
| switch (type) { | ||
| case 128: | ||
| return [FCPPlatformCameraDescription fromList:[self readValue]]; | ||
| default: | ||
| return [super readValueOfType:type]; | ||
| } | ||
| } | ||
| @end | ||
|
|
||
| @interface FCPCameraApiCodecWriter : FlutterStandardWriter | ||
| @end | ||
| @implementation FCPCameraApiCodecWriter | ||
| - (void)writeValue:(id)value { | ||
| if ([value isKindOfClass:[FCPPlatformCameraDescription class]]) { | ||
| [self writeByte:128]; | ||
| [self writeValue:[value toList]]; | ||
| } else { | ||
| [super writeValue:value]; | ||
| } | ||
| } | ||
| @end | ||
|
|
||
| @interface FCPCameraApiCodecReaderWriter : FlutterStandardReaderWriter | ||
| @end | ||
| @implementation FCPCameraApiCodecReaderWriter | ||
| - (FlutterStandardWriter *)writerWithData:(NSMutableData *)data { | ||
| return [[FCPCameraApiCodecWriter alloc] initWithData:data]; | ||
| } | ||
| - (FlutterStandardReader *)readerWithData:(NSData *)data { | ||
| return [[FCPCameraApiCodecReader alloc] initWithData:data]; | ||
| } | ||
| @end | ||
|
|
||
| NSObject<FlutterMessageCodec> *FCPCameraApiGetCodec(void) { | ||
| static FlutterStandardMessageCodec *sSharedObject = nil; | ||
| static dispatch_once_t sPred = 0; | ||
| dispatch_once(&sPred, ^{ | ||
| FCPCameraApiCodecReaderWriter *readerWriter = [[FCPCameraApiCodecReaderWriter alloc] init]; | ||
| sSharedObject = [FlutterStandardMessageCodec codecWithReaderWriter:readerWriter]; | ||
| }); | ||
| return sSharedObject; | ||
| } | ||
|
|
||
| void SetUpFCPCameraApi(id<FlutterBinaryMessenger> binaryMessenger, NSObject<FCPCameraApi> *api) { | ||
| SetUpFCPCameraApiWithSuffix(binaryMessenger, api, @""); | ||
| } | ||
|
|
||
| void SetUpFCPCameraApiWithSuffix(id<FlutterBinaryMessenger> binaryMessenger, | ||
| NSObject<FCPCameraApi> *api, NSString *messageChannelSuffix) { | ||
| messageChannelSuffix = messageChannelSuffix.length > 0 | ||
| ? [NSString stringWithFormat:@".%@", messageChannelSuffix] | ||
| : @""; | ||
| /// Returns the list of available cameras. | ||
| { | ||
| FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] | ||
| initWithName:[NSString stringWithFormat:@"%@%@", | ||
| @"dev.flutter.pigeon.camera_avfoundation." | ||
| @"CameraApi.getAvailableCameras", | ||
| messageChannelSuffix] | ||
| binaryMessenger:binaryMessenger | ||
| codec:FCPCameraApiGetCodec()]; | ||
| if (api) { | ||
| NSCAssert( | ||
| [api respondsToSelector:@selector(availableCamerasWithCompletion:)], | ||
| @"FCPCameraApi api (%@) doesn't respond to @selector(availableCamerasWithCompletion:)", | ||
| api); | ||
| [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { | ||
| [api availableCamerasWithCompletion:^( | ||
| NSArray<FCPPlatformCameraDescription *> *_Nullable output, | ||
| FlutterError *_Nullable error) { | ||
| callback(wrapResult(output, error)); | ||
| }]; | ||
| }]; | ||
| } else { | ||
| [channel setMessageHandler:nil]; | ||
| } | ||
| } | ||
| } |
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.
The change to the utility method allows using
waitForExpectationsWithTimeout:instead of having to list every expectation.