Merge branch '28-oct-platform-avfoundation' of github.com:nateshmbhat/flutter_packages into 28-oct-platform-avfoundation

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:
@@ -93,7 +95,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14|Mac-15.5
+      os: Mac-15.5|Mac-15.7
       device_type: none
       cpu: arm64
       $flutter/osx_sdk : >-
@@ -106,7 +108,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14|Mac-15.5
+      os: Mac-15.5|Mac-15.7
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-

.ci/flutter_master.version

@@ -1 +1 @@
-4c910983cbfdba748d18ab6a6f97783ef040731c
+c5e809a998fe86bb4a4502d51996504279c67ec5

.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/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.11.3
+
+* Adds support to configure persistent recording on Android. See `CameraController.startVideoRecording(enablePersistentRecording)`.
+* Updates minimum supported SDK version to Flutter 3.35.0/Dart 3.9.
+
 ## 0.11.2+1
 
 * Updates examples to use the new RadioGroup API instead of deprecated Radio parameters.

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

@@ -260,7 +260,9 @@ void main() {
     return completer.future;
   }
 
-  testWidgets('Set description while recording', (WidgetTester tester) async {
+  testWidgets('Set description while recording captures full video', (
+    WidgetTester tester,
+  ) async {
     final List<CameraDescription> cameras = await availableCameras();
     if (cameras.length < 2) {
       return;
@@ -269,7 +271,6 @@ void main() {
     final CameraController controller = CameraController(
       cameras[0],
       ResolutionPreset.low,
-      enableAudio: false,
     );
 
     await controller.initialize();
@@ -278,7 +279,27 @@ void main() {
     await controller.startVideoRecording();
     await controller.setDescription(cameras[1]);
 
-    expect(controller.description, cameras[1]);
+    await tester.pumpAndSettle(const Duration(seconds: 4));
+
+    await controller.setDescription(cameras[0]);
+
+    await tester.pumpAndSettle(const Duration(seconds: 1));
+
+    final XFile file = await controller.stopVideoRecording();
+
+    final File videoFile = File(file.path);
+    final VideoPlayerController videoController = VideoPlayerController.file(
+      videoFile,
+    );
+    await videoController.initialize();
+    final int duration = videoController.value.duration.inMilliseconds;
+    await videoController.dispose();
+
+    expect(
+      duration,
+      greaterThanOrEqualTo(const Duration(seconds: 4).inMilliseconds),
+    );
+    await controller.dispose();
   });
 
   testWidgets('Set description', (WidgetTester tester) async {

packages/camera/camera/lib/src/camera_controller.dart

@@ -187,20 +187,17 @@ class CameraValue {
           exposurePointSupported ?? this.exposurePointSupported,
       focusPointSupported: focusPointSupported ?? this.focusPointSupported,
       deviceOrientation: deviceOrientation ?? this.deviceOrientation,
-      lockedCaptureOrientation:
-          lockedCaptureOrientation == null
-              ? this.lockedCaptureOrientation
-              : lockedCaptureOrientation.orNull,
-      recordingOrientation:
-          recordingOrientation == null
-              ? this.recordingOrientation
-              : recordingOrientation.orNull,
+      lockedCaptureOrientation: lockedCaptureOrientation == null
+          ? this.lockedCaptureOrientation
+          : lockedCaptureOrientation.orNull,
+      recordingOrientation: recordingOrientation == null
+          ? this.recordingOrientation
+          : recordingOrientation.orNull,
       isPreviewPaused: isPreviewPaused ?? this.isPreviewPaused,
       description: description ?? this.description,
-      previewPauseOrientation:
-          previewPauseOrientation == null
-              ? this.previewPauseOrientation
-              : previewPauseOrientation.orNull,
+      previewPauseOrientation: previewPauseOrientation == null
+          ? this.previewPauseOrientation
+          : previewPauseOrientation.orNull,
     );
   }
 
@@ -439,6 +436,10 @@ class CameraController extends ValueNotifier<CameraValue> {
 
   /// Sets the description of the camera.
   ///
+  /// On Android, you must start the recording with [startVideoRecording]
+  /// with `enablePersistentRecording` set to `true`
+  /// to avoid cancelling any active recording.
+  ///
   /// Throws a [CameraException] if setting the description fails.
   Future<void> setDescription(CameraDescription description) async {
     if (value.isRecordingVideo) {
@@ -554,8 +555,15 @@ class CameraController extends ValueNotifier<CameraValue> {
   ///
   /// The video is returned as a [XFile] after calling [stopVideoRecording].
   /// Throws a [CameraException] if the capture fails.
+  ///
+  /// `enablePersistentRecording` parameter configures the recording to be a persistent recording.
+  /// A persistent recording can only be stopped by explicitly calling [stopVideoRecording]
+  /// and will ignore events that would normally cause recording to stop,
+  /// such as lifecycle events or explicit calls to [setDescription] while recording is in progress.
+  /// Currently a no-op on platforms other than Android.
   Future<void> startVideoRecording({
     onLatestImageAvailable? onAvailable,
+    bool enablePersistentRecording = true,
   }) async {
     _throwIfNotInitialized('startVideoRecording');
     if (value.isRecordingVideo) {
@@ -574,7 +582,11 @@ class CameraController extends ValueNotifier<CameraValue> {
 
     try {
       await CameraPlatform.instance.startVideoCapturing(
-        VideoCaptureOptions(_cameraId, streamCallback: streamCallback),
+        VideoCaptureOptions(
+          _cameraId,
+          streamCallback: streamCallback,
+          enablePersistentRecording: enablePersistentRecording,
+        ),
       );
       value = value.copyWith(
         isRecordingVideo: true,

packages/camera/camera/lib/src/camera_preview.dart

@@ -23,24 +23,23 @@ class CameraPreview extends StatelessWidget {
   Widget build(BuildContext context) {
     return controller.value.isInitialized
         ? ValueListenableBuilder<CameraValue>(
-          valueListenable: controller,
-          builder: (BuildContext context, Object? value, Widget? child) {
-            return AspectRatio(
-              aspectRatio:
-                  _isLandscape()
-                      ? controller.value.aspectRatio
-                      : (1 / controller.value.aspectRatio),
-              child: Stack(
-                fit: StackFit.expand,
-                children: <Widget>[
-                  _wrapInRotatedBox(child: controller.buildPreview()),
-                  child ?? Container(),
-                ],
-              ),
-            );
-          },
-          child: child,
-        )
+            valueListenable: controller,
+            builder: (BuildContext context, Object? value, Widget? child) {
+              return AspectRatio(
+                aspectRatio: _isLandscape()
+                    ? controller.value.aspectRatio
+                    : (1 / controller.value.aspectRatio),
+                child: Stack(
+                  fit: StackFit.expand,
+                  children: <Widget>[
+                    _wrapInRotatedBox(child: controller.buildPreview()),
+                    child ?? Container(),
+                  ],
+                ),
+              );
+            },
+            child: child,
+          )
         : Container();
   }
 
@@ -73,7 +72,7 @@ class CameraPreview extends StatelessWidget {
     return controller.value.isRecordingVideo
         ? controller.value.recordingOrientation!
         : (controller.value.previewPauseOrientation ??
-            controller.value.lockedCaptureOrientation ??
-            controller.value.deviceOrientation);
+              controller.value.lockedCaptureOrientation ??
+              controller.value.deviceOrientation);
   }
 }

packages/camera/camera/pubspec.yaml

@@ -4,11 +4,11 @@ description: A Flutter plugin for controlling the camera. Supports previewing
   Dart.
 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
-version: 0.11.2+1
+version: 0.11.3
 
 environment:
-  sdk: ^3.7.0
-  flutter: ">=3.29.0"
+  sdk: ^3.9.0
+  flutter: ">=3.35.0"
 
 flutter:
   plugin:
@@ -21,9 +21,9 @@ flutter:
         default_package: camera_web
 
 dependencies:
-  camera_android_camerax: ^0.6.13
+  camera_android_camerax: ^0.6.22
   camera_avfoundation: ^0.9.18
-  camera_platform_interface: ^2.10.0
+  camera_platform_interface: ^2.11.0
   camera_web: ^0.3.3
   flutter:
     sdk: flutter

packages/camera/camera/test/camera_preview_test.dart

@@ -112,6 +112,7 @@ class FakeController extends ValueNotifier<CameraValue>
   @override
   Future<void> startVideoRecording({
     onLatestImageAvailable? onAvailable,
+    bool enablePersistentRecording = true,
   }) async {}
 
   @override