From c21de5c3dd46de47a41647409106d79b1458477a Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 25 Oct 2018 16:24:25 -0700
Subject: [PATCH 01/35] Make it possible to pass bytes

---
 .../lib/firebase_ml_vision.dart               |  1 +
 .../lib/src/barcode_detector.dart             |  4 ++-
 .../lib/src/face_detector.dart                |  4 ++-
 .../lib/src/firebase_vision.dart              | 34 ++++++++++++++++---
 .../lib/src/label_detector.dart               |  8 +++--
 .../lib/src/text_recognizer.dart              |  4 ++-
 6 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
index 8e228bb65229..e7194589acf4 100644
--- a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
+++ b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
@@ -7,6 +7,7 @@ library firebase_ml_vision;
 import 'dart:async';
 import 'dart:io';
 import 'dart:math';
+import 'dart:typed_data';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
diff --git a/packages/firebase_ml_vision/lib/src/barcode_detector.dart b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
index 8ceedbbe475a..04236c8cce48 100644
--- a/packages/firebase_ml_vision/lib/src/barcode_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
@@ -189,7 +189,9 @@ class BarcodeDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'BarcodeDetector#detectInImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
+        'type': _enumToString(visionImage._type),
+        'path': visionImage._imageFile.path,
+        'bytes': visionImage._bytes,
         'options': <String, dynamic>{
           'barcodeFormats': options.barcodeFormats.value,
         },
diff --git a/packages/firebase_ml_vision/lib/src/face_detector.dart b/packages/firebase_ml_vision/lib/src/face_detector.dart
index 560f2a7448cf..a12597dee2c0 100644
--- a/packages/firebase_ml_vision/lib/src/face_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/face_detector.dart
@@ -44,7 +44,9 @@ class FaceDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'FaceDetector#detectInImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
+        'type': _enumToString(visionImage._type),
+        'path': visionImage._imageFile.path,
+        'bytes': visionImage._bytes,
         'options': <String, dynamic>{
           'enableClassification': options.enableClassification,
           'enableLandmarks': options.enableLandmarks,
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 31bd400494b4..385e07fff1dd 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -4,6 +4,8 @@
 
 part of firebase_ml_vision;
 
+enum _FirebaseVisionImageType { file, bytes }
+
 /// The Firebase machine learning vision API.
 ///
 /// You can get an instance by calling [FirebaseVision.instance] and then get
@@ -56,22 +58,44 @@ class FirebaseVision {
 ///
 /// Create an instance by calling one of the factory constructors.
 class FirebaseVisionImage {
-  FirebaseVisionImage._(this.imageFile);
+  FirebaseVisionImage._({
+    @required _FirebaseVisionImageType type,
+    File imageFile,
+    Uint8List bytes,
+  })  : _imageFile = imageFile,
+        _bytes = bytes,
+        _type = type;
 
   /// Construct a [FirebaseVisionImage] from a file.
   factory FirebaseVisionImage.fromFile(File imageFile) {
     assert(imageFile != null);
-    return FirebaseVisionImage._(imageFile);
+    return FirebaseVisionImage._(
+      type: _FirebaseVisionImageType.file,
+      imageFile: imageFile,
+    );
   }
 
   /// Construct a [FirebaseVisionImage] from a file path.
   factory FirebaseVisionImage.fromFilePath(String imagePath) {
     assert(imagePath != null);
-    return FirebaseVisionImage._(File(imagePath));
+    return FirebaseVisionImage._(
+      type: _FirebaseVisionImageType.file,
+      imageFile: File(imagePath),
+    );
+  }
+
+  /// Construct a [FirebaseVisionImage] from a list of bytes.
+  factory FirebaseVisionImage.fromBytes(Uint8List bytes) {
+    assert(bytes != null);
+    return FirebaseVisionImage._(
+      type: _FirebaseVisionImageType.bytes,
+      bytes: bytes,
+    );
   }
 
-  /// The file location of the image.
-  final File imageFile;
+  final File _imageFile;
+  final Uint8List _bytes;
+  final _FirebaseVisionImageType _type;
 }
 
 /// Abstract class for detectors in [FirebaseVision] API.
diff --git a/packages/firebase_ml_vision/lib/src/label_detector.dart b/packages/firebase_ml_vision/lib/src/label_detector.dart
index 8511724406d0..f24d2eaa9734 100644
--- a/packages/firebase_ml_vision/lib/src/label_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/label_detector.dart
@@ -34,7 +34,9 @@ class LabelDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'LabelDetector#detectInImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
+        'type': _enumToString(visionImage._type),
+        'path': visionImage._imageFile.path,
+        'bytes': visionImage._bytes,
         'options': <String, dynamic>{
           'confidenceThreshold': options.confidenceThreshold,
         },
@@ -80,7 +82,9 @@ class CloudLabelDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'CloudLabelDetector#detectInImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
+        'type': _enumToString(visionImage._type),
+        'path': visionImage._imageFile.path,
+        'bytes': visionImage._bytes,
         'options': options._toMap(),
       },
     );
diff --git a/packages/firebase_ml_vision/lib/src/text_recognizer.dart b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
index b65aa95fec09..c2a587ed9bc8 100644
--- a/packages/firebase_ml_vision/lib/src/text_recognizer.dart
+++ b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
@@ -22,7 +22,9 @@ class TextRecognizer implements FirebaseVisionDetector {
         await FirebaseVision.channel.invokeMethod(
       'TextRecognizer#processImage',
       <String, dynamic>{
-        'path': visionImage.imageFile.path,
+        'type': _enumToString(visionImage._type),
+        'path': visionImage._imageFile.path,
+        'bytes': visionImage._bytes,
         'options': <String, dynamic>{},
       },
     );

From 671b66c3deed7e38112bfe19f89869ec87095cd4 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 25 Oct 2018 17:26:50 -0700
Subject: [PATCH 02/35] Add metadata for images

---
 .../lib/firebase_ml_vision.dart               |  1 +
 .../lib/src/barcode_detector.dart             |  5 +--
 .../lib/src/cloud_detector_options.dart       |  2 +-
 .../lib/src/face_detector.dart                |  5 +--
 .../lib/src/firebase_vision.dart              | 39 +++++++++++++++++--
 .../lib/src/label_detector.dart               | 12 ++----
 .../lib/src/text_recognizer.dart              |  5 +--
 7 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
index e7194589acf4..00f85da5bfe7 100644
--- a/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
+++ b/packages/firebase_ml_vision/lib/firebase_ml_vision.dart
@@ -8,6 +8,7 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 import 'dart:typed_data';
+import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
diff --git a/packages/firebase_ml_vision/lib/src/barcode_detector.dart b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
index 04236c8cce48..d8705aaeaad6 100644
--- a/packages/firebase_ml_vision/lib/src/barcode_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/barcode_detector.dart
@@ -189,13 +189,10 @@ class BarcodeDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'BarcodeDetector#detectInImage',
       <String, dynamic>{
-        'type': _enumToString(visionImage._type),
-        'path': visionImage._imageFile.path,
-        'bytes': visionImage._bytes,
         'options': <String, dynamic>{
           'barcodeFormats': options.barcodeFormats.value,
         },
-      },
+      }..addAll(visionImage._serialize()),
     );
 
     final List<Barcode> barcodes = <Barcode>[];
diff --git a/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart b/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart
index 4a4144ecd014..58c7c8885fe5 100644
--- a/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart
+++ b/packages/firebase_ml_vision/lib/src/cloud_detector_options.dart
@@ -29,7 +29,7 @@ class CloudDetectorOptions {
   /// The type of model to use for the detection.
   final CloudModelType modelType;
 
-  Map<String, dynamic> _toMap() => <String, dynamic>{
+  Map<String, dynamic> _serialize() => <String, dynamic>{
         'maxResults': maxResults,
         'modelType': _enumToString(modelType),
       };
diff --git a/packages/firebase_ml_vision/lib/src/face_detector.dart b/packages/firebase_ml_vision/lib/src/face_detector.dart
index a12597dee2c0..7d87377d840f 100644
--- a/packages/firebase_ml_vision/lib/src/face_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/face_detector.dart
@@ -44,9 +44,6 @@ class FaceDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'FaceDetector#detectInImage',
       <String, dynamic>{
-        'type': _enumToString(visionImage._type),
-        'path': visionImage._imageFile.path,
-        'bytes': visionImage._bytes,
         'options': <String, dynamic>{
           'enableClassification': options.enableClassification,
           'enableLandmarks': options.enableLandmarks,
@@ -54,7 +51,7 @@ class FaceDetector extends FirebaseVisionDetector {
           'minFaceSize': options.minFaceSize,
           'mode': _enumToString(options.mode),
         },
-      },
+      }..addAll(visionImage._serialize()),
     );
 
     final List<Face> faces = <Face>[];
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 385e07fff1dd..4a026d009a02 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -58,11 +58,13 @@ class FirebaseVision {
 ///
 /// Create an instance by calling one of the factory constructors.
 class FirebaseVisionImage {
-  FirebaseVisionImage._({
+  const FirebaseVisionImage._({
     @required _FirebaseVisionImageType type,
+    FirebaseVisionImageMetadata metadata,
     File imageFile,
     Uint8List bytes,
   })  : _imageFile = imageFile,
+        _metadata = metadata,
         _bytes = bytes,
         _type = type;
 
@@ -85,17 +87,48 @@ class FirebaseVisionImage {
   }
 
   /// Construct a [FirebaseVisionImage] from a list of bytes.
-  factory FirebaseVisionImage.fromBytes(Uint8List bytes) {
+  factory FirebaseVisionImage.fromBytes(
+    Uint8List bytes,
+    FirebaseVisionImageMetadata metadata,
+  ) {
     assert(bytes != null);
     return FirebaseVisionImage._(
       type: _FirebaseVisionImageType.bytes,
       bytes: bytes,
+      metadata: metadata,
     );
   }
 
-  final File _imageFile;
   final Uint8List _bytes;
+  final File _imageFile;
+  final FirebaseVisionImageMetadata _metadata;
   final _FirebaseVisionImageType _type;
+
+  Map<String, dynamic> _serialize() => <String, dynamic>{
+        'type': _enumToString(_type),
+        'bytes': _bytes,
+        'path': _imageFile?.path,
+        'metadata': _type == _FirebaseVisionImageType.bytes
+            ? _metadata._serialize()
+            : null,
+      };
+}
+
+/// Image metadata used by [FirebaseVision] detectors.
+class FirebaseVisionImageMetadata {
+  const FirebaseVisionImageMetadata({
+    @required this.size,
+    @required this.orientation,
+  });
+
+  final Size size;
+  final DeviceOrientation orientation;
+
+  Map<String, dynamic> _serialize() => <String, dynamic>{
+        'width': size.width,
+        'height': size.height,
+        'orientation': _enumToString(orientation),
+      };
 }
 
 /// Abstract class for detectors in [FirebaseVision] API.
diff --git a/packages/firebase_ml_vision/lib/src/label_detector.dart b/packages/firebase_ml_vision/lib/src/label_detector.dart
index f24d2eaa9734..9adaaae80b43 100644
--- a/packages/firebase_ml_vision/lib/src/label_detector.dart
+++ b/packages/firebase_ml_vision/lib/src/label_detector.dart
@@ -34,13 +34,10 @@ class LabelDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'LabelDetector#detectInImage',
       <String, dynamic>{
-        'type': _enumToString(visionImage._type),
-        'path': visionImage._imageFile.path,
-        'bytes': visionImage._bytes,
         'options': <String, dynamic>{
           'confidenceThreshold': options.confidenceThreshold,
         },
-      },
+      }..addAll(visionImage._serialize()),
     );
 
     final List<Label> labels = <Label>[];
@@ -82,11 +79,8 @@ class CloudLabelDetector extends FirebaseVisionDetector {
     final List<dynamic> reply = await FirebaseVision.channel.invokeMethod(
       'CloudLabelDetector#detectInImage',
       <String, dynamic>{
-        'type': _enumToString(visionImage._type),
-        'path': visionImage._imageFile.path,
-        'bytes': visionImage._bytes,
-        'options': options._toMap(),
-      },
+        'options': options._serialize(),
+      }..addAll(visionImage._serialize()),
     );
 
     final List<Label> labels = <Label>[];
diff --git a/packages/firebase_ml_vision/lib/src/text_recognizer.dart b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
index c2a587ed9bc8..3caeefa11ec3 100644
--- a/packages/firebase_ml_vision/lib/src/text_recognizer.dart
+++ b/packages/firebase_ml_vision/lib/src/text_recognizer.dart
@@ -22,11 +22,8 @@ class TextRecognizer implements FirebaseVisionDetector {
         await FirebaseVision.channel.invokeMethod(
       'TextRecognizer#processImage',
       <String, dynamic>{
-        'type': _enumToString(visionImage._type),
-        'path': visionImage._imageFile.path,
-        'bytes': visionImage._bytes,
         'options': <String, dynamic>{},
-      },
+      }..addAll(visionImage._serialize()),
     );
 
     return VisionText._(reply);

From 956d20ffc14866e760b0ef81276011b975c25e46 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 25 Oct 2018 17:32:51 -0700
Subject: [PATCH 03/35] Change tests to reflect metadata

---
 .../test/firebase_ml_vision_test.dart         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index 492abac41466..eb7b93d3daa7 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -71,7 +71,10 @@ void main() {
           isMethodCall(
             'BarcodeDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'barcodeFormats': 0xFFFF,
               },
@@ -488,7 +491,10 @@ void main() {
           isMethodCall(
             'FaceDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'enableClassification': true,
                 'enableLandmarks': true,
@@ -591,7 +597,10 @@ void main() {
           isMethodCall(
             'LabelDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'confidenceThreshold': 0.2,
               },
@@ -623,7 +632,10 @@ void main() {
           isMethodCall(
             'LabelDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'confidenceThreshold': 0.5,
               },
@@ -670,7 +682,10 @@ void main() {
           isMethodCall(
             'CloudLabelDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'maxResults': 5,
                 'modelType': 'latest',
@@ -704,7 +719,10 @@ void main() {
           isMethodCall(
             'CloudLabelDetector#detectInImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{
                 'maxResults': 10,
                 'modelType': 'stable',
@@ -936,7 +954,10 @@ void main() {
           isMethodCall(
             'TextRecognizer#processImage',
             arguments: <String, dynamic>{
+              'type': 'file',
               'path': 'empty',
+              'bytes': null,
+              'metadata': null,
               'options': <String, dynamic>{},
             },
           ),

From f1ccefa8932a42bbcbe1e326b94d8113bd7538e4 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 25 Oct 2018 18:02:01 -0700
Subject: [PATCH 04/35] Android side of byte images

---
 .../FirebaseMlVisionPlugin.java               | 56 ++++++++++++++++---
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
index 45cb19fea3c2..1062d9e7074a 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -2,6 +2,7 @@
 
 import android.net.Uri;
 import com.google.firebase.ml.vision.common.FirebaseVisionImage;
+import com.google.firebase.ml.vision.common.FirebaseVisionImageMetadata;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -33,7 +34,8 @@ public void onMethodCall(MethodCall call, Result result) {
     switch (call.method) {
       case "BarcodeDetector#detectInImage":
         try {
-          image = filePathToVisionImage((String) call.argument("path"));
+          Map<String, Object> imageData = call.arguments();
+          image = dataToVisionImage(imageData);
           BarcodeDetector.instance.handleDetection(image, options, result);
         } catch (IOException e) {
           result.error("barcodeDetectorIOError", e.getLocalizedMessage(), null);
@@ -41,7 +43,8 @@ public void onMethodCall(MethodCall call, Result result) {
         break;
       case "FaceDetector#detectInImage":
         try {
-          image = filePathToVisionImage((String) call.argument("path"));
+          Map<String, Object> imageData = call.arguments();
+          image = dataToVisionImage(imageData);
           FaceDetector.instance.handleDetection(image, options, result);
         } catch (IOException e) {
           result.error("faceDetectorIOError", e.getLocalizedMessage(), null);
@@ -49,7 +52,8 @@ public void onMethodCall(MethodCall call, Result result) {
         break;
       case "LabelDetector#detectInImage":
         try {
-          image = filePathToVisionImage((String) call.argument("path"));
+          Map<String, Object> imageData = call.arguments();
+          image = dataToVisionImage(imageData);
           LabelDetector.instance.handleDetection(image, options, result);
         } catch (IOException e) {
           result.error("labelDetectorIOError", e.getLocalizedMessage(), null);
@@ -57,7 +61,8 @@ public void onMethodCall(MethodCall call, Result result) {
         break;
       case "CloudLabelDetector#detectInImage":
         try {
-          image = filePathToVisionImage((String) call.argument("path"));
+          Map<String, Object> imageData = call.arguments();
+          image = dataToVisionImage(imageData);
           CloudLabelDetector.instance.handleDetection(image, options, result);
         } catch (IOException e) {
           result.error("cloudLabelDetectorIOError", e.getLocalizedMessage(), null);
@@ -65,7 +70,8 @@ public void onMethodCall(MethodCall call, Result result) {
         break;
       case "TextRecognizer#processImage":
         try {
-          image = filePathToVisionImage((String) call.argument("path"));
+          Map<String, Object> imageData = call.arguments();
+          image = dataToVisionImage(imageData);
           TextRecognizer.instance.handleDetection(image, options, result);
         } catch (IOException e) {
           result.error("textRecognizerIOError", e.getLocalizedMessage(), null);
@@ -76,8 +82,42 @@ public void onMethodCall(MethodCall call, Result result) {
     }
   }
 
-  private FirebaseVisionImage filePathToVisionImage(String path) throws IOException {
-    File file = new File(path);
-    return FirebaseVisionImage.fromFilePath(registrar.context(), Uri.fromFile(file));
+  private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) throws IOException {
+    String imageType = (String) imageData.get("type");
+
+    switch(imageType) {
+      case "file":
+        File file = new File((String) imageData.get("path"));
+        return FirebaseVisionImage.fromFilePath(registrar.context(), Uri.fromFile(file));
+      case "bytes":
+        @SuppressWarnings("unchecked")
+        Map<String, Object> metadataData = (Map<String, Object>) imageData.get("metadata");
+
+        FirebaseVisionImageMetadata metadata = new FirebaseVisionImageMetadata.Builder()
+            .setWidth((int) (double) metadataData.get("width"))
+            .setHeight((int) (double) metadataData.get("height"))
+            .setFormat(FirebaseVisionImageMetadata.IMAGE_FORMAT_NV21)
+            .setRotation(getRotation((String) metadataData.get("orientation")))
+            .build();
+
+        return FirebaseVisionImage.fromByteArray((byte[]) imageData.get("bytes"), metadata);
+      default:
+        throw new IllegalArgumentException(String.format("No file type for: %s", imageType));
+    }
+  }
+
+  private int getRotation(String rotation) {
+    switch(rotation) {
+      case "landscapeLeft":
+        return FirebaseVisionImageMetadata.ROTATION_90;
+      case "landscapeRight":
+        return FirebaseVisionImageMetadata.ROTATION_90;
+      case "portraitUp":
+        return FirebaseVisionImageMetadata.ROTATION_90;
+      case "portraitDown":
+        return FirebaseVisionImageMetadata.ROTATION_90;
+      default:
+        throw new IllegalArgumentException(String.format("No rotation for: %s", rotation));
+    }
   }
 }

From 09075d02af30f5c7cb40dab33038730d11963cff Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 29 Oct 2018 11:44:04 -0700
Subject: [PATCH 05/35] Change error string to image type

---
 .../plugins/firebasemlvision/FirebaseMlVisionPlugin.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
index 1062d9e7074a..a88b8e8c8ba0 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -102,7 +102,7 @@ private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) thr
 
         return FirebaseVisionImage.fromByteArray((byte[]) imageData.get("bytes"), metadata);
       default:
-        throw new IllegalArgumentException(String.format("No file type for: %s", imageType));
+        throw new IllegalArgumentException(String.format("No image type for: %s", imageType));
     }
   }
 

From 4c9c4280f754cfc4f1b49c30afe9a1ce00c5ee35 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Wed, 31 Oct 2018 15:35:57 -0700
Subject: [PATCH 06/35] Use int as rotation

---
 .../FirebaseMlVisionPlugin.java               | 20 ++++++++--------
 .../lib/src/firebase_vision.dart              | 24 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
index a88b8e8c8ba0..937a3dd0b6c7 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -97,7 +97,7 @@ private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) thr
             .setWidth((int) (double) metadataData.get("width"))
             .setHeight((int) (double) metadataData.get("height"))
             .setFormat(FirebaseVisionImageMetadata.IMAGE_FORMAT_NV21)
-            .setRotation(getRotation((String) metadataData.get("orientation")))
+            .setRotation(getRotation((int) metadataData.get("rotation")))
             .build();
 
         return FirebaseVisionImage.fromByteArray((byte[]) imageData.get("bytes"), metadata);
@@ -106,18 +106,18 @@ private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) thr
     }
   }
 
-  private int getRotation(String rotation) {
+  private int getRotation(int rotation) {
     switch(rotation) {
-      case "landscapeLeft":
-        return FirebaseVisionImageMetadata.ROTATION_90;
-      case "landscapeRight":
-        return FirebaseVisionImageMetadata.ROTATION_90;
-      case "portraitUp":
-        return FirebaseVisionImageMetadata.ROTATION_90;
-      case "portraitDown":
+      case 0:
+        return FirebaseVisionImageMetadata.ROTATION_0;
+      case 90:
         return FirebaseVisionImageMetadata.ROTATION_90;
+      case 180:
+        return FirebaseVisionImageMetadata.ROTATION_180;
+      case 270:
+        return FirebaseVisionImageMetadata.ROTATION_270;
       default:
-        throw new IllegalArgumentException(String.format("No rotation for: %s", rotation));
+        throw new IllegalArgumentException(String.format("No rotation for: %d", rotation));
     }
   }
 }
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 4a026d009a02..c25a5bb4044d 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -4,7 +4,9 @@
 
 part of firebase_ml_vision;
 
-enum _FirebaseVisionImageType { file, bytes }
+enum _ImageType { file, bytes }
+
+enum ImageRotation { rotation_0, rotation_90, rotation_180, rotation_270 }
 
 /// The Firebase machine learning vision API.
 ///
@@ -59,7 +61,7 @@ class FirebaseVision {
 /// Create an instance by calling one of the factory constructors.
 class FirebaseVisionImage {
   const FirebaseVisionImage._({
-    @required _FirebaseVisionImageType type,
+    @required _ImageType type,
     FirebaseVisionImageMetadata metadata,
     File imageFile,
     Uint8List bytes,
@@ -72,7 +74,7 @@ class FirebaseVisionImage {
   factory FirebaseVisionImage.fromFile(File imageFile) {
     assert(imageFile != null);
     return FirebaseVisionImage._(
-      type: _FirebaseVisionImageType.file,
+      type: _ImageType.file,
       imageFile: imageFile,
     );
   }
@@ -81,7 +83,7 @@ class FirebaseVisionImage {
   factory FirebaseVisionImage.fromFilePath(String imagePath) {
     assert(imagePath != null);
     return FirebaseVisionImage._(
-      type: _FirebaseVisionImageType.file,
+      type: _ImageType.file,
       imageFile: File(imagePath),
     );
   }
@@ -93,7 +95,7 @@ class FirebaseVisionImage {
   ) {
     assert(bytes != null);
     return FirebaseVisionImage._(
-      type: _FirebaseVisionImageType.bytes,
+      type: _ImageType.bytes,
       bytes: bytes,
       metadata: metadata,
     );
@@ -102,15 +104,13 @@ class FirebaseVisionImage {
   final Uint8List _bytes;
   final File _imageFile;
   final FirebaseVisionImageMetadata _metadata;
-  final _FirebaseVisionImageType _type;
+  final _ImageType _type;
 
   Map<String, dynamic> _serialize() => <String, dynamic>{
         'type': _enumToString(_type),
         'bytes': _bytes,
         'path': _imageFile?.path,
-        'metadata': _type == _FirebaseVisionImageType.bytes
-            ? _metadata._serialize()
-            : null,
+        'metadata': _type == _ImageType.bytes ? _metadata._serialize() : null,
       };
 }
 
@@ -118,16 +118,16 @@ class FirebaseVisionImage {
 class FirebaseVisionImageMetadata {
   const FirebaseVisionImageMetadata({
     @required this.size,
-    @required this.orientation,
+    @required this.rotation,
   });
 
   final Size size;
-  final DeviceOrientation orientation;
+  final ImageRotation rotation;
 
   Map<String, dynamic> _serialize() => <String, dynamic>{
         'width': size.width,
         'height': size.height,
-        'orientation': _enumToString(orientation),
+        'rotation': rotation,
       };
 }
 

From 7def42fd2026c6e268ef4af3a048074e844d609a Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Wed, 31 Oct 2018 15:50:26 -0700
Subject: [PATCH 07/35] Send int of rotation

---
 packages/firebase_ml_vision/lib/src/firebase_vision.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index c25a5bb4044d..c62390d8dbf1 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -127,7 +127,7 @@ class FirebaseVisionImageMetadata {
   Map<String, dynamic> _serialize() => <String, dynamic>{
         'width': size.width,
         'height': size.height,
-        'rotation': rotation,
+        'rotation': rotation.index * 90, // TODO(bmparr): Test for this.
       };
 }
 

From d712e4fe8e65b125489009b6b200e8436cae5f50 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Wed, 31 Oct 2018 16:12:18 -0700
Subject: [PATCH 08/35] Assertions for metadata

---
 packages/firebase_ml_vision/lib/src/firebase_vision.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index c62390d8dbf1..ca449ae5365a 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -119,7 +119,8 @@ class FirebaseVisionImageMetadata {
   const FirebaseVisionImageMetadata({
     @required this.size,
     @required this.rotation,
-  });
+  })  : assert(size != null),
+        assert(rotation != null);
 
   final Size size;
   final ImageRotation rotation;

From 35ca899d36ce5d75e404547582c4df40acfb9e5d Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 15 Nov 2018 16:31:28 -0800
Subject: [PATCH 09/35] Add ios implementation to take bytes

---
 .../ios/Classes/FirebaseMlVisionPlugin.m      | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 2b51f3d6a0ff..d64c943b82da 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -36,7 +36,7 @@ - (instancetype)init {
 }
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
-  FIRVisionImage *image = [self filePathToVisionImage:call.arguments[@"path"]];
+  FIRVisionImage *image = [self dataToVisionImage:call.arguments];
   NSDictionary *options = call.arguments[@"options"];
   if ([@"BarcodeDetector#detectInImage" isEqualToString:call.method]) {
     [BarcodeDetector handleDetection:image options:options result:result];
@@ -53,8 +53,36 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
   }
 }
 
-- (FIRVisionImage *)filePathToVisionImage:(NSString *)path {
-  UIImage *image = [UIImage imageWithContentsOfFile:path];
-  return [[FIRVisionImage alloc] initWithImage:image];
+- (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
+  NSString *imageType = imageData[@"type"];
+
+  if ([@"file" isEqualToString:imageType]) {
+    UIImage *image = [UIImage imageWithContentsOfFile:imageData[@"path"]];
+    return [[FIRVisionImage alloc] initWithImage:image];
+  } else if ([@"bytes" isEqualToString:imageType]) {
+    FlutterStandardTypedData *byteData = imageData[@"bytes"];
+    NSData *imageData = byteData.data;
+
+    CVPixelBufferRef pixelBuffer = NULL;
+    CVPixelBufferCreateWithBytes(NULL, 1080, 1920, kCVPixelFormatType_32BGRA, (void *) imageData.bytes, 4352, NULL, NULL, NULL, &pixelBuffer);
+
+    CMVideoFormatDescriptionRef description = NULL;
+    CMVideoFormatDescriptionCreateForImageBuffer(NULL, pixelBuffer, &description);
+
+    CMSampleTimingInfo timingInfo;
+    timingInfo.decodeTimeStamp = kCMTimeZero;
+    timingInfo.duration = kCMTimeInvalid;
+    timingInfo.presentationTimeStamp = kCMTimeInvalid;
+
+    CMSampleBufferRef samplebuffer = NULL;
+    CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, pixelBuffer, description, &timingInfo, &samplebuffer);
+
+    FIRVisionImage *image = [[FIRVisionImage alloc] initWithBuffer:samplebuffer];
+    return image;
+  } else {
+    // TODO(bmparr): Throw illegal argument exception
+  }
+
+  return nil;
 }
 @end

From a94fdd35c17fa05d7052470f4d8f1f9b6138b202 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 15 Nov 2018 20:12:08 -0800
Subject: [PATCH 10/35] Create UIImage for mlkit

---
 .../ios/Classes/FirebaseMlVisionPlugin.m      | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index d64c943b82da..669fec5c7e42 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -62,23 +62,8 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
   } else if ([@"bytes" isEqualToString:imageType]) {
     FlutterStandardTypedData *byteData = imageData[@"bytes"];
     NSData *imageData = byteData.data;
-
-    CVPixelBufferRef pixelBuffer = NULL;
-    CVPixelBufferCreateWithBytes(NULL, 1080, 1920, kCVPixelFormatType_32BGRA, (void *) imageData.bytes, 4352, NULL, NULL, NULL, &pixelBuffer);
-
-    CMVideoFormatDescriptionRef description = NULL;
-    CMVideoFormatDescriptionCreateForImageBuffer(NULL, pixelBuffer, &description);
-
-    CMSampleTimingInfo timingInfo;
-    timingInfo.decodeTimeStamp = kCMTimeZero;
-    timingInfo.duration = kCMTimeInvalid;
-    timingInfo.presentationTimeStamp = kCMTimeInvalid;
-
-    CMSampleBufferRef samplebuffer = NULL;
-    CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, pixelBuffer, description, &timingInfo, &samplebuffer);
-
-    FIRVisionImage *image = [[FIRVisionImage alloc] initWithBuffer:samplebuffer];
-    return image;
+    UIImage *uiImage = [[UIImage alloc] initWithData:imageData];
+    return [[FIRVisionImage alloc] initWithImage:uiImage];
   } else {
     // TODO(bmparr): Throw illegal argument exception
   }

From 26c77ae05c3947f97bde8fec917070fac736d183 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Nov 2018 14:15:20 -0800
Subject: [PATCH 11/35] fomatting

---
 .../FirebaseMlVisionPlugin.java                 | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
index 937a3dd0b6c7..90e4fdd7f4d3 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -85,7 +85,7 @@ public void onMethodCall(MethodCall call, Result result) {
   private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) throws IOException {
     String imageType = (String) imageData.get("type");
 
-    switch(imageType) {
+    switch (imageType) {
       case "file":
         File file = new File((String) imageData.get("path"));
         return FirebaseVisionImage.fromFilePath(registrar.context(), Uri.fromFile(file));
@@ -93,12 +93,13 @@ private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) thr
         @SuppressWarnings("unchecked")
         Map<String, Object> metadataData = (Map<String, Object>) imageData.get("metadata");
 
-        FirebaseVisionImageMetadata metadata = new FirebaseVisionImageMetadata.Builder()
-            .setWidth((int) (double) metadataData.get("width"))
-            .setHeight((int) (double) metadataData.get("height"))
-            .setFormat(FirebaseVisionImageMetadata.IMAGE_FORMAT_NV21)
-            .setRotation(getRotation((int) metadataData.get("rotation")))
-            .build();
+        FirebaseVisionImageMetadata metadata =
+            new FirebaseVisionImageMetadata.Builder()
+                .setWidth((int) (double) metadataData.get("width"))
+                .setHeight((int) (double) metadataData.get("height"))
+                .setFormat(FirebaseVisionImageMetadata.IMAGE_FORMAT_NV21)
+                .setRotation(getRotation((int) metadataData.get("rotation")))
+                .build();
 
         return FirebaseVisionImage.fromByteArray((byte[]) imageData.get("bytes"), metadata);
       default:
@@ -107,7 +108,7 @@ private FirebaseVisionImage dataToVisionImage(Map<String, Object> imageData) thr
   }
 
   private int getRotation(int rotation) {
-    switch(rotation) {
+    switch (rotation) {
       case 0:
         return FirebaseVisionImageMetadata.ROTATION_0;
       case 90:

From eb2c5f66f050e82c935a075fe711567b50b82ca9 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Nov 2018 14:27:42 -0800
Subject: [PATCH 12/35] Make single code place for creating image

---
 .../FirebaseMlVisionPlugin.java               | 49 ++++++-------------
 1 file changed, 14 insertions(+), 35 deletions(-)

diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
index 90e4fdd7f4d3..3ca61ee4890a 100644
--- a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
+++ b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -30,52 +30,31 @@ public static void registerWith(Registrar registrar) {
   @Override
   public void onMethodCall(MethodCall call, Result result) {
     Map<String, Object> options = call.argument("options");
+
     FirebaseVisionImage image;
+    Map<String, Object> imageData = call.arguments();
+    try {
+      image = dataToVisionImage(imageData);
+    } catch (IOException exception) {
+      result.error("MLVisionDetectorIOError", exception.getLocalizedMessage(), null);
+      return;
+    }
+
     switch (call.method) {
       case "BarcodeDetector#detectInImage":
-        try {
-          Map<String, Object> imageData = call.arguments();
-          image = dataToVisionImage(imageData);
-          BarcodeDetector.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("barcodeDetectorIOError", e.getLocalizedMessage(), null);
-        }
+        BarcodeDetector.instance.handleDetection(image, options, result);
         break;
       case "FaceDetector#detectInImage":
-        try {
-          Map<String, Object> imageData = call.arguments();
-          image = dataToVisionImage(imageData);
-          FaceDetector.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("faceDetectorIOError", e.getLocalizedMessage(), null);
-        }
+        FaceDetector.instance.handleDetection(image, options, result);
         break;
       case "LabelDetector#detectInImage":
-        try {
-          Map<String, Object> imageData = call.arguments();
-          image = dataToVisionImage(imageData);
-          LabelDetector.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("labelDetectorIOError", e.getLocalizedMessage(), null);
-        }
+        LabelDetector.instance.handleDetection(image, options, result);
         break;
       case "CloudLabelDetector#detectInImage":
-        try {
-          Map<String, Object> imageData = call.arguments();
-          image = dataToVisionImage(imageData);
-          CloudLabelDetector.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("cloudLabelDetectorIOError", e.getLocalizedMessage(), null);
-        }
+        CloudLabelDetector.instance.handleDetection(image, options, result);
         break;
       case "TextRecognizer#processImage":
-        try {
-          Map<String, Object> imageData = call.arguments();
-          image = dataToVisionImage(imageData);
-          TextRecognizer.instance.handleDetection(image, options, result);
-        } catch (IOException e) {
-          result.error("textRecognizerIOError", e.getLocalizedMessage(), null);
-        }
+        TextRecognizer.instance.handleDetection(image, options, result);
         break;
       default:
         result.notImplemented();

From 35524461a68c69f44c52814114b5c5f1c22d4404 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Nov 2018 14:40:28 -0800
Subject: [PATCH 13/35] Add error for wrong type

---
 .../ios/Classes/FirebaseMlVisionPlugin.m                 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 669fec5c7e42..32860fbdc883 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -62,12 +62,11 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
   } else if ([@"bytes" isEqualToString:imageType]) {
     FlutterStandardTypedData *byteData = imageData[@"bytes"];
     NSData *imageData = byteData.data;
-    UIImage *uiImage = [[UIImage alloc] initWithData:imageData];
-    return [[FIRVisionImage alloc] initWithImage:uiImage];
+    UIImage *image = [[UIImage alloc] initWithData:imageData];
+    return [[FIRVisionImage alloc] initWithImage:image];
   } else {
-    // TODO(bmparr): Throw illegal argument exception
+    NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
+    @throw [NSException exceptionWithName:NSInvalidArgumentException reason:errorReason userInfo:nil];
   }
-
-  return nil;
 }
 @end

From c5a2ca88cf29842563852dbbb710a6e1a6eadc89 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Nov 2018 15:44:03 -0800
Subject: [PATCH 14/35] Add ios orientation

---
 .../lib/src/firebase_vision.dart              | 44 ++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index ca449ae5365a..6224ec1c0ad0 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -6,8 +6,40 @@ part of firebase_ml_vision;
 
 enum _ImageType { file, bytes }
 
+/// Indicates the image rotation.
+///
+/// Rotation is counter-clockwise and is only used to rotate Android images.
 enum ImageRotation { rotation_0, rotation_90, rotation_180, rotation_270 }
 
+/// This enum specifies where the origin (0,0) of the image is located.
+///
+/// Only used to change orientation of iOS images.
+enum ImageOrientation {
+  /// Orientation code indicating the 0th row is the top and the 0th column is the left side.
+  topLeft,
+
+  /// Orientation code indicating the 0th row is the top and the 0th column is the right side.
+  topRight,
+
+  /// Orientation code indicating the 0th row is the bottom and the 0th column is the left side.
+  bottomLeft,
+
+  /// Orientation code indicating the 0th row is the bottom and the 0th column is the right side.
+  bottomRight,
+
+  /// Orientation code indicating the 0th row is the left side and the 0th column is the top.
+  leftTop,
+
+  /// Orientation code indicating the 0th row is the left side and the 0th column is the bottom.
+  leftBottom,
+
+  /// Orientation code indicating the 0th row is the right side and the 0th column is the top.
+  rightTop,
+
+  /// Orientation code indicating the 0th row is the right side and the 0th column is the bottom.
+  rightBottom,
+}
+
 /// The Firebase machine learning vision API.
 ///
 /// You can get an instance by calling [FirebaseVision.instance] and then get
@@ -118,17 +150,19 @@ class FirebaseVisionImage {
 class FirebaseVisionImageMetadata {
   const FirebaseVisionImageMetadata({
     @required this.size,
-    @required this.rotation,
-  })  : assert(size != null),
-        assert(rotation != null);
+    this.androidRotation = ImageRotation.rotation_0,
+    this.iosOrientation = ImageOrientation.topLeft,
+  }) : assert(size != null);
 
   final Size size;
-  final ImageRotation rotation;
+  final ImageRotation androidRotation;
+  final ImageOrientation iosOrientation;
 
   Map<String, dynamic> _serialize() => <String, dynamic>{
         'width': size.width,
         'height': size.height,
-        'rotation': rotation.index * 90, // TODO(bmparr): Test for this.
+        'rotation': androidRotation.index * 90,
+        'orientation': _enumToString(iosOrientation),
       };
 }
 

From 3671e81b6cff067b8cb80f26432fe387c0f8a258 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Nov 2018 16:23:09 -0800
Subject: [PATCH 15/35] Add TODOs and testing

---
 .../lib/src/firebase_vision.dart              |  6 ++-
 .../test/firebase_ml_vision_test.dart         | 40 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 6224ec1c0ad0..98dc0cff8592 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -102,6 +102,7 @@ class FirebaseVisionImage {
         _bytes = bytes,
         _type = type;
 
+  // TODO(bmparr): Add [ImageOrientation] when passing file.
   /// Construct a [FirebaseVisionImage] from a file.
   factory FirebaseVisionImage.fromFile(File imageFile) {
     assert(imageFile != null);
@@ -147,6 +148,9 @@ class FirebaseVisionImage {
 }
 
 /// Image metadata used by [FirebaseVision] detectors.
+///
+/// [androidRotation] defaults to [ImageRotation.rotation_0].
+/// [iosOrientation] defaults to [ImageOrientation.topLeft].
 class FirebaseVisionImageMetadata {
   const FirebaseVisionImageMetadata({
     @required this.size,
@@ -161,7 +165,7 @@ class FirebaseVisionImageMetadata {
   Map<String, dynamic> _serialize() => <String, dynamic>{
         'width': size.width,
         'height': size.height,
-        'rotation': androidRotation.index * 90,
+        'rotation': androidRotation.index * 90, // TODO(bmparr): Add testing to make sure this always works.
         'orientation': _enumToString(iosOrientation),
       };
 }
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index eb7b93d3daa7..900f60291525 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:math';
+import 'dart:typed_data';
+import 'dart:ui';
 
 import 'package:firebase_ml_vision/firebase_ml_vision.dart';
 import 'package:flutter/services.dart';
@@ -36,6 +38,44 @@ void main() {
       log.clear();
     });
 
+    group('$FirebaseVisionImageMetadata', () {
+      final TextRecognizer recognizer =
+          FirebaseVision.instance.textRecognizer();
+
+      setUp(() {
+        returnValue = <dynamic, dynamic>{
+          'text': '',
+          'blocks': <dynamic>[],
+        };
+      });
+
+      test('default serialization', () async {
+        final FirebaseVisionImageMetadata metadata =
+            const FirebaseVisionImageMetadata(size: Size(1.0, 1.0));
+        final FirebaseVisionImage image =
+            FirebaseVisionImage.fromBytes(Uint8List(0), metadata);
+        await recognizer.processImage(image);
+
+        expect(log, <Matcher>[
+          isMethodCall(
+            'TextRecognizer#processImage',
+            arguments: <String, dynamic>{
+              'type': 'bytes',
+              'path': null,
+              'bytes': Uint8List(0),
+              'metadata': <String, dynamic>{
+                'width': 1.0,
+                'height': 1.0,
+                'rotation': 0,
+                'orientation': 'topLeft',
+              },
+              'options': <String, dynamic>{},
+            },
+          ),
+        ]);
+      });
+    });
+
     group('$BarcodeDetector', () {
       BarcodeDetector detector;
       FirebaseVisionImage image;

From 724c1816e51a307aad4f9d6b000fa8f625e0e512 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Nov 2018 16:48:51 -0800
Subject: [PATCH 16/35] Remove orientation

---
 .../ios/Classes/FirebaseMlVisionPlugin.m      |  5 ++-
 .../lib/src/firebase_vision.dart              | 43 +++----------------
 .../test/firebase_ml_vision_test.dart         |  1 -
 3 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 32860fbdc883..09d0731bb062 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -61,8 +61,9 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     return [[FIRVisionImage alloc] initWithImage:image];
   } else if ([@"bytes" isEqualToString:imageType]) {
     FlutterStandardTypedData *byteData = imageData[@"bytes"];
-    NSData *imageData = byteData.data;
-    UIImage *image = [[UIImage alloc] initWithData:imageData];
+    NSData *imageBytes = byteData.data;
+    UIImage *image = [[UIImage alloc] initWithData:imageBytes];
+    // TODO(bmparr): Rotate image from imageData[@"rotation"].
     return [[FIRVisionImage alloc] initWithImage:image];
   } else {
     NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 98dc0cff8592..d5c2d842f734 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -8,38 +8,9 @@ enum _ImageType { file, bytes }
 
 /// Indicates the image rotation.
 ///
-/// Rotation is counter-clockwise and is only used to rotate Android images.
+/// Rotation is counter-clockwise.
 enum ImageRotation { rotation_0, rotation_90, rotation_180, rotation_270 }
 
-/// This enum specifies where the origin (0,0) of the image is located.
-///
-/// Only used to change orientation of iOS images.
-enum ImageOrientation {
-  /// Orientation code indicating the 0th row is the top and the 0th column is the left side.
-  topLeft,
-
-  /// Orientation code indicating the 0th row is the top and the 0th column is the right side.
-  topRight,
-
-  /// Orientation code indicating the 0th row is the bottom and the 0th column is the left side.
-  bottomLeft,
-
-  /// Orientation code indicating the 0th row is the bottom and the 0th column is the right side.
-  bottomRight,
-
-  /// Orientation code indicating the 0th row is the left side and the 0th column is the top.
-  leftTop,
-
-  /// Orientation code indicating the 0th row is the left side and the 0th column is the bottom.
-  leftBottom,
-
-  /// Orientation code indicating the 0th row is the right side and the 0th column is the top.
-  rightTop,
-
-  /// Orientation code indicating the 0th row is the right side and the 0th column is the bottom.
-  rightBottom,
-}
-
 /// The Firebase machine learning vision API.
 ///
 /// You can get an instance by calling [FirebaseVision.instance] and then get
@@ -149,24 +120,20 @@ class FirebaseVisionImage {
 
 /// Image metadata used by [FirebaseVision] detectors.
 ///
-/// [androidRotation] defaults to [ImageRotation.rotation_0].
-/// [iosOrientation] defaults to [ImageOrientation.topLeft].
+/// [rotation] defaults to [ImageRotation.rotation_0]. Only rotates on Android.
 class FirebaseVisionImageMetadata {
   const FirebaseVisionImageMetadata({
     @required this.size,
-    this.androidRotation = ImageRotation.rotation_0,
-    this.iosOrientation = ImageOrientation.topLeft,
+    this.rotation = ImageRotation.rotation_0,
   }) : assert(size != null);
 
   final Size size;
-  final ImageRotation androidRotation;
-  final ImageOrientation iosOrientation;
+  final ImageRotation rotation;
 
   Map<String, dynamic> _serialize() => <String, dynamic>{
         'width': size.width,
         'height': size.height,
-        'rotation': androidRotation.index * 90, // TODO(bmparr): Add testing to make sure this always works.
-        'orientation': _enumToString(iosOrientation),
+        'rotation': rotation.index * 90, // TODO(bmparr): Add testing to make sure this always works.
       };
 }
 
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index 900f60291525..815eb03681a8 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -67,7 +67,6 @@ void main() {
                 'width': 1.0,
                 'height': 1.0,
                 'rotation': 0,
-                'orientation': 'topLeft',
               },
               'options': <String, dynamic>{},
             },

From 31b011c84746d4f5edfb5dc690d52680efd1e11e Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Nov 2018 16:52:51 -0800
Subject: [PATCH 17/35] Image documentation

---
 packages/firebase_ml_vision/lib/src/firebase_vision.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index d5c2d842f734..4f3c8540ce32 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -93,6 +93,9 @@ class FirebaseVisionImage {
   }
 
   /// Construct a [FirebaseVisionImage] from a list of bytes.
+  ///
+  /// Expects `ImageFormat.NV21` on Android and expects `NSData` from `UIImage`
+  /// on iOS.
   factory FirebaseVisionImage.fromBytes(
     Uint8List bytes,
     FirebaseVisionImageMetadata metadata,

From 30e3e31d4c310830184d046e77408b6d8849a581 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Nov 2018 16:53:58 -0800
Subject: [PATCH 18/35] version bump

---
 packages/firebase_ml_vision/CHANGELOG.md | 4 ++++
 packages/firebase_ml_vision/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/CHANGELOG.md b/packages/firebase_ml_vision/CHANGELOG.md
index f898f817ccd6..6632c33013d0 100644
--- a/packages/firebase_ml_vision/CHANGELOG.md
+++ b/packages/firebase_ml_vision/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.1
+
+* Add capability to create image from bytes.
+
 ## 0.2.0+2
 
 * Fix bug with empty text object.
diff --git a/packages/firebase_ml_vision/pubspec.yaml b/packages/firebase_ml_vision/pubspec.yaml
index 602163ac3092..750eb254b2e4 100644
--- a/packages/firebase_ml_vision/pubspec.yaml
+++ b/packages/firebase_ml_vision/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google ML Vision for Firebase, an SDK that bring
   learning expertise to Android and iOS apps in a powerful yet easy-to-use package.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_ml_vision
-version: 0.2.0+2
+version: 0.2.1
 
 dependencies:
   flutter:

From 857b303bb827504af4771c06e6c6274a7a761d34 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Nov 2018 16:58:50 -0800
Subject: [PATCH 19/35] formatting

---
 .../firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m    | 3 ++-
 packages/firebase_ml_vision/lib/src/firebase_vision.dart       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 09d0731bb062..dcdbf95a9f92 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -67,7 +67,8 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     return [[FIRVisionImage alloc] initWithImage:image];
   } else {
     NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
-    @throw [NSException exceptionWithName:NSInvalidArgumentException reason:errorReason userInfo:nil];
+    @throw
+        [NSException exceptionWithName:NSInvalidArgumentException reason:errorReason userInfo:nil];
   }
 }
 @end
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 4f3c8540ce32..072f1a2ca176 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -136,7 +136,8 @@ class FirebaseVisionImageMetadata {
   Map<String, dynamic> _serialize() => <String, dynamic>{
         'width': size.width,
         'height': size.height,
-        'rotation': rotation.index * 90, // TODO(bmparr): Add testing to make sure this always works.
+        'rotation': rotation.index *
+            90, // TODO(bmparr): Add testing to make sure this always works.
       };
 }
 

From c5e48947fa712a1cd8cba9fe79ff76d152a9e8b9 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Sun, 18 Nov 2018 14:48:15 -0800
Subject: [PATCH 20/35] Documentation

---
 packages/firebase_ml_vision/lib/src/firebase_vision.dart | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 072f1a2ca176..3fac4092cc15 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -94,8 +94,9 @@ class FirebaseVisionImage {
 
   /// Construct a [FirebaseVisionImage] from a list of bytes.
   ///
-  /// Expects `ImageFormat.NV21` on Android and expects `NSData` from `UIImage`
-  /// on iOS.
+  /// Expects `ImageFormat.NV21` on Android and expects bytes from `NSData`
+  /// provided from a `UIImage` on iOS. (e.g. using
+  /// `UIImageJPEGRepresentation()` on the platform side).
   factory FirebaseVisionImage.fromBytes(
     Uint8List bytes,
     FirebaseVisionImageMetadata metadata,
@@ -123,7 +124,8 @@ class FirebaseVisionImage {
 
 /// Image metadata used by [FirebaseVision] detectors.
 ///
-/// [rotation] defaults to [ImageRotation.rotation_0]. Only rotates on Android.
+/// [rotation] defaults to [ImageRotation.rotation_0]. Currently only rotates on
+/// Android.
 class FirebaseVisionImageMetadata {
   const FirebaseVisionImageMetadata({
     @required this.size,

From 10e81e29da389f1589c4ea52c5a6de09bc705944 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Sun, 18 Nov 2018 14:57:38 -0800
Subject: [PATCH 21/35] Switch statement for ImageRotation

---
 .../lib/src/firebase_vision.dart               | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 3fac4092cc15..41b0a4fa0c76 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -138,8 +138,7 @@ class FirebaseVisionImageMetadata {
   Map<String, dynamic> _serialize() => <String, dynamic>{
         'width': size.width,
         'height': size.height,
-        'rotation': rotation.index *
-            90, // TODO(bmparr): Add testing to make sure this always works.
+        'rotation': _imageRotationToInt(rotation),
       };
 }
 
@@ -149,6 +148,21 @@ abstract class FirebaseVisionDetector {
   Future<dynamic> detectInImage(FirebaseVisionImage visionImage);
 }
 
+int _imageRotationToInt(ImageRotation rotation) {
+  switch(rotation) {
+    case ImageRotation.rotation_0:
+      return 0;
+    case ImageRotation.rotation_90:
+      return 90;
+    case ImageRotation.rotation_180:
+      return 180;
+    case ImageRotation.rotation_270:
+      return 270;
+    default:
+      return -1;
+  }
+}
+
 String _enumToString(dynamic enumValue) {
   final String enumString = enumValue.toString();
   return enumString.substring(enumString.indexOf('.') + 1);

From 8081a830547f0bcc2925a4f68fe51eaccf9a2849 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Sun, 18 Nov 2018 15:01:03 -0800
Subject: [PATCH 22/35] formatting

---
 packages/firebase_ml_vision/lib/src/firebase_vision.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 41b0a4fa0c76..33ecadf27b85 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -149,7 +149,7 @@ abstract class FirebaseVisionDetector {
 }
 
 int _imageRotationToInt(ImageRotation rotation) {
-  switch(rotation) {
+  switch (rotation) {
     case ImageRotation.rotation_0:
       return 0;
     case ImageRotation.rotation_90:

From b139e08502d38f7d2c8580d15712a7baa98b0c85 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 26 Nov 2018 11:21:15 -0800
Subject: [PATCH 23/35] Change default rotation to zero

---
 packages/firebase_ml_vision/lib/src/firebase_vision.dart | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 33ecadf27b85..6dea5530b70a 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -150,8 +150,6 @@ abstract class FirebaseVisionDetector {
 
 int _imageRotationToInt(ImageRotation rotation) {
   switch (rotation) {
-    case ImageRotation.rotation_0:
-      return 0;
     case ImageRotation.rotation_90:
       return 90;
     case ImageRotation.rotation_180:
@@ -159,7 +157,8 @@ int _imageRotationToInt(ImageRotation rotation) {
     case ImageRotation.rotation_270:
       return 270;
     default:
-      return -1;
+      assert(rotation == ImageRotation.rotation_0);
+      return 0;
   }
 }
 

From d4ce4a0aa3ac6a61b351da00c0d160494feee20e Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Wed, 28 Nov 2018 15:21:07 -0800
Subject: [PATCH 24/35] Take yuv format instead

---
 .../ios/Classes/FirebaseMlVisionPlugin.m      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index dcdbf95a9f92..3bf645e82d63 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -62,9 +62,30 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
   } else if ([@"bytes" isEqualToString:imageType]) {
     FlutterStandardTypedData *byteData = imageData[@"bytes"];
     NSData *imageBytes = byteData.data;
+
+    CVPixelBufferRef pxbuffer = NULL;
+    size_t widths[2] = {1080, 1080};
+    size_t heights[2] = {1920, 1920};
+    size_t bytesPerRows[2] = {1088, 1080};
+    CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, 1080, 1920, kCVPixelFormatType_420YpCbCr8BiPlanarFullRange, NULL, 4177920, 2, (void *) imageBytes.bytes, widths, heights, bytesPerRows, NULL, NULL, NULL, &pxbuffer);
+
+    CMSampleTimingInfo info;
+    info.presentationTimeStamp = kCMTimeZero;
+    info.duration = kCMTimeInvalid;
+    info.decodeTimeStamp = kCMTimeInvalid;
+
+    CMFormatDescriptionRef formatDesc = NULL;
+    CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, pxbuffer, &formatDesc);
+
+    CMSampleBufferRef sampleBuffer = NULL;
+    CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, pxbuffer, formatDesc, &info, &sampleBuffer);
+
+    return [[FIRVisionImage alloc] initWithBuffer:sampleBuffer];
+    /*
     UIImage *image = [[UIImage alloc] initWithData:imageBytes];
     // TODO(bmparr): Rotate image from imageData[@"rotation"].
     return [[FIRVisionImage alloc] initWithImage:image];
+     */
   } else {
     NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
     @throw

From 5ff266179bb00fe4861d4b6fc71c2294062e4019 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 6 Dec 2018 21:44:32 +0000
Subject: [PATCH 25/35] Add plane metadata

---
 .../lib/src/firebase_vision.dart              | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 6dea5530b70a..6554812f1162 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -122,24 +122,46 @@ class FirebaseVisionImage {
       };
 }
 
+class FirebaseVisionImagePlaneMetadata {
+  FirebaseVisionImagePlaneMetadata({this.bytesPerRow, this.height, this.width});
+
+  final int bytesPerRow;
+  final int height;
+  final int width;
+
+  Map<String, dynamic> _serialize() => <String, dynamic>{
+    'bytesPerRow': bytesPerRow,
+    'height': height,
+    'width': width,
+  };
+}
+
 /// Image metadata used by [FirebaseVision] detectors.
 ///
 /// [rotation] defaults to [ImageRotation.rotation_0]. Currently only rotates on
 /// Android.
 class FirebaseVisionImageMetadata {
   const FirebaseVisionImageMetadata({
+    @required this.rawFormat,
     @required this.size,
+    @required this.planeData,
     this.rotation = ImageRotation.rotation_0,
   }) : assert(size != null);
 
   final Size size;
   final ImageRotation rotation;
+  final dynamic rawFormat;
+  final List<FirebaseVisionImagePlaneMetadata> planeData;
 
   Map<String, dynamic> _serialize() => <String, dynamic>{
-        'width': size.width,
-        'height': size.height,
-        'rotation': _imageRotationToInt(rotation),
-      };
+    'width': size.width,
+    'height': size.height,
+    'rotation': _imageRotationToInt(rotation),
+    'rawFormat': rawFormat,
+    'planeData': planeData
+        .map((FirebaseVisionImagePlaneMetadata plane) => plane._serialize())
+        .toList(),
+  };
 }
 
 /// Abstract class for detectors in [FirebaseVision] API.

From 75b353c35e66308a2df535b880688b96fdf54634 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 6 Dec 2018 21:55:15 +0000
Subject: [PATCH 26/35] Update test

---
 .../lib/src/firebase_vision.dart              | 36 +++++++++++--------
 .../test/firebase_ml_vision_test.dart         | 20 ++++++++++-
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 6554812f1162..6d03821fb169 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -123,17 +123,23 @@ class FirebaseVisionImage {
 }
 
 class FirebaseVisionImagePlaneMetadata {
-  FirebaseVisionImagePlaneMetadata({this.bytesPerRow, this.height, this.width});
+  const FirebaseVisionImagePlaneMetadata({
+    @required this.bytesPerRow,
+    @required this.height,
+    @required this.width,
+  })  : assert(bytesPerRow != null),
+        assert(height != null),
+        assert(width != null);
 
   final int bytesPerRow;
   final int height;
   final int width;
 
   Map<String, dynamic> _serialize() => <String, dynamic>{
-    'bytesPerRow': bytesPerRow,
-    'height': height,
-    'width': width,
-  };
+        'bytesPerRow': bytesPerRow,
+        'height': height,
+        'width': width,
+      };
 }
 
 /// Image metadata used by [FirebaseVision] detectors.
@@ -146,7 +152,9 @@ class FirebaseVisionImageMetadata {
     @required this.size,
     @required this.planeData,
     this.rotation = ImageRotation.rotation_0,
-  }) : assert(size != null);
+  })  : assert(size != null),
+        assert(rawFormat != null),
+        assert(planeData != null);
 
   final Size size;
   final ImageRotation rotation;
@@ -154,14 +162,14 @@ class FirebaseVisionImageMetadata {
   final List<FirebaseVisionImagePlaneMetadata> planeData;
 
   Map<String, dynamic> _serialize() => <String, dynamic>{
-    'width': size.width,
-    'height': size.height,
-    'rotation': _imageRotationToInt(rotation),
-    'rawFormat': rawFormat,
-    'planeData': planeData
-        .map((FirebaseVisionImagePlaneMetadata plane) => plane._serialize())
-        .toList(),
-  };
+        'width': size.width,
+        'height': size.height,
+        'rotation': _imageRotationToInt(rotation),
+        'rawFormat': rawFormat,
+        'planeData': planeData
+            .map((FirebaseVisionImagePlaneMetadata plane) => plane._serialize())
+            .toList(),
+      };
 }
 
 /// Abstract class for detectors in [FirebaseVision] API.
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index 815eb03681a8..f6535ec4ad50 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -51,7 +51,17 @@ void main() {
 
       test('default serialization', () async {
         final FirebaseVisionImageMetadata metadata =
-            const FirebaseVisionImageMetadata(size: Size(1.0, 1.0));
+            const FirebaseVisionImageMetadata(
+          rawFormat: 35,
+          size: Size(1.0, 1.0),
+          planeData: <FirebaseVisionImagePlaneMetadata>[
+            FirebaseVisionImagePlaneMetadata(
+              bytesPerRow: 1000,
+              height: 480,
+              width: 480,
+            ),
+          ],
+        );
         final FirebaseVisionImage image =
             FirebaseVisionImage.fromBytes(Uint8List(0), metadata);
         await recognizer.processImage(image);
@@ -67,6 +77,14 @@ void main() {
                 'width': 1.0,
                 'height': 1.0,
                 'rotation': 0,
+                'rawFormat': 35,
+                'planeData': <dynamic>[
+                  <String, dynamic>{
+                    'bytesPerRow': 1000,
+                    'height': 480,
+                    'width': 480,
+                  },
+                ],
               },
               'options': <String, dynamic>{},
             },

From 46bf5827150847ec2a9db9ea0ac65e050cc78f1b Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 7 Dec 2018 15:58:21 +0000
Subject: [PATCH 27/35] Setup iOS side of creating buffer

---
 .../ios/Classes/FirebaseMlVisionPlugin.m      | 45 +++++++++++++++----
 .../lib/src/firebase_vision.dart              |  1 -
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 3bf645e82d63..e2652b4574b0 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -63,11 +63,43 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     FlutterStandardTypedData *byteData = imageData[@"bytes"];
     NSData *imageBytes = byteData.data;
 
+    NSDictionary *metadata = imageData[@"metadata"];
+    NSArray *planeData = metadata[@"planeData"];
+    size_t planeCount = planeData.count;
+
+    size_t widths[planeCount];
+    size_t heights[planeCount];
+    size_t bytesPerRows[planeCount];
+
+    void *baseAddresses[planeCount];
+    baseAddresses[0] = (void *) imageBytes.bytes;
+
+    size_t lastAddressIndex = 0; // Used to get base address for each plane
+    for (int i = 0; i < planeCount; i++) {
+      NSDictionary *plane = planeData[i];
+
+      NSNumber *width = plane[@"width"];
+      NSNumber *height = plane[@"height"];
+      NSNumber *bytesPerRow = plane[@"bytesPerRow"];
+
+      widths[i] = width.unsignedLongValue;
+      heights[i] = height.unsignedLongValue;
+      bytesPerRows[i] = bytesPerRow.unsignedLongValue;
+
+      if (i > 0) {
+        size_t addressIndex = lastAddressIndex + heights[i - 1] * bytesPerRows[i - 1];
+        baseAddresses[i] = (void *) imageBytes.bytes + addressIndex;
+      }
+    }
+
+    NSNumber *width = metadata[@"width"];
+    NSNumber *height = metadata[@"height"];
+
+    NSNumber *rawFormat = metadata[@"rawFormat"];
+    FourCharCode format = FOUR_CHAR_CODE(rawFormat.unsignedIntValue);
+
     CVPixelBufferRef pxbuffer = NULL;
-    size_t widths[2] = {1080, 1080};
-    size_t heights[2] = {1920, 1920};
-    size_t bytesPerRows[2] = {1088, 1080};
-    CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, 1080, 1920, kCVPixelFormatType_420YpCbCr8BiPlanarFullRange, NULL, 4177920, 2, (void *) imageBytes.bytes, widths, heights, bytesPerRows, NULL, NULL, NULL, &pxbuffer);
+    CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, width.unsignedLongValue, height.unsignedLongValue, format, NULL, imageBytes.length, 2, baseAddresses, widths, heights, bytesPerRows, NULL, NULL, NULL, &pxbuffer);
 
     CMSampleTimingInfo info;
     info.presentationTimeStamp = kCMTimeZero;
@@ -81,11 +113,6 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, pxbuffer, formatDesc, &info, &sampleBuffer);
 
     return [[FIRVisionImage alloc] initWithBuffer:sampleBuffer];
-    /*
-    UIImage *image = [[UIImage alloc] initWithData:imageBytes];
-    // TODO(bmparr): Rotate image from imageData[@"rotation"].
-    return [[FIRVisionImage alloc] initWithImage:image];
-     */
   } else {
     NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
     @throw
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 6d03821fb169..31c935a36537 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -73,7 +73,6 @@ class FirebaseVisionImage {
         _bytes = bytes,
         _type = type;
 
-  // TODO(bmparr): Add [ImageOrientation] when passing file.
   /// Construct a [FirebaseVisionImage] from a file.
   factory FirebaseVisionImage.fromFile(File imageFile) {
     assert(imageFile != null);

From e7df772b982e3052439443ebda0e3f0ac81f2a63 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 7 Dec 2018 16:40:07 +0000
Subject: [PATCH 28/35] Documentation

---
 .../lib/src/firebase_vision.dart              | 69 +++++++++++++------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 31c935a36537..657bd264be65 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -93,14 +93,18 @@ class FirebaseVisionImage {
 
   /// Construct a [FirebaseVisionImage] from a list of bytes.
   ///
-  /// Expects `ImageFormat.NV21` on Android and expects bytes from `NSData`
-  /// provided from a `UIImage` on iOS. (e.g. using
-  /// `UIImageJPEGRepresentation()` on the platform side).
+  /// Expects `android.graphics.ImageFormat.NV21` format on Android. Note:
+  /// Concatenating the planes of `android.graphics.ImageFormat.YUV_420_888`
+  /// into a single plane, converts it to `android.graphics.ImageFormat.NV21`.
+  ///
+  /// Expects `kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange` or any other
+  /// planar format on iOS.
   factory FirebaseVisionImage.fromBytes(
     Uint8List bytes,
     FirebaseVisionImageMetadata metadata,
   ) {
     assert(bytes != null);
+    assert(metadata != null);
     return FirebaseVisionImage._(
       type: _ImageType.bytes,
       bytes: bytes,
@@ -121,6 +125,7 @@ class FirebaseVisionImage {
       };
 }
 
+/// Plane attributes to create the image buffer on iOS.
 class FirebaseVisionImagePlaneMetadata {
   const FirebaseVisionImagePlaneMetadata({
     @required this.bytesPerRow,
@@ -130,8 +135,13 @@ class FirebaseVisionImagePlaneMetadata {
         assert(height != null),
         assert(width != null);
 
+  /// The row stride for this color plane, in bytes.
   final int bytesPerRow;
+
+  /// Height of the pixel buffer on iOS.
   final int height;
+
+  /// Width of the pixel buffer on iOS.
   final int width;
 
   Map<String, dynamic> _serialize() => <String, dynamic>{
@@ -147,19 +157,50 @@ class FirebaseVisionImagePlaneMetadata {
 /// Android.
 class FirebaseVisionImageMetadata {
   const FirebaseVisionImageMetadata({
-    @required this.rawFormat,
     @required this.size,
+    @required this.rawFormat,
     @required this.planeData,
     this.rotation = ImageRotation.rotation_0,
-  })  : assert(size != null),
-        assert(rawFormat != null),
-        assert(planeData != null);
+  })  : assert(size != null);
 
+  /// Size of the image in pixels.
   final Size size;
+
+  /// Rotation of the image for Android.
+  ///
+  /// Not currently used on iOS.
   final ImageRotation rotation;
+
+  /// Raw version of the format from the iOS platform.
+  ///
+  /// Since iOS can use any planar format, this format will be used to create
+  /// the image buffer on iOS.
+  ///
+  /// On iOS, this is a `FourCharCode` constant from Pixel Format Identifiers.
+  /// See https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers?language=objc
+  ///
+  /// Not used on Android.
   final dynamic rawFormat;
+
+  /// The plane attributes to create the image buffer on iOS.
+  ///
+  /// Not used on Android.
   final List<FirebaseVisionImagePlaneMetadata> planeData;
 
+  int _imageRotationToInt(ImageRotation rotation) {
+    switch (rotation) {
+      case ImageRotation.rotation_90:
+        return 90;
+      case ImageRotation.rotation_180:
+        return 180;
+      case ImageRotation.rotation_270:
+        return 270;
+      default:
+        assert(rotation == ImageRotation.rotation_0);
+        return 0;
+    }
+  }
+
   Map<String, dynamic> _serialize() => <String, dynamic>{
         'width': size.width,
         'height': size.height,
@@ -177,20 +218,6 @@ abstract class FirebaseVisionDetector {
   Future<dynamic> detectInImage(FirebaseVisionImage visionImage);
 }
 
-int _imageRotationToInt(ImageRotation rotation) {
-  switch (rotation) {
-    case ImageRotation.rotation_90:
-      return 90;
-    case ImageRotation.rotation_180:
-      return 180;
-    case ImageRotation.rotation_270:
-      return 270;
-    default:
-      assert(rotation == ImageRotation.rotation_0);
-      return 0;
-  }
-}
-
 String _enumToString(dynamic enumValue) {
   final String enumString = enumValue.toString();
   return enumString.substring(enumString.indexOf('.') + 1);

From b513d1263767586bd8bb42471d3b971c80cce580 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 7 Dec 2018 17:36:10 +0000
Subject: [PATCH 29/35] Formatting

---
 .../ios/Classes/FirebaseMlVisionPlugin.m      | 19 ++++++++++++-------
 .../lib/src/firebase_vision.dart              |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index e2652b4574b0..aae28907ec6c 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -72,9 +72,9 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     size_t bytesPerRows[planeCount];
 
     void *baseAddresses[planeCount];
-    baseAddresses[0] = (void *) imageBytes.bytes;
+    baseAddresses[0] = (void *)imageBytes.bytes;
 
-    size_t lastAddressIndex = 0; // Used to get base address for each plane
+    size_t lastAddressIndex = 0;  // Used to get base address for each plane
     for (int i = 0; i < planeCount; i++) {
       NSDictionary *plane = planeData[i];
 
@@ -88,7 +88,7 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
 
       if (i > 0) {
         size_t addressIndex = lastAddressIndex + heights[i - 1] * bytesPerRows[i - 1];
-        baseAddresses[i] = (void *) imageBytes.bytes + addressIndex;
+        baseAddresses[i] = (void *)imageBytes.bytes + addressIndex;
       }
     }
 
@@ -99,7 +99,10 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     FourCharCode format = FOUR_CHAR_CODE(rawFormat.unsignedIntValue);
 
     CVPixelBufferRef pxbuffer = NULL;
-    CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, width.unsignedLongValue, height.unsignedLongValue, format, NULL, imageBytes.length, 2, baseAddresses, widths, heights, bytesPerRows, NULL, NULL, NULL, &pxbuffer);
+    CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, width.unsignedLongValue,
+                                       height.unsignedLongValue, format, NULL, imageBytes.length, 2,
+                                       baseAddresses, widths, heights, bytesPerRows, NULL, NULL,
+                                       NULL, &pxbuffer);
 
     CMSampleTimingInfo info;
     info.presentationTimeStamp = kCMTimeZero;
@@ -110,13 +113,15 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, pxbuffer, &formatDesc);
 
     CMSampleBufferRef sampleBuffer = NULL;
-    CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, pxbuffer, formatDesc, &info, &sampleBuffer);
+    CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, pxbuffer, formatDesc, &info,
+                                             &sampleBuffer);
 
     return [[FIRVisionImage alloc] initWithBuffer:sampleBuffer];
   } else {
     NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
-    @throw
-        [NSException exceptionWithName:NSInvalidArgumentException reason:errorReason userInfo:nil];
+    @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                   reason:errorReason
+                                 userInfo:nil];
   }
 }
 @end
diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 657bd264be65..625c7ae3b5c4 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -161,7 +161,7 @@ class FirebaseVisionImageMetadata {
     @required this.rawFormat,
     @required this.planeData,
     this.rotation = ImageRotation.rotation_0,
-  })  : assert(size != null);
+  }) : assert(size != null);
 
   /// Size of the image in pixels.
   final Size size;

From d14aa17554de11008571c10b68c1b20ff663ec4f Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 7 Dec 2018 19:24:52 +0000
Subject: [PATCH 30/35] Only assert on iOS

---
 .../lib/src/firebase_vision.dart              | 31 ++++++++++++++-----
 .../test/firebase_ml_vision_test.dart         |  4 +--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 625c7ae3b5c4..991129895634 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -63,7 +63,7 @@ class FirebaseVision {
 ///
 /// Create an instance by calling one of the factory constructors.
 class FirebaseVisionImage {
-  const FirebaseVisionImage._({
+  FirebaseVisionImage._({
     @required _ImageType type,
     FirebaseVisionImageMetadata metadata,
     File imageFile,
@@ -126,14 +126,22 @@ class FirebaseVisionImage {
 }
 
 /// Plane attributes to create the image buffer on iOS.
+///
+/// When using iOS, [bytesPerRow], [height], and [width] throw [AssertionError]
+/// if `null`.
 class FirebaseVisionImagePlaneMetadata {
-  const FirebaseVisionImagePlaneMetadata({
+  FirebaseVisionImagePlaneMetadata({
     @required this.bytesPerRow,
     @required this.height,
     @required this.width,
-  })  : assert(bytesPerRow != null),
-        assert(height != null),
-        assert(width != null);
+  })  : assert(defaultTargetPlatform == TargetPlatform.iOS
+            ? bytesPerRow != null
+            : true),
+        assert(defaultTargetPlatform == TargetPlatform.iOS
+            ? height != null
+            : true),
+        assert(
+            defaultTargetPlatform == TargetPlatform.iOS ? width != null : true);
 
   /// The row stride for this color plane, in bytes.
   final int bytesPerRow;
@@ -155,13 +163,22 @@ class FirebaseVisionImagePlaneMetadata {
 ///
 /// [rotation] defaults to [ImageRotation.rotation_0]. Currently only rotates on
 /// Android.
+///
+/// When using iOS, [rawFormat] and [planeData] throw [AssertionError] if
+/// `null`.
 class FirebaseVisionImageMetadata {
-  const FirebaseVisionImageMetadata({
+  FirebaseVisionImageMetadata({
     @required this.size,
     @required this.rawFormat,
     @required this.planeData,
     this.rotation = ImageRotation.rotation_0,
-  }) : assert(size != null);
+  })  : assert(size != null),
+        assert(defaultTargetPlatform == TargetPlatform.iOS
+            ? rawFormat != null
+            : true),
+        assert(defaultTargetPlatform == TargetPlatform.iOS
+            ? planeData != null
+            : true);
 
   /// Size of the image in pixels.
   final Size size;
diff --git a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
index f6535ec4ad50..3d7e09ffb8cc 100644
--- a/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
+++ b/packages/firebase_ml_vision/test/firebase_ml_vision_test.dart
@@ -51,9 +51,9 @@ void main() {
 
       test('default serialization', () async {
         final FirebaseVisionImageMetadata metadata =
-            const FirebaseVisionImageMetadata(
+            FirebaseVisionImageMetadata(
           rawFormat: 35,
-          size: Size(1.0, 1.0),
+          size: const Size(1.0, 1.0),
           planeData: <FirebaseVisionImagePlaneMetadata>[
             FirebaseVisionImagePlaneMetadata(
               bytesPerRow: 1000,

From e07ce35b3f90830baa1953ad3721aa98d9210779 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Sun, 9 Dec 2018 16:25:03 -0800
Subject: [PATCH 31/35] Keep access to bytes

---
 .../ios/Classes/BarcodeDetector.m              |  2 ++
 .../ios/Classes/CloudLabelDetector.m           |  2 ++
 .../ios/Classes/FaceDetector.m                 |  2 ++
 .../ios/Classes/FirebaseMlVisionPlugin.h       |  1 +
 .../ios/Classes/FirebaseMlVisionPlugin.m       | 18 ++++++++++++++----
 .../ios/Classes/LabelDetector.m                |  2 ++
 .../ios/Classes/TextRecognizer.m               |  2 ++
 7 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m b/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
index 6399ee8de9b3..94680ca32ac8 100644
--- a/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
@@ -13,6 +13,8 @@ + (void)handleDetection:(FIRVisionImage *)image
   NSMutableArray *ret = [NSMutableArray array];
   [barcodeDetector detectInImage:image
                       completion:^(NSArray<FIRVisionBarcode *> *barcodes, NSError *error) {
+                        [FLTFirebaseMlVisionPlugin releaseImage];
+
                         if (error) {
                           [FLTFirebaseMlVisionPlugin handleError:error result:result];
                           return;
diff --git a/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m b/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m
index 3be3948b4a9f..e1c82d0b5822 100644
--- a/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m
@@ -12,6 +12,8 @@ + (void)handleDetection:(FIRVisionImage *)image
   [detector
       detectInImage:image
          completion:^(NSArray<FIRVisionCloudLabel *> *_Nullable labels, NSError *_Nullable error) {
+           [FLTFirebaseMlVisionPlugin releaseImage];
+
            if (error) {
              [FLTFirebaseMlVisionPlugin handleError:error result:result];
              return;
diff --git a/packages/firebase_ml_vision/ios/Classes/FaceDetector.m b/packages/firebase_ml_vision/ios/Classes/FaceDetector.m
index 602aaddf606e..1cf89565a243 100644
--- a/packages/firebase_ml_vision/ios/Classes/FaceDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/FaceDetector.m
@@ -12,6 +12,8 @@ + (void)handleDetection:(FIRVisionImage *)image
   [faceDetector
       processImage:image
         completion:^(NSArray<FIRVisionFace *> *_Nullable faces, NSError *_Nullable error) {
+          [FLTFirebaseMlVisionPlugin releaseImage];
+
           if (error) {
             [FLTFirebaseMlVisionPlugin handleError:error result:result];
             return;
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h
index 9a620dc45cfa..a1814ff87f99 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h
@@ -4,6 +4,7 @@
 
 @interface FLTFirebaseMlVisionPlugin : NSObject <FlutterPlugin>
 + (void)handleError:(NSError *)error result:(FlutterResult)result;
++ (void)releaseImage;
 @end
 
 @protocol Detector
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index aae28907ec6c..5a1cac9e1ea8 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -12,11 +12,18 @@ - (FlutterError *)flutterError {
 }
 @end
 
+// Used to keep image bytes accessible.
+static NSData *currentImage;
+
 @implementation FLTFirebaseMlVisionPlugin
 + (void)handleError:(NSError *)error result:(FlutterResult)result {
   result([error flutterError]);
 }
 
++ (void)releaseImage {
+  currentImage = nil;
+}
+
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
       [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/firebase_ml_vision"
@@ -60,8 +67,10 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     UIImage *image = [UIImage imageWithContentsOfFile:imageData[@"path"]];
     return [[FIRVisionImage alloc] initWithImage:image];
   } else if ([@"bytes" isEqualToString:imageType]) {
+    NSAssert(!currentImage, @"Detection on an image is already in progress!");
+
     FlutterStandardTypedData *byteData = imageData[@"bytes"];
-    NSData *imageBytes = byteData.data;
+    currentImage = byteData.data;
 
     NSDictionary *metadata = imageData[@"metadata"];
     NSArray *planeData = metadata[@"planeData"];
@@ -72,7 +81,7 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     size_t bytesPerRows[planeCount];
 
     void *baseAddresses[planeCount];
-    baseAddresses[0] = (void *)imageBytes.bytes;
+    baseAddresses[0] = (void *)currentImage.bytes;
 
     size_t lastAddressIndex = 0;  // Used to get base address for each plane
     for (int i = 0; i < planeCount; i++) {
@@ -88,7 +97,8 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
 
       if (i > 0) {
         size_t addressIndex = lastAddressIndex + heights[i - 1] * bytesPerRows[i - 1];
-        baseAddresses[i] = (void *)imageBytes.bytes + addressIndex;
+        baseAddresses[i] = (void *)currentImage.bytes + addressIndex;
+        lastAddressIndex = addressIndex;
       }
     }
 
@@ -100,7 +110,7 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
 
     CVPixelBufferRef pxbuffer = NULL;
     CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, width.unsignedLongValue,
-                                       height.unsignedLongValue, format, NULL, imageBytes.length, 2,
+                                       height.unsignedLongValue, format, NULL, currentImage.length, 2,
                                        baseAddresses, widths, heights, bytesPerRows, NULL, NULL,
                                        NULL, &pxbuffer);
 
diff --git a/packages/firebase_ml_vision/ios/Classes/LabelDetector.m b/packages/firebase_ml_vision/ios/Classes/LabelDetector.m
index 7c381779d843..48af15d7436b 100644
--- a/packages/firebase_ml_vision/ios/Classes/LabelDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/LabelDetector.m
@@ -11,6 +11,8 @@ + (void)handleDetection:(FIRVisionImage *)image
 
   [detector detectInImage:image
                completion:^(NSArray<FIRVisionLabel *> *_Nullable labels, NSError *_Nullable error) {
+                 [FLTFirebaseMlVisionPlugin releaseImage];
+
                  if (error) {
                    [FLTFirebaseMlVisionPlugin handleError:error result:result];
                    return;
diff --git a/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m b/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m
index 9b0f5567db06..ad8ec357e0a2 100644
--- a/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m
+++ b/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m
@@ -11,6 +11,8 @@ + (void)handleDetection:(FIRVisionImage *)image
 
   [recognizer processImage:image
                 completion:^(FIRVisionText *_Nullable visionText, NSError *_Nullable error) {
+                  [FLTFirebaseMlVisionPlugin releaseImage];
+
                   if (error) {
                     [FLTFirebaseMlVisionPlugin handleError:error result:result];
                     return;

From db798e716347c4274cbda016d85cdab248e84834 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 10 Dec 2018 15:39:59 -0800
Subject: [PATCH 32/35] formatting

---
 .../firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 5a1cac9e1ea8..123df24581f4 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -110,8 +110,8 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
 
     CVPixelBufferRef pxbuffer = NULL;
     CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, width.unsignedLongValue,
-                                       height.unsignedLongValue, format, NULL, currentImage.length, 2,
-                                       baseAddresses, widths, heights, bytesPerRows, NULL, NULL,
+                                       height.unsignedLongValue, format, NULL, currentImage.length,
+                                       2, baseAddresses, widths, heights, bytesPerRows, NULL, NULL,
                                        NULL, &pxbuffer);
 
     CMSampleTimingInfo info;

From 11bf10115049361d83acad2d170e25546ae8af4a Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Wed, 12 Dec 2018 01:23:39 -0800
Subject: [PATCH 33/35] Use UIImage instead of CMSampleBufferRef

---
 .../ios/Classes/BarcodeDetector.m             |  2 -
 .../ios/Classes/CloudLabelDetector.m          |  2 -
 .../ios/Classes/FaceDetector.m                |  2 -
 .../ios/Classes/FirebaseMlVisionPlugin.h      |  1 -
 .../ios/Classes/FirebaseMlVisionPlugin.m      | 40 +++++++------------
 .../ios/Classes/LabelDetector.m               |  2 -
 .../ios/Classes/TextRecognizer.m              |  2 -
 7 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m b/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
index 94680ca32ac8..6399ee8de9b3 100644
--- a/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/BarcodeDetector.m
@@ -13,8 +13,6 @@ + (void)handleDetection:(FIRVisionImage *)image
   NSMutableArray *ret = [NSMutableArray array];
   [barcodeDetector detectInImage:image
                       completion:^(NSArray<FIRVisionBarcode *> *barcodes, NSError *error) {
-                        [FLTFirebaseMlVisionPlugin releaseImage];
-
                         if (error) {
                           [FLTFirebaseMlVisionPlugin handleError:error result:result];
                           return;
diff --git a/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m b/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m
index e1c82d0b5822..3be3948b4a9f 100644
--- a/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/CloudLabelDetector.m
@@ -12,8 +12,6 @@ + (void)handleDetection:(FIRVisionImage *)image
   [detector
       detectInImage:image
          completion:^(NSArray<FIRVisionCloudLabel *> *_Nullable labels, NSError *_Nullable error) {
-           [FLTFirebaseMlVisionPlugin releaseImage];
-
            if (error) {
              [FLTFirebaseMlVisionPlugin handleError:error result:result];
              return;
diff --git a/packages/firebase_ml_vision/ios/Classes/FaceDetector.m b/packages/firebase_ml_vision/ios/Classes/FaceDetector.m
index 1cf89565a243..602aaddf606e 100644
--- a/packages/firebase_ml_vision/ios/Classes/FaceDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/FaceDetector.m
@@ -12,8 +12,6 @@ + (void)handleDetection:(FIRVisionImage *)image
   [faceDetector
       processImage:image
         completion:^(NSArray<FIRVisionFace *> *_Nullable faces, NSError *_Nullable error) {
-          [FLTFirebaseMlVisionPlugin releaseImage];
-
           if (error) {
             [FLTFirebaseMlVisionPlugin handleError:error result:result];
             return;
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h
index a1814ff87f99..9a620dc45cfa 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.h
@@ -4,7 +4,6 @@
 
 @interface FLTFirebaseMlVisionPlugin : NSObject <FlutterPlugin>
 + (void)handleError:(NSError *)error result:(FlutterResult)result;
-+ (void)releaseImage;
 @end
 
 @protocol Detector
diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index 123df24581f4..b31519e32ca0 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -12,18 +12,11 @@ - (FlutterError *)flutterError {
 }
 @end
 
-// Used to keep image bytes accessible.
-static NSData *currentImage;
-
 @implementation FLTFirebaseMlVisionPlugin
 + (void)handleError:(NSError *)error result:(FlutterResult)result {
   result([error flutterError]);
 }
 
-+ (void)releaseImage {
-  currentImage = nil;
-}
-
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
       [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/firebase_ml_vision"
@@ -67,10 +60,8 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     UIImage *image = [UIImage imageWithContentsOfFile:imageData[@"path"]];
     return [[FIRVisionImage alloc] initWithImage:image];
   } else if ([@"bytes" isEqualToString:imageType]) {
-    NSAssert(!currentImage, @"Detection on an image is already in progress!");
-
     FlutterStandardTypedData *byteData = imageData[@"bytes"];
-    currentImage = byteData.data;
+    NSData *imageBytes = byteData.data;
 
     NSDictionary *metadata = imageData[@"metadata"];
     NSArray *planeData = metadata[@"planeData"];
@@ -81,7 +72,7 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     size_t bytesPerRows[planeCount];
 
     void *baseAddresses[planeCount];
-    baseAddresses[0] = (void *)currentImage.bytes;
+    baseAddresses[0] = (void *)imageBytes.bytes;
 
     size_t lastAddressIndex = 0;  // Used to get base address for each plane
     for (int i = 0; i < planeCount; i++) {
@@ -97,7 +88,7 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
 
       if (i > 0) {
         size_t addressIndex = lastAddressIndex + heights[i - 1] * bytesPerRows[i - 1];
-        baseAddresses[i] = (void *)currentImage.bytes + addressIndex;
+        baseAddresses[i] = (void *)imageBytes.bytes + addressIndex;
         lastAddressIndex = addressIndex;
       }
     }
@@ -110,23 +101,22 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
 
     CVPixelBufferRef pxbuffer = NULL;
     CVPixelBufferCreateWithPlanarBytes(kCFAllocatorDefault, width.unsignedLongValue,
-                                       height.unsignedLongValue, format, NULL, currentImage.length,
-                                       2, baseAddresses, widths, heights, bytesPerRows, NULL, NULL,
+                                       height.unsignedLongValue, format, NULL, imageBytes.length, 2,
+                                       baseAddresses, widths, heights, bytesPerRows, NULL, NULL,
                                        NULL, &pxbuffer);
 
-    CMSampleTimingInfo info;
-    info.presentationTimeStamp = kCMTimeZero;
-    info.duration = kCMTimeInvalid;
-    info.decodeTimeStamp = kCMTimeInvalid;
-
-    CMFormatDescriptionRef formatDesc = NULL;
-    CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, pxbuffer, &formatDesc);
+    CIImage *ciImage = [CIImage imageWithCVPixelBuffer:pxbuffer];
 
-    CMSampleBufferRef sampleBuffer = NULL;
-    CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, pxbuffer, formatDesc, &info,
-                                             &sampleBuffer);
+    CIContext *temporaryContext = [CIContext contextWithOptions:nil];
+    CGImageRef videoImage = [temporaryContext
+                             createCGImage:ciImage
+                             fromRect:CGRectMake(0, 0,
+                                                 CVPixelBufferGetWidth(pxbuffer),
+                                                 CVPixelBufferGetHeight(pxbuffer))];
 
-    return [[FIRVisionImage alloc] initWithBuffer:sampleBuffer];
+    UIImage *uiImage = [UIImage imageWithCGImage:videoImage];
+    CGImageRelease(videoImage);
+    return [[FIRVisionImage alloc] initWithImage:uiImage];
   } else {
     NSString *errorReason = [NSString stringWithFormat:@"No image type for: %@", imageType];
     @throw [NSException exceptionWithName:NSInvalidArgumentException
diff --git a/packages/firebase_ml_vision/ios/Classes/LabelDetector.m b/packages/firebase_ml_vision/ios/Classes/LabelDetector.m
index 48af15d7436b..7c381779d843 100644
--- a/packages/firebase_ml_vision/ios/Classes/LabelDetector.m
+++ b/packages/firebase_ml_vision/ios/Classes/LabelDetector.m
@@ -11,8 +11,6 @@ + (void)handleDetection:(FIRVisionImage *)image
 
   [detector detectInImage:image
                completion:^(NSArray<FIRVisionLabel *> *_Nullable labels, NSError *_Nullable error) {
-                 [FLTFirebaseMlVisionPlugin releaseImage];
-
                  if (error) {
                    [FLTFirebaseMlVisionPlugin handleError:error result:result];
                    return;
diff --git a/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m b/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m
index ad8ec357e0a2..9b0f5567db06 100644
--- a/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m
+++ b/packages/firebase_ml_vision/ios/Classes/TextRecognizer.m
@@ -11,8 +11,6 @@ + (void)handleDetection:(FIRVisionImage *)image
 
   [recognizer processImage:image
                 completion:^(FIRVisionText *_Nullable visionText, NSError *_Nullable error) {
-                  [FLTFirebaseMlVisionPlugin releaseImage];
-
                   if (error) {
                     [FLTFirebaseMlVisionPlugin handleError:error result:result];
                     return;

From f71e27961d2bdead84e7b84c6f2468c69a8a6981 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Wed, 12 Dec 2018 10:22:08 -0800
Subject: [PATCH 34/35] Formatting

---
 .../ios/Classes/FirebaseMlVisionPlugin.m                 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
index b31519e32ca0..567d2b0b1d70 100644
--- a/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
+++ b/packages/firebase_ml_vision/ios/Classes/FirebaseMlVisionPlugin.m
@@ -108,11 +108,10 @@ - (FIRVisionImage *)dataToVisionImage:(NSDictionary *)imageData {
     CIImage *ciImage = [CIImage imageWithCVPixelBuffer:pxbuffer];
 
     CIContext *temporaryContext = [CIContext contextWithOptions:nil];
-    CGImageRef videoImage = [temporaryContext
-                             createCGImage:ciImage
-                             fromRect:CGRectMake(0, 0,
-                                                 CVPixelBufferGetWidth(pxbuffer),
-                                                 CVPixelBufferGetHeight(pxbuffer))];
+    CGImageRef videoImage =
+        [temporaryContext createCGImage:ciImage
+                               fromRect:CGRectMake(0, 0, CVPixelBufferGetWidth(pxbuffer),
+                                                   CVPixelBufferGetHeight(pxbuffer))];
 
     UIImage *uiImage = [UIImage imageWithCGImage:videoImage];
     CGImageRelease(videoImage);

From deca0b5b983d90c4be177bb8a6e8802a02c4a762 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Wed, 19 Dec 2018 17:23:09 -0800
Subject: [PATCH 35/35] Style guide enums

---
 .../lib/src/firebase_vision.dart                   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/firebase_ml_vision/lib/src/firebase_vision.dart b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
index 991129895634..9525db5f4a3a 100644
--- a/packages/firebase_ml_vision/lib/src/firebase_vision.dart
+++ b/packages/firebase_ml_vision/lib/src/firebase_vision.dart
@@ -9,7 +9,7 @@ enum _ImageType { file, bytes }
 /// Indicates the image rotation.
 ///
 /// Rotation is counter-clockwise.
-enum ImageRotation { rotation_0, rotation_90, rotation_180, rotation_270 }
+enum ImageRotation { rotation0, rotation90, rotation180, rotation270 }
 
 /// The Firebase machine learning vision API.
 ///
@@ -161,7 +161,7 @@ class FirebaseVisionImagePlaneMetadata {
 
 /// Image metadata used by [FirebaseVision] detectors.
 ///
-/// [rotation] defaults to [ImageRotation.rotation_0]. Currently only rotates on
+/// [rotation] defaults to [ImageRotation.rotation0]. Currently only rotates on
 /// Android.
 ///
 /// When using iOS, [rawFormat] and [planeData] throw [AssertionError] if
@@ -171,7 +171,7 @@ class FirebaseVisionImageMetadata {
     @required this.size,
     @required this.rawFormat,
     @required this.planeData,
-    this.rotation = ImageRotation.rotation_0,
+    this.rotation = ImageRotation.rotation0,
   })  : assert(size != null),
         assert(defaultTargetPlatform == TargetPlatform.iOS
             ? rawFormat != null
@@ -206,14 +206,14 @@ class FirebaseVisionImageMetadata {
 
   int _imageRotationToInt(ImageRotation rotation) {
     switch (rotation) {
-      case ImageRotation.rotation_90:
+      case ImageRotation.rotation90:
         return 90;
-      case ImageRotation.rotation_180:
+      case ImageRotation.rotation180:
         return 180;
-      case ImageRotation.rotation_270:
+      case ImageRotation.rotation270:
         return 270;
       default:
-        assert(rotation == ImageRotation.rotation_0);
+        assert(rotation == ImageRotation.rotation0);
         return 0;
     }
   }