Shape detection service: Add QR detection in Mac

services/shape_detection/barcode_detection_impl_mac.mm

Index: services/shape_detection/barcode_detection_impl_mac.mm
diff --git a/services/shape_detection/barcode_detection_impl_mac.mm b/services/shape_detection/barcode_detection_impl_mac.mm
new file mode 100644
index 0000000000000000000000000000000000000000..a78521408e7461ad04cd77dcf5137656427226b7
--- /dev/null
+++ b/services/shape_detection/barcode_detection_impl_mac.mm
@@ -0,0 +1,104 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "services/shape_detection/barcode_detection_impl_mac.h"
+
+#include "base/mac/mac_util.h"
+#include "base/mac/scoped_cftyperef.h"
+#include "base/strings/sys_string_conversions.h"
+#include "media/capture/video/scoped_result_callback.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "services/shape_detection/barcode_detection_impl.h"
+#include "services/shape_detection/detection_utils_mac.h"
+
+namespace shape_detection {
+
+namespace {
+
+void RunCallbackWithBarcodes(
+    const shape_detection::mojom::BarcodeDetection::DetectCallback& callback,
+    std::vector<shape_detection::mojom::BarcodeDetectionResultPtr> results) {
+  callback.Run(std::move(results));
+}
+
+void RunCallbackWithNoBarcodes(
+    const shape_detection::mojom::BarcodeDetection::DetectCallback& callback) {
+  callback.Run(
+      std::vector<shape_detection::mojom::BarcodeDetectionResultPtr>());
+}
+
+}  // anonymous namespace
+
+//static

[Robert Sesek, 2017/02/01 19:34:11]

nit: space after /

[mcasas, 2017/02/01 20:40:20]

Done.

+void BarcodeDetectionImpl::Create(
+    shape_detection::mojom::BarcodeDetectionRequest request) {
+  // Barcode detection needs at least MAC OS X 10.10.
+  if (!base::mac::IsAtLeastOS10_10())
+    return;

[Robert Sesek, 2017/02/01 19:34:11]

Does this not need to error out?

[mcasas, 2017/02/01 20:40:20]

No; mojo requests should be dropped so that the client's
side on_error_connection_handler() is called.

+  mojo::MakeStrongBinding(base::MakeUnique<BarcodeDetectionImplMac>(),
+                          std::move(request));
+}
+
+BarcodeDetectionImplMac::BarcodeDetectionImplMac() {
+  context_.reset([[CIContext alloc] init]);

[Robert Sesek, 2017/02/01 19:34:11]

Is it worth finding a way to share the CIContext between the barcode and QR
detectors?

[mcasas, 2017/02/01 20:40:20]

Not really, I think the idea was to have a CIContext initialized
in a background thread or pool and reuse it for the CIDetector,
but since we are now inside a background process it's not
even worth keeping, so I removed it from both detectors.

+  NSDictionary* const opts = @{CIDetectorAccuracy : CIDetectorAccuracyHigh};
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10

[Robert Sesek, 2017/02/01 19:34:11]

The general approach to doing this is to a) do it in sdk_forward_declarations.h,
and b) name it the same as the constant that isn't defined:

https://cs.chromium.org/chromium/src/base/mac/sdk_forward_declarations.h?type...

[mcasas, 2017/02/01 20:40:21]

Cool. Done.

+  // CIDetectorTypeQRCode is available in MAC OS X 10.10, so should be available
+  // in runtime because of the base::mac::IsAtLeastOS10_10() in Create(), but we
+  // need to define it at compile time because the SDK version is 10.9.
+  NSString* kCIDetectorTypeQRCode = @"CIDetectorTypeQRCode";
+#else
+  NSString* kCIDetectorTypeQRCode = CIDetectorTypeQRCode;
+  DCHECK([kCIDetectorTypeQRCode isEqual:@"CIDetectorTypeQRCode"]);
+#endif
+  detector_.reset([[CIDetector detectorOfType:kCIDetectorTypeQRCode
+                                      context:context_
+                                      options:opts] retain]);
+}
+
+BarcodeDetectionImplMac::~BarcodeDetectionImplMac() {}
+
+void BarcodeDetectionImplMac::Detect(mojo::ScopedSharedBufferHandle frame_data,
+                                     uint32_t width,
+                                     uint32_t height,
+                                     const DetectCallback& callback) {
+  media::ScopedResultCallback<DetectCallback> scoped_callback(
+      base::Bind(&RunCallbackWithBarcodes, callback),
+      base::Bind(&RunCallbackWithNoBarcodes));
+
+  base::scoped_nsobject<CIImage> ci_image =
+      CreateCIImageFromSharedMemory(std::move(frame_data), width, height);
+  if (!ci_image)
+    return;
+
+  NSArray* const features = [detector_ featuresInImage:ci_image];
+
+  std::vector<mojom::BarcodeDetectionResultPtr> results;
+  for (CIQRCodeFeature* const f in features) {
+    shape_detection::mojom::BarcodeDetectionResultPtr result =
+        shape_detection::mojom::BarcodeDetectionResult::New();
+    // In the default Core Graphics coordinate space, the origin is located
+    // in the lower-left corner, and thus |ci_image| is flipped vertically.
+    // We need to adjust |y| coordinate of bounding box before sending it.
+    gfx::RectF boundingbox(f.bounds.origin.x,
+                           height - f.bounds.origin.y - f.bounds.size.height,
+                           f.bounds.size.width, f.bounds.size.height);
+    result->bounding_box = std::move(boundingbox);
+
+    // Enumerate corner points starting from top-left in clockwise fashion:
+    // https://wicg.github.io/shape-detection-api/#dom-detectedbarcode-cornerpoints
+    result->corner_points.emplace_back(f.topLeft.x, height - f.topLeft.y);
+    result->corner_points.emplace_back(f.topRight.x, height - f.topRight.y);
+    result->corner_points.emplace_back(f.bottomRight.x,
+                                       height - f.bottomRight.y);
+    result->corner_points.emplace_back(f.bottomLeft.x, height - f.bottomLeft.y);
+
+    result->raw_value = base::SysNSStringToUTF8(f.messageString);
+    results.push_back(std::move(result));
+  }
+  scoped_callback.Run(std::move(results));
+}
+
+}  // namespace shape_detection