Shape Detection: move Java Face detection classes to //services/shape_detection

content/public/android/java/src/org/chromium/content/browser/shapedetection/FaceDetectionImpl.java

Index: content/public/android/java/src/org/chromium/content/browser/shapedetection/FaceDetectionImpl.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/shapedetection/FaceDetectionImpl.java b/content/public/android/java/src/org/chromium/content/browser/shapedetection/FaceDetectionImpl.java
deleted file mode 100644
index dfb6fb63638d82a86283d92caf6676979b6991e8..0000000000000000000000000000000000000000
--- a/content/public/android/java/src/org/chromium/content/browser/shapedetection/FaceDetectionImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-// 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.content.browser.shapedetection;
-
-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 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) {
-        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)) {
-            Log.d(TAG, "Invalid argument(s).");
-            callback.call(new FaceDetectionResult());
-            return;
-        }
-
-        ByteBuffer imageBuffer = frameData.map(0, numPixels * 4, MapFlags.none());
-        if (imageBuffer.capacity() <= 0) {
-            Log.d(TAG, "Failed to map from SharedBufferHandle.");
-            callback.call(new FaceDetectionResult());
-            return;
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-
-        // 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.
-        // 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
-        // original image is premultiplied. We can use getPixels() which does
-        // the unmultiplication while copying to a new array. See
-        // http://androidxref.com/7.0.0_r1/xref/frameworks/base/graphics/java/android/graphics/Bitmap.java#538
-        int[] pixels = new int[width * height];
-        bitmap.getPixels(pixels, 0, width, 0, 0, width, height);
-        final Bitmap unPremultipliedBitmap =
-                Bitmap.createBitmap(pixels, width, height, Bitmap.Config.RGB_565);
-
-        // FaceDetector creation and findFaces() might take a long time and trigger a
-        // "StrictMode policy violation": they should happen in a background thread.
-        AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {
-            @Override
-            public void run() {
-                final FaceDetector detector = new FaceDetector(width, height, mMaxFaces);
-                Face[] detectedFaces = new Face[mMaxFaces];
-                // findFaces() will stop at |mMaxFaces|.
-                final int numberOfFaces = detector.findFaces(unPremultipliedBitmap, detectedFaces);
-
-                FaceDetectionResult faceDetectionResult = new FaceDetectionResult();
-                faceDetectionResult.boundingBoxes = new RectF[numberOfFaces];
-                for (int i = 0; i < numberOfFaces; i++) {
-                    final Face face = detectedFaces[i];
-                    final PointF midPoint = new PointF();
-                    face.getMidPoint(midPoint);
-                    final float eyesDistance = face.eyesDistance();
-
-                    RectF boundingBox = new RectF();
-                    boundingBox.x = midPoint.x - eyesDistance;
-                    boundingBox.y = midPoint.y - eyesDistance;
-                    boundingBox.width = 2 * eyesDistance;
-                    boundingBox.height = 2 * eyesDistance;
-
-                    // TODO(xianglu): Consider adding Face.confidence and Face.pose.
-                    faceDetectionResult.boundingBoxes[i] = boundingBox;
-                }
-
-                callback.call(faceDetectionResult);
-            }
-        });
-    }
-
-    @Override
-    public void close() {}
-
-    @Override
-    public void onConnectionError(MojoException e) {
-        close();
-    }
-}