RELAND: ShapeDetection: use mojom::Bitmap for mojo interface.

services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java

 // 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.shape_detection;
 
 import android.graphics.Bitmap;
 import android.graphics.PointF;
 import android.media.FaceDetector;
 import android.media.FaceDetector.Face;
 import android.os.AsyncTask;
 
 import org.chromium.base.Log;
 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 org.chromium.shape_detection.mojom.FaceDetection;
 import org.chromium.shape_detection.mojom.FaceDetectionResult;
 import org.chromium.shape_detection.mojom.FaceDetectorOptions;
 import org.chromium.shape_detection.mojom.Landmark;
+import org.chromium.skia.mojom.ColorType;
 
 import java.nio.ByteBuffer;
 
 /**
  * Android implementation of the FaceDetection service defined in
  * services/shape_detection/public/interfaces/facedetection.mojom
  */
 public class FaceDetectionImpl implements FaceDetection {
     private static final String TAG = "FaceDetectionImpl";
     private static final int MAX_FACES = 32;
     private final boolean mFastMode;
     private final int mMaxFaces;
 
     FaceDetectionImpl(FaceDetectorOptions options) {
         mFastMode = options.fastMode;
         mMaxFaces = Math.min(options.maxDetectedFaces, MAX_FACES);
     }
 
     @Override
-    public void detect(SharedBufferHandle frameData, final int width, final int height,
-            final DetectResponse callback) {
+    public void detect(org.chromium.skia.mojom.Bitmap bitmapData, final DetectResponse callback) {
+        final int width = bitmapData.width;
+        final int height = bitmapData.height;
         final long numPixels = (long) width * height;
         // TODO(xianglu): https://crbug.com/670028 homogeneize overflow checking.
-        if (!frameData.isValid() || width <= 0 || height <= 0 || numPixels > (Long.MAX_VALUE / 4)) {
+        if (bitmapData.pixelData == null || width <= 0 || height <= 0
+                || numPixels > (Long.MAX_VALUE / 4)) {
             Log.d(TAG, "Invalid argument(s).");
             callback.call(new FaceDetectionResult[0]);
             return;
         }
 
-        ByteBuffer imageBuffer = frameData.map(0, numPixels * 4, MapFlags.none());
-        if (imageBuffer.capacity() <= 0) {
-            Log.d(TAG, "Failed to map from SharedBufferHandle.");
+        // TODO(junwei.fu): https://crbug.com/684921 support other bitmap pixel formats,
+        if (bitmapData.colorType != ColorType.RGBA_8888
+                && bitmapData.colorType != ColorType.BGRA_8888) {
+            Log.e(TAG, "Unsupported bitmap pixel format");
             callback.call(new FaceDetectionResult[0]);
             return;
         }
 
+        ByteBuffer imageBuffer = ByteBuffer.wrap(bitmapData.pixelData);
+        if (imageBuffer.capacity() <= 0) {
+            Log.d(TAG, "Failed to wrap from Bitmap.");
+            callback.call(new FaceDetectionResult[0]);
+            return;
+        }
+
+        // TODO(junwei.fu): Use |bitmapData| directly for |unPremultipliedBitmap| to spare a copy
+        // if the bitmap pixel format is RGB_565, the ARGB_8888 Bitmap doesn't need to be created
+        // in this case, https://crbug.com/684930.
         Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);

[mcasas, 2017/05/15 22:40:23]

This method should use 
Frame frame = SharedBufferUtils.convertToFrame(bitmapData);
like the other .java files, right?

 
         // An int array is needed to construct a Bitmap. However the Bytebuffer
-        // we get from |sharedBufferHandle| is directly allocated and does not
-        // have a supporting array. Therefore we need to copy from |imageBuffer|
-        // to create this intermediate Bitmap.
+        // we get from |bitmapData| is directly allocated and does not have a supporting array.
+        // Therefore we need to copy from |imageBuffer| to create this intermediate Bitmap.
         // TODO(xianglu): Consider worker pool as appropriate threads.
         // http://crbug.com/655814
         bitmap.copyPixelsFromBuffer(imageBuffer);
 
         // A Bitmap must be in 565 format for findFaces() to work. See
         // http://androidxref.com/7.0.0_r1/xref/frameworks/base/media/java/android/media/FaceDetector.java#124
         //
         // It turns out that FaceDetector is not able to detect correctly if
         // simply using pixmap.setConfig(). The reason might be that findFaces()
         // needs non-premultiplied ARGB arrangement, while the alpha type in the
@@ skipping 41 matching lines @@
     }
 
     @Override
     public void close() {}
 
     @Override
     public void onConnectionError(MojoException e) {
         close();
     }
 }