[camera] MediaSettings parameter for createCameraWithSettings

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.6
+
+* Adds support to control video fps and bitrate. See `CameraController.withSettings`.
+
 ## 0.10.5+2
 
 * Fixes unawaited_futures violations.

packages/camera/camera/README.md

@@ -126,7 +126,16 @@ class _CameraAppState extends State<CameraApp> {
   @override
   void initState() {
     super.initState();
-    controller = CameraController(_cameras[0], ResolutionPreset.max);
+    controller = CameraController.withSettings(
+      _cameras[0],
+      mediaSettings: const MediaSettings(
+        resolutionPreset: ResolutionPreset.low,
+        fps: 15,
+        videoBitrate: 200000,
+        audioBitrate: 32000,
+        enableAudio: true,
+      ),
+    );
     controller.initialize().then((_) {
       if (!mounted) {
         return;

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

@@ -80,8 +80,12 @@ void main() {
         bool previousPresetExactlySupported = true;
         for (final MapEntry<ResolutionPreset, Size> preset
             in presetExpectedSizes.entries) {
-          final CameraController controller =
-              CameraController(cameraDescription, preset.key);
+          final CameraController controller = CameraController.withSettings(
+            cameraDescription,
+            mediaSettings: MediaSettings(
+              resolutionPreset: preset.key,
+            ),
+          );
           await controller.initialize();
           final bool presetExactlySupported =
               await testCaptureImageResolution(controller, preset.key);
@@ -132,8 +136,12 @@ void main() {
         bool previousPresetExactlySupported = true;
         for (final MapEntry<ResolutionPreset, Size> preset
             in presetExpectedSizes.entries) {
-          final CameraController controller =
-              CameraController(cameraDescription, preset.key);
+          final CameraController controller = CameraController.withSettings(
+            cameraDescription,
+            mediaSettings: MediaSettings(
+              resolutionPreset: preset.key,
+            ),
+          );
           await controller.initialize();
           await controller.prepareForVideoRecording();
           final bool presetExactlySupported =
@@ -155,10 +163,14 @@ void main() {
       return;
     }
 
-    final CameraController controller = CameraController(
+    final CameraController controller = CameraController.withSettings(
       cameras[0],
-      ResolutionPreset.low,
-      enableAudio: false,
+      mediaSettings: const MediaSettings(
+        resolutionPreset: ResolutionPreset.low,
+        fps: 15,
+        videoBitrate: 200000,
+        audioBitrate: 32000,
+      ),
     );
 
     await controller.initialize();
@@ -210,10 +222,14 @@ void main() {
         return;
       }
 
-      final CameraController controller = CameraController(
+      final CameraController controller = CameraController.withSettings(
         cameras[0],
-        ResolutionPreset.low,
-        enableAudio: false,
+        mediaSettings: const MediaSettings(
+          resolutionPreset: ResolutionPreset.low,
+          fps: 15,
+          videoBitrate: 200000,
+          audioBitrate: 32000,
+        ),
       );
 
       await controller.initialize();
@@ -242,10 +258,14 @@ void main() {
   /// Start streaming with specifying the ImageFormatGroup.
   Future<CameraImage> startStreaming(List<CameraDescription> cameras,
       ImageFormatGroup? imageFormatGroup) async {
-    final CameraController controller = CameraController(
+    final CameraController controller = CameraController.withSettings(
       cameras.first,
-      ResolutionPreset.low,
-      enableAudio: false,
+      mediaSettings: const MediaSettings(
+        resolutionPreset: ResolutionPreset.low,
+        fps: 15,
+        videoBitrate: 200000,
+        audioBitrate: 32000,
+      ),
       imageFormatGroup: imageFormatGroup,
     );
 

packages/camera/camera/example/lib/main.dart

@@ -637,10 +637,15 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
 
   Future<void> _initializeCameraController(
       CameraDescription cameraDescription) async {
-    final CameraController cameraController = CameraController(
+    final CameraController cameraController = CameraController.withSettings(
       cameraDescription,
-      kIsWeb ? ResolutionPreset.max : ResolutionPreset.medium,
-      enableAudio: enableAudio,
+      mediaSettings: MediaSettings(
+        resolutionPreset: ResolutionPreset.low,
+        fps: 15,
+        videoBitrate: 200000,
+        audioBitrate: 32000,
+        enableAudio: enableAudio,
+      ),
       imageFormatGroup: ImageFormatGroup.jpeg,
     );
 

packages/camera/camera/example/lib/readme_full_example.dart

@@ -30,7 +30,16 @@ class _CameraAppState extends State<CameraApp> {
   @override
   void initState() {
     super.initState();
-    controller = CameraController(_cameras[0], ResolutionPreset.max);
+    controller = CameraController.withSettings(
+      _cameras[0],
+      mediaSettings: const MediaSettings(
+        resolutionPreset: ResolutionPreset.low,
+        fps: 15,
+        videoBitrate: 200000,
+        audioBitrate: 32000,
+        enableAudio: true,
+      ),
+    );
     controller.initialize().then((_) {
       if (!mounted) {
         return;

packages/camera/camera/example/pubspec.yaml

@@ -30,3 +30,8 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {camera: {path: ../../../camera/camera}, camera_android: {path: ../../../camera/camera_android}, camera_avfoundation: {path: ../../../camera/camera_avfoundation}, camera_platform_interface: {path: ../../../camera/camera_platform_interface}, camera_web: {path: ../../../camera/camera_web}}

packages/camera/camera/lib/camera.dart

@@ -12,7 +12,8 @@ export 'package:camera_platform_interface/camera_platform_interface.dart'
         FocusMode,
         ResolutionPreset,
         XFile,
-        ImageFormatGroup;
+        ImageFormatGroup,
+        MediaSettings;
 
 export 'src/camera_controller.dart';
 export 'src/camera_image.dart';

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

@@ -232,12 +232,28 @@ class CameraValue {
 /// To show the camera preview on the screen use a [CameraPreview] widget.
 class CameraController extends ValueNotifier<CameraValue> {
   /// Creates a new camera controller in an uninitialized state.
+  ///
+  /// Deprecated. Please use [withSettings].
   CameraController(
     CameraDescription description,
-    this.resolutionPreset, {
-    this.enableAudio = true,
+    ResolutionPreset resolutionPreset, {
+    bool enableAudio = true,
+    this.imageFormatGroup,
+  })  : mediaSettings = MediaSettings(
+            resolutionPreset: resolutionPreset, enableAudio: enableAudio),
+        super(CameraValue.uninitialized(description));
+
+  /// Creates a new camera controller in an uninitialized state, using specified media settings like fps and bitrate.
+  CameraController.withSettings(
+    CameraDescription description, {
+    MediaSettings? mediaSettings,
     this.imageFormatGroup,
-  }) : super(CameraValue.uninitialized(description));
+  })  : mediaSettings = mediaSettings ??
+            const MediaSettings(
+                resolutionPreset:
+                    kIsWeb ? ResolutionPreset.max : ResolutionPreset.medium,
+                enableAudio: true),
+        super(CameraValue.uninitialized(description));
 
   /// The properties of the camera device controlled by this controller.
   CameraDescription get description => value.description;
@@ -248,10 +264,20 @@ class CameraController extends ValueNotifier<CameraValue> {
   /// if unavailable a lower resolution will be used.
   ///
   /// See also: [ResolutionPreset].
-  final ResolutionPreset resolutionPreset;
+  ResolutionPreset get resolutionPreset =>
+      mediaSettings.resolutionPreset ??
+      (kIsWeb ? ResolutionPreset.max : ResolutionPreset.medium);
 
   /// Whether to include audio when recording a video.
-  final bool enableAudio;
+  bool get enableAudio => mediaSettings.enableAudio;
+
+  /// The media settings this controller is targeting.
+  ///
+  /// This media settings are not guaranteed to be available on the device,
+  /// if unavailable a lower resolution will be used.
+  ///
+  /// See also: [MediaSettings].
+  final MediaSettings mediaSettings;
 
   /// The [ImageFormatGroup] describes the output of the raw image format.
   ///
@@ -306,10 +332,9 @@ class CameraController extends ValueNotifier<CameraValue> {
         );
       });
 
-      _cameraId = await CameraPlatform.instance.createCamera(
+      _cameraId = await CameraPlatform.instance.createCameraWithSettings(
         description,
-        resolutionPreset,
-        enableAudio: enableAudio,
+        mediaSettings,
       );
 
       _unawaited(CameraPlatform.instance
@@ -365,9 +390,10 @@ class CameraController extends ValueNotifier<CameraValue> {
 
   /// Pauses the current camera preview
   Future<void> pausePreview() async {
-    if (value.isPreviewPaused) {
+    if (value.isPreviewPaused || !value.isInitialized || _isDisposed) {
       return;
     }
+
     try {
       await CameraPlatform.instance.pausePreview(_cameraId);
       value = value.copyWith(
@@ -640,7 +666,7 @@ class CameraController extends ValueNotifier<CameraValue> {
   ///
   /// The supplied [zoom] value should be between 1.0 and the maximum supported
   /// zoom level returned by the `getMaxZoomLevel`. Throws an `CameraException`
-  /// when an illegal zoom level is suplied.
+  /// when an illegal zoom level is supplied.
   Future<void> setZoomLevel(double zoom) {
     _throwIfNotInitialized('setZoomLevel');
     try {

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

@@ -21,7 +21,7 @@ class CameraPreview extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return controller.value.isInitialized
+    return (controller.value.isInitialized && !controller.value.isPreviewPaused)
         ? ValueListenableBuilder<CameraValue>(
             valueListenable: controller,
             builder: (BuildContext context, Object? value, Widget? child) {
@@ -32,7 +32,8 @@ class CameraPreview extends StatelessWidget {
                 child: Stack(
                   fit: StackFit.expand,
                   children: <Widget>[
-                    _wrapInRotatedBox(child: controller.buildPreview()),
+                    if (!controller.value.isPreviewPaused)
+                      _wrapInRotatedBox(child: controller.buildPreview()),
                     child ?? Container(),
                   ],
                 ),

packages/camera/camera/pubspec.yaml

@@ -4,7 +4,7 @@ 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.10.5+2
+version: 0.10.6
 
 environment:
   sdk: ">=2.18.0 <4.0.0"
@@ -21,10 +21,11 @@ flutter:
         default_package: camera_web
 
 dependencies:
-  camera_android: ^0.10.7
-  camera_avfoundation: ^0.9.13
-  camera_platform_interface: ^2.5.0
-  camera_web: ^0.3.1
+  camera_android: ^0.10.8+2
+  camera_avfoundation: ^0.9.13+2
+  camera_platform_interface: ^2.5.1
+  camera_web: ^0.3.1+4
+
   flutter:
     sdk: flutter
   flutter_plugin_android_lifecycle: ^2.0.2
@@ -38,3 +39,18 @@ dev_dependencies:
   mockito: 5.4.1
   plugin_platform_interface: ^2.0.0
   video_player: ^2.0.0
+
+# TODO: for PR
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+
+  camera_android: 
+    path: ../../camera/camera_android
+  camera_avfoundation: 
+    path: ../../camera/camera_avfoundation
+  camera_platform_interface: 
+    path: ../../camera/camera_platform_interface
+  camera_web: 
+    path: ../../camera/camera_web