more cleanup of source + example

Author: camsim99

packages/camera/camera_android_camerax/example/lib/camera_controller.dart

@@ -274,16 +274,12 @@ class CameraController extends ValueNotifier<CameraValue> {
   /// Initializes the camera on the device.
   ///
   /// Throws a [CameraException] if the initialization fails.
-  Future<void> initialize(VoidCallback? callback) =>
-      _initializeWithDescription(description, callback);
+  Future<void> initialize() => _initializeWithDescription(description);
 
   /// Initializes the camera on the device with the specified description.
   ///
   /// Throws a [CameraException] if the initialization fails.
-  Future<void> _initializeWithDescription(
-    CameraDescription description,
-    VoidCallback? callback,
-  ) async {
+  Future<void> _initializeWithDescription(CameraDescription description) async {
     if (_isDisposed) {
       throw CameraException(
         'Disposed CameraController',
@@ -309,7 +305,6 @@ class CameraController extends ValueNotifier<CameraValue> {
           CameraInitializedEvent event,
         ) {
           initializeCompleter.complete(event);
-          callback?.call();
         }),
       );
 
@@ -623,7 +618,7 @@ class CameraController extends ValueNotifier<CameraValue> {
       await CameraPlatform.instance.setDescriptionWhileRecording(description);
       value = value.copyWith(description: description);
     } else {
-      await _initializeWithDescription(description, null);
+      await _initializeWithDescription(description);
     }
   }
 

packages/camera/camera_android_camerax/example/lib/camera_preview.dart

@@ -26,15 +26,13 @@ class CameraPreview extends StatelessWidget {
             valueListenable: controller,
             builder: (BuildContext context, Object? value, Widget? child) {
               return AspectRatio(
-                aspectRatio: controller.value.aspectRatio,
-                // aspectRatio: _isLandscape()
-                //     ? controller.value.aspectRatio
-                //     : (1 / controller.value.aspectRatio),
+                aspectRatio: _isLandscape()
+                    ? controller.value.aspectRatio
+                    : (1 / controller.value.aspectRatio),
                 child: Stack(
                   fit: StackFit.expand,
                   children: <Widget>[
-                    // _wrapInRotatedBox(child: controller.buildPreview()),
-                    controller.buildPreview(),
+                    _wrapInRotatedBox(child: controller.buildPreview()),
                     child ?? Container(),
                   ],
                 ),

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

@@ -628,21 +628,16 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
   }
 
   Future<void> onNewCameraSelected(CameraDescription cameraDescription) async {
-    if (controller != null && controller!.value.isRecordingVideo) {
+    if (controller != null) {
       return controller!.setDescription(cameraDescription);
+    } else {
+      return _initializeCameraController(cameraDescription);
     }
-    return _initializeCameraController(cameraDescription);
   }
 
   Future<void> _initializeCameraController(
     CameraDescription cameraDescription,
   ) async {
-    print(
-      'CAMILLE: EXAMPLE APP INITIALIZING CAMERA CONTROLLER WITH LENS DIRECTION: ${cameraDescription.lensDirection}',
-    );
-    print(
-      'CAMILLE: CONTROLLER VALUE: ${controller?.description.lensDirection}',
-    );
     final cameraController = CameraController(
       cameraDescription,
       mediaSettings: MediaSettings(
@@ -670,10 +665,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
     });
 
     try {
-      await cameraController.initialize(() {
-        print('CAMILLE: Calling set state');
-        setState(() {});
-      });
+      await cameraController.initialize();
       await Future.wait(<Future<Object?>>[
         // The exposure mode is currently not supported on the web.
         ...!kIsWeb
@@ -891,7 +883,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
     }
 
     try {
-      await cameraController.startVideoRecording(onAvailable: (_) {});
+      await cameraController.startVideoRecording();
     } on CameraException catch (e) {
       _showCameraException(e);
       return;

packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart

@@ -7,24 +7,10 @@ import 'dart:math' show Point;
 
 import 'package:async/async.dart';
 import 'package:camera_platform_interface/camera_platform_interface.dart';
-import 'package:flutter/foundation.dart' show Factory, Uint8List;
-import 'package:flutter/gestures.dart';
-import 'package:flutter/rendering.dart';
+import 'package:flutter/foundation.dart' show Uint8List;
 import 'package:flutter/services.dart'
-    show
-        AndroidViewController,
-        DeviceOrientation,
-        PlatformException,
-        PlatformViewsService,
-        StandardMessageCodec;
-import 'package:flutter/widgets.dart'
-    show
-        AndroidViewSurface,
-        PlatformViewLink,
-        TextDirection,
-        Texture,
-        Widget,
-        visibleForTesting;
+    show DeviceOrientation, PlatformException;
+import 'package:flutter/widgets.dart' show Texture, Widget, visibleForTesting;
 import 'package:stream_transform/stream_transform.dart';
 import 'camerax_library.dart';
 import 'rotated_preview_delegate.dart';
@@ -305,9 +291,6 @@ class AndroidCameraCameraX extends CameraPlatform {
   /// The configured format of outputted images from image streaming.
   int? _imageAnalysisOutputImageFormat;
 
-  // Platform view camera preview.
-  PreviewView? _previewView;
-
   /// Returns list of all available cameras and their descriptions.
   @override
   Future<List<CameraDescription>> availableCameras() async {
@@ -390,9 +373,6 @@ class AndroidCameraCameraX extends CameraPlatform {
     CameraDescription cameraDescription,
     MediaSettings? mediaSettings,
   ) async {
-    print(
-      'CAMILLE: CREATING CAMERA WITH LENS DIRECTION: ${cameraDescription.lensDirection}',
-    );
     enableRecordingAudio = mediaSettings?.enableAudio ?? false;
     final CameraPermissionsError? error = await systemServicesManager
         .requestCameraPermissions(enableRecordingAudio);
@@ -428,29 +408,16 @@ class AndroidCameraCameraX extends CameraPlatform {
 
     // Retrieve a fresh ProcessCameraProvider instance.
     processCameraProvider ??= await ProcessCameraProvider.getInstance();
-    await processCameraProvider!.unbindAll();
+    unawaited(processCameraProvider!.unbindAll());
 
     // Configure Preview instance.
-    // if (preview != null) {
-    //   await preview!.setSurfaceProvider(null);
-    // }
     preview = Preview(
       resolutionSelector: _presetResolutionSelector,
       targetFpsRange: _targetFpsRange,
     );
-    // _flutterSurfaceTextureId = await preview!.setSurfaceProvider(
-    //   systemServicesManager,
-    // );
-    if (_previewView == null) {
-      _previewView = PreviewView();
-      await _previewView!.registerPreviewView();
-    }
-
-    // TODO(camsim99): cache this value for additional speedup.
-    final SurfaceProvider surfaceProvider = await _previewView!
-        .getSurfaceProvider();
-    await preview!.setSurfaceProvider(surfaceProvider);
-    _flutterSurfaceTextureId = 3;
+    _flutterSurfaceTextureId = await preview!.setSurfaceProvider(
+      systemServicesManager,
+    );
 
     // Configure ImageCapture instance.
     imageCapture = ImageCapture(
@@ -469,9 +436,8 @@ class AndroidCameraCameraX extends CameraPlatform {
     // Retrieve info required for correcting the rotation of the camera preview
     // if necessary.
     sensorOrientationDegrees = cameraDescription.sensorOrientation.toDouble();
-    _handlesCropAndRotation = false;
-    // _handlesCropAndRotation = await preview!
-    //     .surfaceProducerHandlesCropAndRotation();
+    _handlesCropAndRotation = await preview!
+        .surfaceProducerHandlesCropAndRotation();
     _initialDeviceOrientation = _deserializeDeviceOrientation(
       await deviceOrientationManager.getUiOrientation(),
     );
@@ -519,7 +485,6 @@ class AndroidCameraCameraX extends CameraPlatform {
     // Bind configured UseCases to ProcessCameraProvider instance & mark Preview
     // instance as bound but not paused. Video capture is bound at first use
     // instead of here.
-
     camera = await processCameraProvider!.bindToLifecycle(
       cameraSelector!,
       <UseCase>[preview!, imageCapture!, imageAnalysis!],
@@ -532,11 +497,8 @@ class AndroidCameraCameraX extends CameraPlatform {
     // configured camera:
 
     // Retrieve preview resolution.
-    ResolutionInfo? previewResInfo = await preview!.getResolutionInfo();
-    print(
-      'CAMILLE: PREVIEW RESOLUTION INFO: ${previewResInfo!.resolution!.height} x ${previewResInfo!.resolution!.width}',
-    );
-    final ResolutionInfo previewResolutionInfo = previewResInfo!;
+    final ResolutionInfo previewResolutionInfo = (await preview!
+        .getResolutionInfo())!;
 
     // Mark auto-focus, auto-exposure and setting points for focus & exposure
     // as available operations as CameraX does its best across devices to
@@ -562,8 +524,7 @@ class AndroidCameraCameraX extends CameraPlatform {
   /// Releases the resources of the accessed camera with ID [cameraId].
   @override
   Future<void> dispose(int cameraId) async {
-    // await preview?.releaseSurfaceProvider();
-    await preview?.setSurfaceProvider(null);
+    await preview?.releaseSurfaceProvider();
     await liveCameraState?.removeObservers();
     await processCameraProvider?.unbindAll();
     await imageAnalysis?.clearAnalyzer();
@@ -1065,15 +1026,12 @@ class AndroidCameraCameraX extends CameraPlatform {
     await _bindUseCaseToLifecycle(preview!, cameraId);
   }
 
-  PlatformViewLink? platformView;
-
   /// Returns a widget showing a live camera preview for the camera with ID [cameraId].
   ///
   /// [createCamera] must be called before attempting to build this preview, and
   /// [cameraId] can be retrieved from that call.
   @override
   Widget buildPreview(int cameraId) {
-    print("CAMILLE: rebuilding preview!");
     if (!previewInitiallyBound) {
       // No camera has been created, and thus, the preview UseCase has not been
       // bound to the camera lifecycle, restricting this preview from being
@@ -1084,53 +1042,22 @@ class AndroidCameraCameraX extends CameraPlatform {
       );
     }
 
-    // This is used in the platform side to register the view.
-    const viewType = 'plugins.flutter.dev/camera_android_camerax';
-    // Pass parameters to the platform side.
-    const creationParams = <String, dynamic>{};
-
-    platformView ??= PlatformViewLink(
-      viewType: viewType,
-      surfaceFactory: (context, controller) {
-        return AndroidViewSurface(
-          controller: controller as AndroidViewController,
-          gestureRecognizers: const <Factory<OneSequenceGestureRecognizer>>{},
-          hitTestBehavior: PlatformViewHitTestBehavior.opaque,
+    final Stream<DeviceOrientation> deviceOrientationStream =
+        onDeviceOrientationChanged().map(
+          (DeviceOrientationChangedEvent e) => e.orientation,
         );
-      },
-      onCreatePlatformView: (params) {
-        return PlatformViewsService.initSurfaceAndroidView(
-            id: params.id,
-            viewType: viewType,
-            layoutDirection: TextDirection.ltr,
-            creationParams: creationParams,
-            creationParamsCodec: const StandardMessageCodec(),
-            onFocus: () {
-              params.onFocusChanged(true);
-            },
-          )
-          ..addOnPlatformViewCreatedListener(params.onPlatformViewCreated)
-          ..create();
-      },
+    final Widget preview = Texture(textureId: cameraId);
+
+    return RotatedPreviewDelegate(
+      handlesCropAndRotation: _handlesCropAndRotation,
+      initialDeviceOrientation: _initialDeviceOrientation,
+      initialDefaultDisplayRotation: _initialDefaultDisplayRotation,
+      deviceOrientationStream: deviceOrientationStream,
+      sensorOrientationDegrees: sensorOrientationDegrees,
+      cameraIsFrontFacing: cameraIsFrontFacing,
+      deviceOrientationManager: deviceOrientationManager,
+      child: preview,
     );
-
-    return platformView!;
-    // final Stream<DeviceOrientation> deviceOrientationStream =
-    //     onDeviceOrientationChanged().map(
-    //       (DeviceOrientationChangedEvent e) => e.orientation,
-    //     );
-    // final Widget preview = Texture(textureId: cameraId);
-
-    // return RotatedPreviewDelegate(
-    //   handlesCropAndRotation: _handlesCropAndRotation,
-    //   initialDeviceOrientation: _initialDeviceOrientation,
-    //   initialDefaultDisplayRotation: _initialDefaultDisplayRotation,
-    //   deviceOrientationStream: deviceOrientationStream,
-    //   sensorOrientationDegrees: sensorOrientationDegrees,
-    //   cameraIsFrontFacing: cameraIsFrontFacing,
-    //   deviceOrientationManager: deviceOrientationManager,
-    //   child: preview,
-    // );
   }
 
   /// Captures an image using the camera with ID [cameraId] and returns the file where it was saved.