Merge branch 'main' into develop

Author: nateshmbhat

.ci.yaml

@@ -31,7 +31,8 @@ platform_properties:
           {"dependency": "android_sdk", "version": "version:36v3"},
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"}
+          {"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"},
+          {"dependency": "ninja", "version": "version:1.9.0"}
         ]
   linux_android_legacy:
     properties:
@@ -47,7 +48,8 @@ platform_properties:
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
           {"dependency": "android_virtual_device", "version": "android_31_google_apis_x64.textpb"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
+          {"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"},
+          {"dependency": "ninja", "version": "version:1.9.0"}
         ]
   linux_desktop:
     properties:

.ci/flutter_master.version

@@ -1 +1 @@
-027f2e410241400eab2cd88dd08b2b3d9af83136
+e5d5c01850f2d33106f00a19017682f09e83e48b

.ci/scripts/prepare_tool.sh

@@ -4,8 +4,9 @@
 # found in the LICENSE file.
 set -e
 
-# To set FETCH_HEAD for "git merge-base" to work
+# Ensure that 'main' is present for diffing.
 git fetch origin main
+git branch main origin/main
 
 cd script/tool
 dart pub get

CODEOWNERS

@@ -103,11 +103,11 @@ packages/video_player/video_player_avfoundation/**            @LongCatIsLooong @
 packages/webview_flutter/webview_flutter_wkwebview/**         @louisehsu
 
 # - Linux
-packages/file_selector/file_selector_linux/**                 @stuartmorgan-g
-packages/image_picker/image_picker_linux/**                   @stuartmorgan-g
-packages/path_provider/path_provider_linux/**                 @stuartmorgan-g
-packages/shared_preferences/shared_preferences_linux/**       @stuartmorgan-g
-packages/url_launcher/url_launcher_linux/**                   @stuartmorgan-g
+packages/file_selector/file_selector_linux/**                 @robert-ancell @stuartmorgan-g
+packages/image_picker/image_picker_linux/**                   @robert-ancell @stuartmorgan-g
+packages/path_provider/path_provider_linux/**                 @robert-ancell @stuartmorgan-g
+packages/shared_preferences/shared_preferences_linux/**       @robert-ancell @stuartmorgan-g
+packages/url_launcher/url_launcher_linux/**                   @robert-ancell @stuartmorgan-g
 
 # - Windows
 packages/camera/camera_windows/**                             @stuartmorgan-g

packages/camera/camera_platform_interface/AUTHORS

@@ -65,3 +65,4 @@ Anton Borries <[email protected]>
 Alex Li <[email protected]>
 Rahul Raj <[email protected]>
 Mairramer <[email protected]>
+Rui Craveiro <[email protected]>

packages/camera/camera_platform_interface/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.12.0
+
+* Adds support for video stabilization.
+
 ## 2.11.0
 
 * Adds a flag to configure a recording to be persistent across camera changes. See

packages/camera/camera_platform_interface/lib/src/platform_interface/camera_platform.dart

@@ -281,6 +281,34 @@ abstract class CameraPlatform extends PlatformInterface {
     throw UnimplementedError('setZoomLevel() is not implemented.');
   }
 
+  /// Gets a list of video stabilization modes that are supported for the selected camera.
+  Future<Iterable<VideoStabilizationMode>> getSupportedVideoStabilizationModes(
+    int cameraId,
+  ) => Future<List<VideoStabilizationMode>>.value(<VideoStabilizationMode>[]);
+
+  /// Sets the video stabilization mode for the selected camera.
+  Future<void> setVideoStabilizationMode(
+    int cameraId,
+    VideoStabilizationMode mode,
+  ) {
+    throw UnimplementedError('setVideoStabilizationMode() is not implemented.');
+  }
+
+  /// Gets the fallback mode of video stabilization [mode].
+  ///
+  /// This method returns the video stabilization mode that [setVideoStabilizationMode]
+  /// should set when the device does not support the given [mode].
+  static VideoStabilizationMode? getFallbackVideoStabilizationMode(
+    VideoStabilizationMode mode,
+  ) {
+    return switch (mode) {
+      VideoStabilizationMode.off => null,
+      VideoStabilizationMode.level1 => VideoStabilizationMode.off,
+      VideoStabilizationMode.level2 => VideoStabilizationMode.level1,
+      VideoStabilizationMode.level3 => VideoStabilizationMode.level2,
+    };
+  }
+
   /// Pause the active preview on the current frame for the selected camera.
   Future<void> pausePreview(int cameraId) {
     throw UnimplementedError('pausePreview() is not implemented.');

packages/camera/camera_platform_interface/lib/src/types/types.dart

@@ -13,3 +13,4 @@ export 'image_format_group.dart';
 export 'media_settings.dart';
 export 'resolution_preset.dart';
 export 'video_capture_options.dart';
+export 'video_stabilization_mode.dart';

packages/camera/camera_platform_interface/lib/src/types/video_stabilization_mode.dart

@@ -0,0 +1,18 @@
+// Copyright 2013 The Flutter Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// The possible video stabilization modes that can be capturing video.
+enum VideoStabilizationMode {
+  /// Video stabilization is disabled.
+  off,
+
+  /// Least stabilized video stabilization mode with the least latency.
+  level1,
+
+  /// More stabilized video with more latency.
+  level2,
+
+  /// Most stabilized video with the most latency.
+  level3,
+}

packages/camera/camera_platform_interface/pubspec.yaml

@@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 2.11.0
+version: 2.12.0
 
 environment:
   sdk: ^3.7.0