Use different EXFaceDetectorManagers for different EXCamera instances (…

…expo#2998) fbshipit-source-id: 54d3228
lautaro-osacar · Aug 16, 2018 · a75b455 · a75b455
1 parent c7ef50d
commit a75b455
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 25 deletions.
diff --git a/modules/expo-camera/ios/EXCamera/EXCamera.m b/modules/expo-camera/ios/EXCamera/EXCamera.m
@@ -5,7 +5,7 @@
 #import <EXCamera/EXCameraManager.h>
 #import <EXPermissionsInterface/EXPermissionsInterface.h>
 #import <EXFileSystemInterface/EXFileSystemInterface.h>
-#import <EXFaceDetectorInterface/EXFaceDetectorManager.h>
+#import <EXFaceDetectorInterface/EXFaceDetectorManagerProvider.h>
 #import <EXCore/EXAppLifecycleService.h>
 #import <EXCore/EXUtilities.h>
 
@@ -831,23 +831,28 @@ - (void)captureOutput:(AVCaptureFileOutput *)captureOutput didFinishRecordingToO
 
 - (id)createFaceDetectorManager
 {
-  id <EXFaceDetectorManager> faceDetector = [_moduleRegistry getModuleImplementingProtocol:@protocol(EXFaceDetectorManager)];
-  if (faceDetector) {
-    __weak EXCamera *weakSelf = self;
-    [faceDetector setOnFacesDetected:^(NSArray<NSDictionary *> *faces) {
-      __strong EXCamera *strongSelf = weakSelf;
-      if (strongSelf) {
-        if (strongSelf.onFacesDetected) {
-          strongSelf.onFacesDetected(@{
-                                       @"type": @"face",
-                                       @"faces": faces
-                                       });
+  id <EXFaceDetectorManagerProvider> faceDetectorProvider = [_moduleRegistry getModuleImplementingProtocol:@protocol(EXFaceDetectorManagerProvider)];
+
+  if (faceDetectorProvider) {
+    id <EXFaceDetectorManager> faceDetector = [faceDetectorProvider createFaceDetectorManager];
+    if (faceDetector) {
+      __weak EXCamera *weakSelf = self;
+      [faceDetector setOnFacesDetected:^(NSArray<NSDictionary *> *faces) {
+        __strong EXCamera *strongSelf = weakSelf;
+        if (strongSelf) {
+          if (strongSelf.onFacesDetected) {
+            strongSelf.onFacesDetected(@{
+                                         @"type": @"face",
+                                         @"faces": faces
+                                         });
+          }
         }
-      }
-    }];
-    [faceDetector setSessionQueue:_sessionQueue];
+      }];
+      [faceDetector setSessionQueue:_sessionQueue];
+    }
+    return faceDetector;
   }
-  return faceDetector;
+  return nil;
 }
 
 @end

diff --git a/.../expo-face-detector-interface/ios/EXFaceDetectorInterface/EXFaceDetectorManagerProvider.h b/.../expo-face-detector-interface/ios/EXFaceDetectorInterface/EXFaceDetectorManagerProvider.h
@@ -0,0 +1,9 @@
+// Copyright © 2018 650 Industries. All rights reserved.
+
+#import <EXFaceDetectorInterface/EXFaceDetectorManager.h>
+
+@protocol EXFaceDetectorManagerProvider
+
+- (id<EXFaceDetectorManager>)createFaceDetectorManager;
+
+@end
diff --git a/modules/expo-face-detector/ios/EXFaceDetector/EXFaceDetectorManager.h b/modules/expo-face-detector/ios/EXFaceDetector/EXFaceDetectorManager.h
@@ -10,9 +10,9 @@
 #import <AVFoundation/AVFoundation.h>
 #import <GoogleMobileVision/GoogleMobileVision.h>
 #import <GoogleMVDataOutput/GoogleMVDataOutput.h>
-#import <EXCore/EXInternalModule.h>
+#import <EXFaceDetectorInterface/EXFaceDetectorManager.h>
 
-@interface EXFaceDetectorManager : NSObject <EXInternalModule>
+@interface EXFaceDetectorManager : NSObject <EXFaceDetectorManager>
 
 - (void)setOnFacesDetected:(void (^)(NSArray<NSDictionary *> *))onFacesDetected;
 

diff --git a/modules/expo-face-detector/ios/EXFaceDetector/EXFaceDetectorManager.m b/modules/expo-face-detector/ios/EXFaceDetector/EXFaceDetectorManager.m
@@ -4,7 +4,6 @@
 //
 //  Created by Stanisław Chmiela on 22.11.2017.
 //  Copyright © 2017 650 Industries. All rights reserved.
-//
 
 #import <EXFaceDetector/EXFaceEncoder.h>
 #import <EXFaceDetector/EXFaceDetectorUtils.h>
@@ -32,12 +31,6 @@ @interface EXFaceDetectorManager() <GMVDataOutputDelegate>
 
 @implementation EXFaceDetectorManager
 
-EX_REGISTER_MODULE();
-
-+ (const NSArray<Protocol *> *)exportedInterfaces {
-  return @[@protocol(EXFaceDetectorManager)];
-}
-
 static NSDictionary *defaultFaceDetectorOptions = nil;
 
 - (instancetype)init

diff --git a/modules/expo-face-detector/ios/EXFaceDetector/EXFaceDetectorManagerProvider.h b/modules/expo-face-detector/ios/EXFaceDetector/EXFaceDetectorManagerProvider.h
@@ -0,0 +1,9 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#import <Foundation/Foundation.h>
+#import <EXCore/EXInternalModule.h>
+#import <EXFaceDetectorInterface/EXFaceDetectorManagerProvider.h>
+
+@interface EXFaceDetectorManagerProvider : NSObject <EXInternalModule, EXFaceDetectorManagerProvider>
+
+@end
diff --git a/modules/expo-face-detector/ios/EXFaceDetector/EXFaceDetectorManagerProvider.m b/modules/expo-face-detector/ios/EXFaceDetector/EXFaceDetectorManagerProvider.m
@@ -0,0 +1,18 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#import <EXFaceDetector/EXFaceDetectorManagerProvider.h>
+#import <EXFaceDetector/EXFaceDetectorManager.h>
+
+@implementation EXFaceDetectorManagerProvider
+
+EX_REGISTER_MODULE();
+
++ (const NSArray<Protocol *> *)exportedInterfaces {
+  return @[@protocol(EXFaceDetectorManagerProvider)];
+}
+
+- (id<EXFaceDetectorManager>)createFaceDetectorManager {
+  return [[EXFaceDetectorManager alloc] init];
+}
+
+@end