From a503fb53e0163dbe5ed9923c506a74252af5743f Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Thu, 16 Feb 2023 01:31:29 +0530 Subject: [PATCH] Updated MPPVisionTaskRunner --- mediapipe/tasks/ios/vision/core/BUILD | 6 ++++-- .../ios/vision/core/sources/MPPVisionTaskRunner.h | 10 ++-------- .../ios/vision/core/sources/MPPVisionTaskRunner.mm | 8 +++++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/mediapipe/tasks/ios/vision/core/BUILD b/mediapipe/tasks/ios/vision/core/BUILD index 360eb1cf..1364d967 100644 --- a/mediapipe/tasks/ios/vision/core/BUILD +++ b/mediapipe/tasks/ios/vision/core/BUILD @@ -38,9 +38,11 @@ objc_library( ], deps = [ ":MPPRunningMode", - "//mediapipe/tasks/ios/common:MPPCommon", - "//mediapipe/tasks/ios/common/utils:MPPCommonUtils", "//mediapipe/tasks/ios/core:MPPTaskRunner", + "//mediapipe/tasks/ios/core:MPPVisionPacketCreator", + ], +) + objc_library( name = "MPPVisionPacketCreator", srcs = ["sources/MPPVisionPacketCreator.mm"], diff --git a/mediapipe/tasks/ios/vision/core/sources/MPPVisionTaskRunner.h b/mediapipe/tasks/ios/vision/core/sources/MPPVisionTaskRunner.h index 84b65730..b33cd3c8 100644 --- a/mediapipe/tasks/ios/vision/core/sources/MPPVisionTaskRunner.h +++ b/mediapipe/tasks/ios/vision/core/sources/MPPVisionTaskRunner.h @@ -13,7 +13,6 @@ // limitations under the License. #import - #import "mediapipe/tasks/ios/core/sources/MPPTaskRunner.h" #import "mediapipe/tasks/ios/vision/core/sources/MPPRunningMode.h" @@ -42,8 +41,8 @@ NS_ASSUME_NONNULL_BEGIN * intended to deliver inference results must be provided. In case of image or video running mode, * packets callback must be set to nil. * - * @param error Pointer to the memory location where errors if any should be saved. If @c NULL, no - * error will be saved. + * @param error Pointer to the memory location where errors if any should be + * saved. If @c NULL, no error will be saved. * * @return An instance of `MPPVisionTaskRunner` initialized to the given MediaPipe calculator config * proto, running mode and packets callback. @@ -54,11 +53,6 @@ NS_ASSUME_NONNULL_BEGIN (mediapipe::tasks::core::PacketsCallback)packetsCallback error:(NSError **)error NS_DESIGNATED_INITIALIZER; -- (instancetype)initWithCalculatorGraphConfig:(mediapipe::CalculatorGraphConfig)graphConfig - packetsCallback: - (mediapipe::tasks::core::PacketsCallback)packetsCallback - error:(NSError **)error NS_UNAVAILABLE; - - (instancetype)init NS_UNAVAILABLE; + (instancetype)new NS_UNAVAILABLE; diff --git a/mediapipe/tasks/ios/vision/core/sources/MPPVisionTaskRunner.mm b/mediapipe/tasks/ios/vision/core/sources/MPPVisionTaskRunner.mm index bfa9e34e..7c39bf80 100644 --- a/mediapipe/tasks/ios/vision/core/sources/MPPVisionTaskRunner.mm +++ b/mediapipe/tasks/ios/vision/core/sources/MPPVisionTaskRunner.mm @@ -19,7 +19,8 @@ namespace { using ::mediapipe::CalculatorGraphConfig; -using ::mediapipe::tasks::core::PacketsCallback; +using ::mediapipe::Packet; +using ::mediapipe::tasks::core::PacketMap; } // namespace @interface MPPVisionTaskRunner () { @@ -29,9 +30,10 @@ using ::mediapipe::tasks::core::PacketsCallback; @implementation MPPVisionTaskRunner -- (nullable instancetype)initWithCalculatorGraphConfig:(CalculatorGraphConfig)graphConfig +- (nullable instancetype)initWithCalculatorGraphConfig:(mediapipe::CalculatorGraphConfig)graphConfig runningMode:(MPPRunningMode)runningMode - packetsCallback:(PacketsCallback)packetsCallback + packetsCallback: + (mediapipe::tasks::core::PacketsCallback)packetsCallback error:(NSError **)error { switch (runningMode) { case MPPRunningModeImage: