From 6d7f172e9fdd77b44db0a1228c32cf95fa9d693d Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Thu, 2 Mar 2023 19:35:05 +0530 Subject: [PATCH] Changed return type of process method in MPPTaskRunner --- mediapipe/tasks/ios/core/sources/MPPTaskRunner.h | 4 ++-- mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskRunner.h b/mediapipe/tasks/ios/core/sources/MPPTaskRunner.h index fbb12295f..b2881ac06 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskRunner.h +++ b/mediapipe/tasks/ios/core/sources/MPPTaskRunner.h @@ -17,6 +17,8 @@ #include "mediapipe/framework/calculator.pb.h" #include "mediapipe/tasks/cc/core/task_runner.h" +#include + NS_ASSUME_NONNULL_BEGIN /** @@ -72,8 +74,6 @@ NS_ASSUME_NONNULL_BEGIN * caller's responsibility to synchronize access to this method across multiple threads and to * ensure that the input packet timestamps are in order. */ -- (absl::StatusOr)process: - (const mediapipe::tasks::core::PacketMap &)packetMap; - (std::optional) processPacketMap:(const mediapipe::tasks::core::PacketMap &)packetMap error:(NSError **)error; diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm b/mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm index f7db95536..a57846338 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm +++ b/mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm @@ -50,8 +50,14 @@ using TaskRunnerCpp = ::mediapipe::tasks::core::TaskRunner; return self; } -- (absl::StatusOr)process:(const PacketMap &)packetMap { - return _cppTaskRunner->Process(packetMap); +- (std::optional)processPacketMap:(const PacketMap &)packetMap error:(NSError **)error { + absl::StatusOr resultPacketMap = _cppTaskRunner->Process(packetMap); + if (![MPPCommonUtils checkCppError:resultPacketMap.status() toError:error]) { + return std::nullopt; + } + return resultPacketMap.value(); +} + - (BOOL)sendPacketMap:(const PacketMap &)packetMap error:(NSError **)error { absl::Status sendStatus = _cppTaskRunner->Send(packetMap); return [MPPCommonUtils checkCppError:sendStatus toError:error];