Add support for ML Kit Object Detection and Tracking #1274

Author: EddyVerbruggen

demo-ng/app/tabs/mlkit/objectdetection/objectdetection.component.html

@@ -8,6 +8,7 @@
       height="100%"
       classify="true"
       multiple="false"
+      processEveryNthFrame="20"
       [torchOn]="torchOn"
       (scanResult)="onObjectDetectionResult($event)">
   </MLKitObjectDetection>

src/mlkit/mlkit-cameraview.android.ts

@@ -143,9 +143,6 @@ export abstract class MLKitCameraView extends MLKitCameraViewBase {
         const pictureSize = sizePair.pictureSize;
         const previewSize = sizePair.previewSize;
 
-        console.log("sizePair.pictureSize: " + pictureSize.width + "x" + pictureSize.height);
-        console.log("sizePair.previewSize: " + previewSize.width + "x" + previewSize.height);
-
         const parameters = this.camera.getParameters();
 
         if (pictureSize) {
@@ -203,7 +200,6 @@ export abstract class MLKitCameraView extends MLKitCameraViewBase {
             }
 
             let data = this.pendingFrameData;
-            // pendingFrameData = null;
 
             if (this.detector.processImage) {
               this.lastVisionImage = com.google.firebase.ml.vision.common.FirebaseVisionImage.fromByteBuffer(data, metadata);

src/mlkit/objectdetection/index.android.ts

@@ -8,13 +8,13 @@ declare const com: any;
 export class MLKitObjectDetection extends MLKitObjectDetectionBase {
 
   protected createDetector(): any {
-    return getDetector(true, this.classify, this.multiple);
+    return getDetector(this.classify, this.multiple);
   }
 
   protected createSuccessListener(): any {
     return new com.google.android.gms.tasks.OnSuccessListener({
       onSuccess: objects => {
-        console.log(">> onSuccess @ " + new Date().getTime() + ", objects: " + objects);
+        console.log(">> onSuccess @ " + new Date().getTime() + ", objects: " + objects.size());
 
         if (objects.size() === 0) return;
 
@@ -37,9 +37,9 @@ export class MLKitObjectDetection extends MLKitObjectDetectionBase {
   }
 }
 
-function getDetector(stream: boolean, classify: boolean, multiple: boolean): com.google.firebase.ml.vision.objects.FirebaseVisionObjectDetector {
+function getDetector(classify: boolean, multiple: boolean): com.google.firebase.ml.vision.objects.FirebaseVisionObjectDetector {
   const builder = new com.google.firebase.ml.vision.objects.FirebaseVisionObjectDetectorOptions.Builder()
-      .setDetectorMode(stream ? com.google.firebase.ml.vision.objects.FirebaseVisionObjectDetectorOptions.STREAM_MODE : com.google.firebase.ml.vision.objects.FirebaseVisionObjectDetectorOptions.SINGLE_IMAGE_MODE);
+      .setDetectorMode(com.google.firebase.ml.vision.objects.FirebaseVisionObjectDetectorOptions.SINGLE_IMAGE_MODE);
 
   if (classify) {
     builder.enableClassification();
@@ -55,7 +55,7 @@ function getDetector(stream: boolean, classify: boolean, multiple: boolean): com
 export function detectObjects(options: MLKitObjectDetectionOptions): Promise<MLKitObjectDetectionResult> {
   return new Promise((resolve, reject) => {
     try {
-      const firebaseObjectDetector = getDetector(false, options.classify, options.multiple);
+      const firebaseObjectDetector = getDetector(options.classify, options.multiple);
 
       const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
         onSuccess: objects => {