Merge pull request #229 from st-tuanmai/update/ios_object_detecter

Update ios object detection to add inference time and update pod to 0.10.5
google-ai-edge · Sep 21, 2023 · 54d2a65 · 54d2a65
2 parents 510664c + 84019f5
commit 54d2a65
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 24 deletions.
diff --git a/examples/object_detection/ios/ObjectDetector/ViewControllers/BottomSheetViewController.swift b/examples/object_detection/ios/ObjectDetector/ViewControllers/BottomSheetViewController.swift
@@ -14,7 +14,7 @@
 
 import UIKit
 
-protocol InferenceViewControllerDelegate: AnyObject {
+protocol BottomSheetViewControllerDelegate: AnyObject {
   /**
    This method is called when the user opens or closes the bottom sheet.
   **/
@@ -36,7 +36,7 @@ class BottomSheetViewController: UIViewController {
   }
 
   // MARK: Delegates
-  weak var delegate: InferenceViewControllerDelegate?
+  weak var delegate: BottomSheetViewControllerDelegate?
 
   // MARK: Storyboards Connections
   @IBOutlet weak var choseModelButton: UIButton!

diff --git a/...ples/object_detection/ios/ObjectDetector/ViewControllers/MediaLibraryViewController.swift b/...ples/object_detection/ios/ObjectDetector/ViewControllers/MediaLibraryViewController.swift
@@ -34,6 +34,7 @@ class MediaLibraryViewController: UIViewController {
   }
   // MARK: Object Detector Service
   weak var interfaceUpdatesDelegate: InterfaceUpdatesDelegate?
+  weak var inferenceResultDeliveryDelegate: InferenceResultDeliveryDelegate?
 
   // MARK: Controllers that manage functionality
   private lazy var pickerController = UIImagePickerController()
@@ -235,7 +236,9 @@ extension MediaLibraryViewController: UIImagePickerControllerDelegate, UINavigat
           inferenceIntervalInMilliseconds: Constants.inferenceTimeIntervalInMilliseconds)
 
         hideProgressView()
-
+        DispatchQueue.main.async {
+          self.inferenceResultDeliveryDelegate?.didPerformInference(result: resultBundle)
+        }
         playVideo(
           mediaURL: mediaURL,
           videoDuration: videoDuration,
@@ -257,10 +260,11 @@ extension MediaLibraryViewController: UIImagePickerControllerDelegate, UINavigat
 
       DispatchQueue.global(qos: .userInteractive).async { [weak self] in
         guard let weakSelf = self,
-              let objectDetectorResult = weakSelf
+              let resultBundle = weakSelf
                 .objectDetectorService?
-                .detect(image: image)?
-                .objectDetectorResults.first as? ObjectDetectorResult else {
+                .detect(image: image),
+              let objectDetectorResult =
+                resultBundle.objectDetectorResults.first as? ObjectDetectorResult else {
           DispatchQueue.main.async {
             self?.hideProgressView()
           }
@@ -269,6 +273,7 @@ extension MediaLibraryViewController: UIImagePickerControllerDelegate, UINavigat
 
         DispatchQueue.main.async {
           weakSelf.hideProgressView()
+          weakSelf.inferenceResultDeliveryDelegate?.didPerformInference(result: resultBundle)
           weakSelf.overlayView.draw(
             objectOverlays:OverlayView.objectOverlays(
               fromDetections: objectDetectorResult.detections,
@@ -362,6 +367,7 @@ extension MediaLibraryViewController: UIImagePickerControllerDelegate, UINavigat
   }
 }
 
+// MARK: ObjectDetectorServiceVideoDelegate
 extension MediaLibraryViewController: ObjectDetectorServiceVideoDelegate {
 
   func objectDetectorService(

diff --git a/examples/object_detection/ios/ObjectDetector/ViewControllers/RootViewController.swift b/examples/object_detection/ios/ObjectDetector/ViewControllers/RootViewController.swift
@@ -132,6 +132,7 @@ class RootViewController: UIViewController {
     }
 
     viewController.interfaceUpdatesDelegate = self
+    viewController.inferenceResultDeliveryDelegate = self
     mediaLibraryViewController = viewController
   }
 
@@ -227,8 +228,8 @@ extension RootViewController: InterfaceUpdatesDelegate {
   }
 }
 
-// MARK: InferenceViewControllerDelegate Methods
-extension RootViewController: InferenceViewControllerDelegate {
+// MARK: BottomSheetViewControllerDelegate Methods
+extension RootViewController: BottomSheetViewControllerDelegate {
   func viewController(
     _ viewController: BottomSheetViewController,
     didSwitchBottomSheetViewState isOpen: Bool) {

diff --git a/examples/object_detection/ios/ObjectDetectorTests/ObjectDetectorTests.swift b/examples/object_detection/ios/ObjectDetectorTests/ObjectDetectorTests.swift
@@ -26,16 +26,16 @@ final class ObjectDetectorTests: XCTestCase {
 
   static let efficientnetLite0Results: [Detection] = [
     Detection(
-      categories: [ResultCategory(index: -1, score: 0.94170237, categoryName: "person", displayName: nil)],
-      boundingBox: CGRect(x: 214.0, y: 12.0, width: 120.0, height: 261.0),
+      categories: [ResultCategory(index: -1, score: 0.9396609, categoryName: "person", displayName: nil)],
+      boundingBox: CGRect(x: 214.0, y: 11.0, width: 120.0, height: 262.0),
       keypoints: nil),
     Detection(
-      categories: [ResultCategory(index: -1, score: 0.7796736, categoryName: "dog", displayName: nil)],
-      boundingBox: CGRect(x: 66.0, y: 254.0, width: 56.0, height: 76.0),
+      categories: [ResultCategory(index: -1, score: 0.77432173, categoryName: "dog", displayName: nil)],
+      boundingBox: CGRect(x: 66.0, y: 254.0, width: 57.0, height: 77.0),
       keypoints: nil),
     Detection(
-      categories: [ResultCategory(index: -1, score: 0.6708669, categoryName: "person", displayName: nil)],
-      boundingBox: CGRect(x: 144.0, y: 18.0, width: 82.0, height: 242.0),
+      categories: [ResultCategory(index: -1, score: 0.6645179, categoryName: "person", displayName: nil)],
+      boundingBox: CGRect(x: 144.0, y: 18.0, width: 82.0, height: 243.0),
       keypoints: nil)
   ]
 
@@ -45,8 +45,8 @@ final class ObjectDetectorTests: XCTestCase {
       boundingBox: CGRect(x: 71.0, y: 254.0, width: 53.0, height: 74.0),
       keypoints: nil),
     Detection(
-      categories: [ResultCategory(index: -1, score: 0.90384406, categoryName: "person", displayName: nil)],
-      boundingBox: CGRect(x: 207.0, y: 8.0, width: 126.0, height: 264.0),
+      categories: [ResultCategory(index: -1, score: 0.90494984, categoryName: "person", displayName: nil)],
+      boundingBox: CGRect(x: 207.0, y: 8.0, width: 126.0, height: 263.0),
       keypoints: nil),
     Detection(
       categories: [ResultCategory(index: -1, score: 0.810646474, categoryName: "person", displayName: nil)],

diff --git a/examples/object_detection/ios/Podfile b/examples/object_detection/ios/Podfile
@@ -3,7 +3,7 @@ platform :ios, '15.0'
 target 'ObjectDetector' do
 
   use_frameworks!
-  pod 'MediaPipeTasksVision', '0.10.3'
+  pod 'MediaPipeTasksVision', '0.10.5'
 
   # Pods for ObjectDetector
 end

diff --git a/examples/object_detection/ios/Podfile.lock b/examples/object_detection/ios/Podfile.lock
@@ -1,20 +1,20 @@
 PODS:
-  - MediaPipeTasksCommon (0.10.3)
-  - MediaPipeTasksVision (0.10.3):
-    - MediaPipeTasksCommon (= 0.10.3)
+  - MediaPipeTasksCommon (0.10.5)
+  - MediaPipeTasksVision (0.10.5):
+    - MediaPipeTasksCommon (= 0.10.5)
 
 DEPENDENCIES:
-  - MediaPipeTasksVision (= 0.10.3)
+  - MediaPipeTasksVision (= 0.10.5)
 
 SPEC REPOS:
   trunk:
     - MediaPipeTasksCommon
     - MediaPipeTasksVision
 
 SPEC CHECKSUMS:
-  MediaPipeTasksCommon: 8377139fdc9b3e88898789197f2dba15457c2879
-  MediaPipeTasksVision: c0e0e8ea10966486cb4ce0d67e159165fb9d48e6
+  MediaPipeTasksCommon: 235e81afa9f7bd5b5b39f00a858bfb2539d1a52f
+  MediaPipeTasksVision: d58f3a82c9fbda8c3be1bf2a1bf4d73e56a457e3
 
-PODFILE CHECKSUM: c69ac5ea605672a2497ed4d4f1ed09b61c33c95a
+PODFILE CHECKSUM: 2e1cd95933b8c68f98c3d3290332c555b26ed4e5
 
 COCOAPODS: 1.12.1