Merge remote-tracking branch 'upstream/master' into local_auth/federation_ios

Author: BeMacized

.ci.yaml

@@ -41,6 +41,8 @@ targets:
     properties:
       add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
+      channel: master
+      version_file: flutter_master.version
       dependencies: >
         [
           {"dependency": "vs_build"}
@@ -66,6 +68,8 @@ targets:
     properties:
       add_recipes_cq: "true"
       target_file: build_all_plugins.yaml
+      channel: master
+      version_file: flutter_master.version
       dependencies: >
         [
           {"dependency": "vs_build"}
@@ -91,6 +95,8 @@ targets:
     properties:
       add_recipes_cq: "true"
       target_file: uwp_build_and_platform_tests.yaml
+      channel: master
+      version_file: flutter_master.version
       dependencies: >
         [
           {"dependency": "vs_build"}
@@ -103,6 +109,8 @@ targets:
     properties:
       add_recipes_cq: "true"
       target_file: plugin_tools_tests.yaml
+      channel: master
+      version_file: flutter_master.version
     scheduler: luci
 
   - name: Linux ci_yaml plugins roller

.clang-format

@@ -1 +1,9 @@
 BasedOnStyle: Google
+---
+Language: Cpp
+DerivePointerAlignment: false
+PointerAlignment: Left
+---
+Language: ObjC
+DerivePointerAlignment: false
+PointerAlignment: Right

packages/camera/camera/CHANGELOG.md

@@ -1,7 +1,15 @@
+## NEXT
+
+* Minor iOS internal code cleanup related to flash mode.
+
+## 0.9.4+8
+
+* Fixes a bug where ImageFormatGroup was ignored in `startImageStream` on iOS.
+
 ## 0.9.4+7
 
 * Fixes a crash in iOS when passing null queue pointer into AVFoundation API due to race condition.  
-* Minor iOS internal code cleanup.
+* Minor iOS internal code cleanup related to dispatch queue.
 
 ## 0.9.4+6
 

packages/camera/camera/example/integration_test/camera_test.dart

@@ -240,4 +240,56 @@ void main() {
     },
     skip: !Platform.isAndroid,
   );
+
+  /// Start streaming with specifying the ImageFormatGroup.
+  Future<CameraImage> startStreaming(List<CameraDescription> cameras,
+      ImageFormatGroup? imageFormatGroup) async {
+    final CameraController controller = CameraController(
+      cameras.first,
+      ResolutionPreset.low,
+      enableAudio: false,
+      imageFormatGroup: imageFormatGroup,
+    );
+
+    await controller.initialize();
+    final _completer = Completer<CameraImage>();
+
+    await controller.startImageStream((CameraImage image) {
+      if (!_completer.isCompleted) {
+        Future(() async {
+          await controller.stopImageStream();
+          await controller.dispose();
+        }).then((value) {
+          _completer.complete(image);
+        });
+      }
+    });
+    return _completer.future;
+  }
+
+  testWidgets(
+    'iOS image streaming with imageFormatGroup',
+    (WidgetTester tester) async {
+      final List<CameraDescription> cameras = await availableCameras();
+      if (cameras.isEmpty) {
+        return;
+      }
+
+      var _image = await startStreaming(cameras, null);
+      expect(_image, isNotNull);
+      expect(_image.format.group, ImageFormatGroup.bgra8888);
+      expect(_image.planes.length, 1);
+
+      _image = await startStreaming(cameras, ImageFormatGroup.yuv420);
+      expect(_image, isNotNull);
+      expect(_image.format.group, ImageFormatGroup.yuv420);
+      expect(_image.planes.length, 2);
+
+      _image = await startStreaming(cameras, ImageFormatGroup.bgra8888);
+      expect(_image, isNotNull);
+      expect(_image.format.group, ImageFormatGroup.bgra8888);
+      expect(_image.planes.length, 1);
+    },
+    skip: !Platform.isIOS,
+  );
 }

packages/camera/camera/example/ios/Runner.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		E01EE4A82799F3A5008C1950 /* QueueHelperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E01EE4A72799F3A5008C1950 /* QueueHelperTests.m */; };
 		E032F250279F5E94009E9028 /* CameraCaptureSessionQueueRaceConditionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E032F24F279F5E94009E9028 /* CameraCaptureSessionQueueRaceConditionTests.m */; };
+		E032F2A727A0BF2D009E9028 /* FLTFlashModeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E032F2A627A0BF2D009E9028 /* FLTFlashModeTests.m */; };
 		E0C6E2002770F01A00EA6AA3 /* ThreadSafeMethodChannelTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C6E1FD2770F01A00EA6AA3 /* ThreadSafeMethodChannelTests.m */; };
 		E0C6E2012770F01A00EA6AA3 /* ThreadSafeTextureRegistryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C6E1FE2770F01A00EA6AA3 /* ThreadSafeTextureRegistryTests.m */; };
 		E0C6E2022770F01A00EA6AA3 /* ThreadSafeEventChannelTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C6E1FF2770F01A00EA6AA3 /* ThreadSafeEventChannelTests.m */; };
@@ -81,6 +82,7 @@
 		A24F9E418BA48BCC7409B117 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		E01EE4A72799F3A5008C1950 /* QueueHelperTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QueueHelperTests.m; sourceTree = "<group>"; };
 		E032F24F279F5E94009E9028 /* CameraCaptureSessionQueueRaceConditionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CameraCaptureSessionQueueRaceConditionTests.m; sourceTree = "<group>"; };
+		E032F2A627A0BF2D009E9028 /* FLTFlashModeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLTFlashModeTests.m; sourceTree = "<group>"; };
 		E0C6E1FD2770F01A00EA6AA3 /* ThreadSafeMethodChannelTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThreadSafeMethodChannelTests.m; sourceTree = "<group>"; };
 		E0C6E1FE2770F01A00EA6AA3 /* ThreadSafeTextureRegistryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThreadSafeTextureRegistryTests.m; sourceTree = "<group>"; };
 		E0C6E1FF2770F01A00EA6AA3 /* ThreadSafeEventChannelTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThreadSafeEventChannelTests.m; sourceTree = "<group>"; };
@@ -125,6 +127,7 @@
 				F6EE622E2710A6FC00905E4A /* MockFLTThreadSafeFlutterResult.m */,
 				F63F9EED27143B19002479BF /* MockFLTThreadSafeFlutterResult.h */,
 				E032F24F279F5E94009E9028 /* CameraCaptureSessionQueueRaceConditionTests.m */,
+				E032F2A627A0BF2D009E9028 /* FLTFlashModeTests.m */,
 			);
 			path = RunnerTests;
 			sourceTree = "<group>";
@@ -388,6 +391,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				03F6F8B226CBB4670024B8D3 /* ThreadSafeFlutterResultTests.m in Sources */,
+				E032F2A727A0BF2D009E9028 /* FLTFlashModeTests.m in Sources */,
 				033B94BE269C40A200B4DF97 /* CameraMethodChannelTests.m in Sources */,
 				03BB766B2665316900CE5A93 /* CameraFocusTests.m in Sources */,
 				E487C86026D686A10034AC92 /* CameraPreviewPauseTests.m in Sources */,

packages/camera/camera/example/ios/Runner/main.m

@@ -6,7 +6,7 @@
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
   @autoreleasepool {
     return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
   }

packages/camera/camera/example/ios/RunnerTests/FLTFlashModeTests.m

@@ -0,0 +1,30 @@
+// 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.
+
+@import camera.Test;
+@import AVFoundation;
+#import <XCTest/XCTest.h>
+
+@interface FLTFlashModeTests : XCTestCase
+
+@end
+
+@implementation FLTFlashModeTests
+
+- (void)testFLTGetFLTFlashModeForString {
+  XCTAssertEqual(FLTFlashModeOff, FLTGetFLTFlashModeForString(@"off"));
+  XCTAssertEqual(FLTFlashModeAuto, FLTGetFLTFlashModeForString(@"auto"));
+  XCTAssertEqual(FLTFlashModeAlways, FLTGetFLTFlashModeForString(@"always"));
+  XCTAssertEqual(FLTFlashModeTorch, FLTGetFLTFlashModeForString(@"torch"));
+  XCTAssertThrows(FLTGetFLTFlashModeForString(@"unkwown"));
+}
+
+- (void)testFLTGetAVCaptureFlashModeForFLTFlashMode {
+  XCTAssertEqual(AVCaptureFlashModeOff, FLTGetAVCaptureFlashModeForFLTFlashMode(FLTFlashModeOff));
+  XCTAssertEqual(AVCaptureFlashModeAuto, FLTGetAVCaptureFlashModeForFLTFlashMode(FLTFlashModeAuto));
+  XCTAssertEqual(AVCaptureFlashModeOn, FLTGetAVCaptureFlashModeForFLTFlashMode(FLTFlashModeAlways));
+  XCTAssertEqual(-1, FLTGetAVCaptureFlashModeForFLTFlashMode(FLTFlashModeTorch));
+}
+
+@end

packages/camera/camera/example/ios/RunnerTests/ThreadSafeFlutterResultTests.m

@@ -10,9 +10,9 @@ @interface ThreadSafeFlutterResultTests : XCTestCase
 
 @implementation ThreadSafeFlutterResultTests
 - (void)testAsyncSendSuccess_ShouldCallResultOnMainThread {
-  XCTestExpectation* expectation = [self expectationWithDescription:@"Result finished"];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"Result finished"];
 
-  FLTThreadSafeFlutterResult* threadSafeFlutterResult =
+  FLTThreadSafeFlutterResult *threadSafeFlutterResult =
       [[FLTThreadSafeFlutterResult alloc] initWithResult:^(id _Nullable result) {
         XCTAssert(NSThread.isMainThread);
         [expectation fulfill];
@@ -26,9 +26,9 @@ - (void)testAsyncSendSuccess_ShouldCallResultOnMainThread {
 }
 
 - (void)testSyncSendSuccess_ShouldCallResultOnMainThread {
-  XCTestExpectation* expectation = [self expectationWithDescription:@"Result finished"];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"Result finished"];
 
-  FLTThreadSafeFlutterResult* threadSafeFlutterResult =
+  FLTThreadSafeFlutterResult *threadSafeFlutterResult =
       [[FLTThreadSafeFlutterResult alloc] initWithResult:^(id _Nullable result) {
         XCTAssert(NSThread.isMainThread);
         [expectation fulfill];
@@ -38,9 +38,9 @@ - (void)testSyncSendSuccess_ShouldCallResultOnMainThread {
 }
 
 - (void)testSendNotImplemented_ShouldSendNotImplementedToFlutterResult {
-  XCTestExpectation* expectation = [self expectationWithDescription:@"Result finished"];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"Result finished"];
 
-  FLTThreadSafeFlutterResult* threadSafeFlutterResult =
+  FLTThreadSafeFlutterResult *threadSafeFlutterResult =
       [[FLTThreadSafeFlutterResult alloc] initWithResult:^(id _Nullable result) {
         XCTAssert([result isKindOfClass:FlutterMethodNotImplemented.class]);
         [expectation fulfill];
@@ -54,15 +54,15 @@ - (void)testSendNotImplemented_ShouldSendNotImplementedToFlutterResult {
 }
 
 - (void)testSendErrorDetails_ShouldSendErrorToFlutterResult {
-  NSString* errorCode = @"errorCode";
-  NSString* errorMessage = @"message";
-  NSString* errorDetails = @"error details";
-  XCTestExpectation* expectation = [self expectationWithDescription:@"Result finished"];
+  NSString *errorCode = @"errorCode";
+  NSString *errorMessage = @"message";
+  NSString *errorDetails = @"error details";
+  XCTestExpectation *expectation = [self expectationWithDescription:@"Result finished"];
 
-  FLTThreadSafeFlutterResult* threadSafeFlutterResult =
+  FLTThreadSafeFlutterResult *threadSafeFlutterResult =
       [[FLTThreadSafeFlutterResult alloc] initWithResult:^(id _Nullable result) {
         XCTAssert([result isKindOfClass:FlutterError.class]);
-        FlutterError* error = (FlutterError*)result;
+        FlutterError *error = (FlutterError *)result;
         XCTAssertEqualObjects(error.code, errorCode);
         XCTAssertEqualObjects(error.message, errorMessage);
         XCTAssertEqualObjects(error.details, errorDetails);
@@ -77,14 +77,14 @@ - (void)testSendErrorDetails_ShouldSendErrorToFlutterResult {
 }
 
 - (void)testSendNSError_ShouldSendErrorToFlutterResult {
-  NSError* originalError = [[NSError alloc] initWithDomain:NSURLErrorDomain code:404 userInfo:nil];
-  XCTestExpectation* expectation = [self expectationWithDescription:@"Result finished"];
+  NSError *originalError = [[NSError alloc] initWithDomain:NSURLErrorDomain code:404 userInfo:nil];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"Result finished"];
 
-  FLTThreadSafeFlutterResult* threadSafeFlutterResult =
+  FLTThreadSafeFlutterResult *threadSafeFlutterResult =
       [[FLTThreadSafeFlutterResult alloc] initWithResult:^(id _Nullable result) {
         XCTAssert([result isKindOfClass:FlutterError.class]);
-        FlutterError* error = (FlutterError*)result;
-        NSString* constructedErrorCode =
+        FlutterError *error = (FlutterError *)result;
+        NSString *constructedErrorCode =
             [NSString stringWithFormat:@"Error %d", (int)originalError.code];
         XCTAssertEqualObjects(error.code, constructedErrorCode);
         [expectation fulfill];
@@ -98,10 +98,10 @@ - (void)testSendNSError_ShouldSendErrorToFlutterResult {
 }
 
 - (void)testSendResult_ShouldSendResultToFlutterResult {
-  NSString* resultData = @"resultData";
-  XCTestExpectation* expectation = [self expectationWithDescription:@"Result finished"];
+  NSString *resultData = @"resultData";
+  XCTestExpectation *expectation = [self expectationWithDescription:@"Result finished"];
 
-  FLTThreadSafeFlutterResult* threadSafeFlutterResult =
+  FLTThreadSafeFlutterResult *threadSafeFlutterResult =
       [[FLTThreadSafeFlutterResult alloc] initWithResult:^(id _Nullable result) {
         XCTAssertEqualObjects(result, resultData);
         [expectation fulfill];