Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(629)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/shapedetection/BarcodeDetectionImpl.java

Issue 2512123002: Shape Detection: QR detection in Chrome Android using Play Services (Closed)
Patch Set: dcheng@ request to check for |numPixels| overflow Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/shapedetection/BarcodeDetectionImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/shapedetection/BarcodeDetectionImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/shapedetection/BarcodeDetectionImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..95d45992c879f9225d42ef91f883c86f6fb7b845
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/shapedetection/BarcodeDetectionImpl.java
@@ -0,0 +1,117 @@
+// Copyright 2016 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.
+
+package org.chromium.chrome.browser.shapedetection;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.util.SparseArray;
+
+import com.google.android.gms.vision.Frame;
+import com.google.android.gms.vision.barcode.Barcode;
+import com.google.android.gms.vision.barcode.BarcodeDetector;
+
+import org.chromium.base.Log;
+import org.chromium.blink.mojom.BarcodeDetection;
+import org.chromium.blink.mojom.BarcodeDetectionResult;
+import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
+import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
+import org.chromium.gfx.mojom.RectF;
+import org.chromium.mojo.system.MojoException;
+import org.chromium.mojo.system.SharedBufferHandle;
+import org.chromium.mojo.system.SharedBufferHandle.MapFlags;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Implementation of mojo BarcodeDetection, using Google Play Services vision package.
+ */
+public class BarcodeDetectionImpl implements BarcodeDetection {
+ private static final String TAG = "BarcodeDetectionImpl";
+
+ private final Context mContext;
+ private BarcodeDetector mBarcodeDetector;
+
+ public BarcodeDetectionImpl(Context context) {
+ Log.d(TAG, "BarcodeDetectionImpl ctor()");
+ mContext = context;
+ mBarcodeDetector = new BarcodeDetector.Builder(mContext).build();
+ }
+
+ @Override
+ public void detect(
+ SharedBufferHandle frameData, int width, int height, DetectResponse callback) {
+ if (!ExternalAuthUtils.getInstance().canUseGooglePlayServices(
+ mContext, new UserRecoverableErrorHandler.Silent())) {
+ Log.e(TAG, "Google Play Services not available");
+ callback.call(new BarcodeDetectionResult[0]);
+ return;
+ }
+ // The vision library will be downloaded the first time the API is used
+ // on the device; this happens "fast", but it might have not completed,
+ // bail in this case. Also, the API was disabled between and v.9.0 and
+ // v.9.2, see https://developers.google.com/android/guides/releases.
+ if (!mBarcodeDetector.isOperational()) {
+ Log.e(TAG, "BarcodeDetector is not operational");
+ callback.call(new BarcodeDetectionResult[0]);
+ return;
+ }
+
+ final long numPixels = (long) width * height;
+ if (!frameData.isValid() || width <= 0 || height <= 0 || (numPixels / 4) > Long.MAX_VALUE) {
dcheng 2016/12/01 06:15:06 This overflow check isn't quite correct: it should
mcasas 2016/12/01 16:05:51 Done.
+ callback.call(new BarcodeDetectionResult[0]);
+ return;
+ }
+
+ // Mapping |frameData| will fail if the intended mapped size is larger
+ // than its actual capacitywhich is limited by the appropriate
Bernhard Bauer 2016/11/30 23:01:35 Nit: "capacity, which"
mcasas 2016/12/01 16:05:51 Done.
+ // mojo::edk::Configuration entry.
+ ByteBuffer imageBuffer = frameData.map(0, numPixels * 4, MapFlags.none());
+ if (imageBuffer.capacity() <= 0) {
+ callback.call(new BarcodeDetectionResult[0]);
+ return;
+ }
+
+ Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+ bitmap.copyPixelsFromBuffer(imageBuffer);
+
+ Frame frame = null;
+ try {
+ // This constructor implies a pixel format conversion to YUV.
+ frame = new Frame.Builder().setBitmap(bitmap).build();
+ } catch (IllegalArgumentException | IllegalStateException ex) {
+ Log.e(TAG, "Frame.Builder().setBitmap() or build(): " + ex);
+ callback.call(new BarcodeDetectionResult[0]);
+ return;
+ }
+
+ final SparseArray<Barcode> barcodes = mBarcodeDetector.detect(frame);
+
+ BarcodeDetectionResult[] barcodeArray = new BarcodeDetectionResult[barcodes.size()];
+ for (int i = 0; i < barcodes.size(); i++) {
+ barcodeArray[i] = new BarcodeDetectionResult();
+ final Barcode barcode = barcodes.valueAt(i);
+ barcodeArray[i].rawValue = barcode.rawValue;
+ final Rect rect = barcode.getBoundingBox();
+ barcodeArray[i].boundingBox = new RectF();
+ barcodeArray[i].boundingBox.x = rect.left;
+ barcodeArray[i].boundingBox.y = rect.top;
+ barcodeArray[i].boundingBox.width = rect.width();
+ barcodeArray[i].boundingBox.height = rect.height();
+ }
+ callback.call(barcodeArray);
+ }
+
+ @Override
+ public void close() {
+ mBarcodeDetector.release();
+ }
+
+ @Override
+ public void onConnectionError(MojoException e) {
+ close();
+ }
+
+}

Powered by Google App Engine
This is Rietveld 408576698