Merge pull request #144 from rushio-consulting/bugfix/cameraDistortion

Bugfix/camera distortion

Author: jaumard

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [3.0.1] - 30/04/2021
+
+- update deps
+- fix camera distortion
+
 ## [3.0.0] - 17/04/2021
 
 - migrate to null safety

example/lib/main_live.dart

@@ -64,19 +64,21 @@ class _MyHomePageState extends State<MyHomePage> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                ConstrainedBox(
-                  constraints: BoxConstraints(maxHeight: 250),
-                  child: Scrollbar(
-                    child: ListView(
-                      children: data.map((d) {
-                        return Container(
-                          color: Color(0xAAFFFFFF),
-                          child: Padding(
-                            padding: const EdgeInsets.all(16),
-                            child: Text(d),
-                          ),
-                        );
-                      }).toList(),
+                Expanded(
+                  child: ConstrainedBox(
+                    constraints: BoxConstraints(maxHeight: 250),
+                    child: Scrollbar(
+                      child: ListView(
+                        children: data.map((d) {
+                          return Container(
+                            color: Color(0xAAFFFFFF),
+                            child: Padding(
+                              padding: const EdgeInsets.all(16),
+                              child: Text(d),
+                            ),
+                          );
+                        }).toList(),
+                      ),
                     ),
                   ),
                 ),

example/pubspec.lock

@@ -112,7 +112,7 @@ packages:
       name: firebase_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.1.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -133,7 +133,7 @@ packages:
       name: firebase_ml_vision
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.0"
+    version: "0.12.0+1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -145,7 +145,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.0.0"
+    version: "3.0.0+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter

lib/flutter_camera_ml_vision.dart

@@ -19,7 +19,8 @@ export 'package:camera/camera.dart';
 part 'utils.dart';
 
 typedef HandleDetection<T> = Future<T> Function(FirebaseVisionImage image);
-typedef ErrorWidgetBuilder = Widget Function(BuildContext context, CameraError error);
+typedef ErrorWidgetBuilder = Widget Function(
+    BuildContext context, CameraError error);
 
 enum CameraError {
   unknown,
@@ -111,7 +112,6 @@ class CameraMlVisionState<T> extends State<CameraMlVision<T>>
       } on PlatformException catch (e) {
         debugPrint('$e');
       }
-
     }
   }
 
@@ -174,6 +174,34 @@ class CameraMlVisionState<T> extends State<CameraMlVision<T>>
     return image;
   }
 
+  Future<void> flash(FlashMode mode) async {
+    await _cameraController!.setFlashMode(mode);
+  }
+
+  Future<void> focus(FocusMode mode) async {
+    await _cameraController!.setFocusMode(mode);
+  }
+
+  Future<void> focusPoint(Offset point) async {
+    await _cameraController!.setFocusPoint(point);
+  }
+
+  Future<void> zoom(double zoom) async {
+    await _cameraController!.setZoomLevel(zoom);
+  }
+
+  Future<void> exposure(ExposureMode mode) async {
+    await _cameraController!.setExposureMode(mode);
+  }
+
+  Future<void> exposureOffset(double offset) async {
+    await _cameraController!.setExposureOffset(offset);
+  }
+
+  Future<void> exposurePoint(Offset offset) async {
+    await _cameraController!.setExposurePoint(offset);
+  }
+
   Future<void> _initialize() async {
     if (Platform.isAndroid) {
       final deviceInfo = DeviceInfoPlugin();
@@ -267,22 +295,25 @@ class CameraMlVisionState<T> extends State<CameraMlVision<T>>
           : widget.errorBuilder!(context, _cameraError);
     }
 
-    Widget cameraPreview = AspectRatio(
-      aspectRatio: _cameraController!.value.isInitialized ? _cameraController!
-          .value.aspectRatio : 1,
-      child: _isStreaming
-          ? CameraPreview(
-        _cameraController!,
-      )
-          : _getPicture(),
-    );
+    var cameraPreview = _isStreaming
+        ? CameraPreview(
+            _cameraController!,
+          )
+        : _getPicture();
 
     if (widget.overlayBuilder != null) {
       cameraPreview = Stack(
         fit: StackFit.passthrough,
         children: [
           cameraPreview,
-          widget.overlayBuilder!(context),
+          (cameraController?.value.isInitialized ?? false)
+              ? AspectRatio(
+                  aspectRatio: _isLandscape()
+                      ? cameraController!.value.aspectRatio
+                      : (1 / cameraController!.value.aspectRatio),
+                  child: widget.overlayBuilder!(context),
+                )
+              : Container(),
         ],
       );
     }
@@ -299,25 +330,28 @@ class CameraMlVisionState<T> extends State<CameraMlVision<T>>
         }
       },
       key: _visibilityKey,
-      child: FittedBox(
-        alignment: Alignment.center,
-        fit: BoxFit.cover,
-        child: SizedBox(
-          width: _cameraController!.value.previewSize!.height *
-              _cameraController!.value.aspectRatio,
-          height: _cameraController!.value.previewSize!.height,
-          child: cameraPreview,
-        ),
-      ),
+      child: cameraPreview,
     );
   }
 
+  DeviceOrientation? _getApplicableOrientation() {
+    return (cameraController?.value.isRecordingVideo ?? false)
+        ? cameraController?.value.recordingOrientation
+        : (cameraController?.value.lockedCaptureOrientation ??
+            cameraController?.value.deviceOrientation);
+  }
+
+  bool _isLandscape() {
+    return [DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]
+        .contains(_getApplicableOrientation());
+  }
+
   void _processImage(CameraImage cameraImage) async {
     if (!_alreadyCheckingImage && mounted) {
       _alreadyCheckingImage = true;
       try {
         final results =
-        await _detect<T>(cameraImage, widget.detector, _rotation!);
+            await _detect<T>(cameraImage, widget.detector, _rotation!);
         widget.onResult(results);
       } catch (ex, stack) {
         debugPrint('$ex, $stack');

pubspec.lock

@@ -51,7 +51,7 @@ packages:
     source: hosted
     version: "1.1.0"
   collection:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: collection
       url: "https://pub.dartlang.org"
@@ -105,7 +105,7 @@ packages:
       name: firebase_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.1.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -126,7 +126,7 @@ packages:
       name: firebase_ml_vision
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.0"
+    version: "0.12.0+1"
   flutter:
     dependency: "direct main"
     description: flutter

pubspec.yaml

@@ -1,29 +1,26 @@
 name: flutter_camera_ml_vision
 description: A flutter widget that show the camera stream and allow ML vision recognition on it, it allow you to detect barcodes, labels, text, faces...
-version: 3.0.0
-authors:
-  - Jimmy Aumard <jimmy.aumard@gmail.com>
-  - Rushio Consulting <dev@rushio-consulting.fr>
+version: 3.0.1
 repository: https://github.com/rushio-consulting/flutter_camera_ml_vision
-homepage: https://rushio-consulting.fr
+homepage: https://github.com/rushio-consulting/flutter_camera_ml_vision
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
-  firebase_ml_vision: ^0.12.0
+  firebase_ml_vision: ^0.12.0+1
     #git:
     #  url: git://github.com/algirdasmac/flutterfire
     #  path: packages/firebase_ml_vision
-  firebase_core: ^1.0.3
-  #firebase_ml_vision: ^0.12.0
+  firebase_core: ^1.1.0
   visibility_detector: ^0.2.0
   path_provider: ^2.0.1
   pedantic: ^1.11.0
   device_info: ^2.0.0
   camera: ^0.8.1
+  collection: ^1.15.0
 
 dev_dependencies:
   flutter_test: