From 4e38c7e623eaa7dc1219ab5291858e05703350c2 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Fri, 6 Jan 2023 16:15:32 +0530 Subject: [PATCH 1/7] Updated documentation for MPPCommon.h --- mediapipe/tasks/ios/common/sources/MPPCommon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediapipe/tasks/ios/common/sources/MPPCommon.h b/mediapipe/tasks/ios/common/sources/MPPCommon.h index 7ce791d12..09a61e20d 100644 --- a/mediapipe/tasks/ios/common/sources/MPPCommon.h +++ b/mediapipe/tasks/ios/common/sources/MPPCommon.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN /** * @enum MPPTasksErrorCode - * This enum specifies error codes for Mediapipe Task Library. + * This enum specifies error codes for MediaPipe Task Library. * It maintains a 1:1 mapping to MediaPipeTasksStatus of the C ++libray. */ typedef NS_ENUM(NSUInteger, MPPTasksErrorCode) { From f37689fc33de306cead655cadfd283430fc5003f Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Fri, 6 Jan 2023 16:15:53 +0530 Subject: [PATCH 2/7] Updated documentation for MPPCommonUtils.m --- mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.h | 2 +- mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.h b/mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.h index 5404a074d..69c28b916 100644 --- a/mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.h +++ b/mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN -/** Error domain of Mediapipe Task related errors. */ +/** Error domain of MediaPipe Task related errors. */ extern NSString *const MPPTasksErrorDomain; /** Helper utility for the all tasks which encapsulates common functionality. */ diff --git a/mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.mm b/mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.mm index 8234ac6d3..1a37f8465 100644 --- a/mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.mm +++ b/mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.mm @@ -96,7 +96,7 @@ NSString *const MPPTasksErrorDomain = @"com.google.mediapipe.tasks"; // The mapping to absl::Status::code() is done to generate a more specific error code than // MPPTasksErrorCodeError in cases when the payload can't be mapped to // MPPTasksErrorCode. This can happen when absl::Status returned by TFLite library are in turn - // returned without modification by Mediapipe cc library methods. + // returned without modification by MediaPipe cc library methods. if (errorCode > MPPTasksErrorCodeLast || errorCode <= MPPTasksErrorCodeFirst) { switch (status.code()) { case absl::StatusCode::kInternal: From 27ce2ec00f0fd5526c186c9b92e570a3acdca58c Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Fri, 6 Jan 2023 16:22:11 +0530 Subject: [PATCH 3/7] Updated C++ types to camel case in MPPTaskInfo --- .../tasks/ios/core/sources/MPPTaskInfo.mm | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskInfo.mm b/mediapipe/tasks/ios/core/sources/MPPTaskInfo.mm index 5f2290497..ae6ed2a70 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskInfo.mm +++ b/mediapipe/tasks/ios/core/sources/MPPTaskInfo.mm @@ -13,6 +13,7 @@ // limitations under the License. #import "mediapipe/tasks/ios/core/sources/MPPTaskInfo.h" + #import "mediapipe/tasks/ios/common/sources/MPPCommon.h" #import "mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.h" #import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" @@ -69,59 +70,59 @@ using ::mediapipe::InputStreamInfo; } - (CalculatorGraphConfig)generateGraphConfig { - CalculatorGraphConfig graph_config; + CalculatorGraphConfig graphConfig; - Node *task_subgraph_node = graph_config.add_node(); - task_subgraph_node->set_calculator(self.taskGraphName.cppString); - [self.taskOptions copyToProto:task_subgraph_node->mutable_options()]; + Node *taskSubgraphNode = graphConfig.add_node(); + taskSubgraphNode->set_calculator(self.taskGraphName.cppString); + [self.taskOptions copyToProto:taskSubgraphNode->mutable_options()]; for (NSString *outputStream in self.outputStreams) { - auto cpp_output_stream = std::string(outputStream.cppString); - task_subgraph_node->add_output_stream(cpp_output_stream); - graph_config.add_output_stream(cpp_output_stream); + auto cppOutputStream = std::string(outputStream.cppString); + taskSubgraphNode->add_output_stream(cppOutputStream); + graphConfig.add_output_stream(cppOutputStream); } if (!self.enableFlowLimiting) { for (NSString *inputStream in self.inputStreams) { - auto cpp_input_stream = inputStream.cppString; - task_subgraph_node->add_input_stream(cpp_input_stream); - graph_config.add_input_stream(cpp_input_stream); + auto cppInputStream = inputStream.cppString; + taskSubgraphNode->add_input_stream(cppInputStream); + graphConfig.add_input_stream(cppInputStream); } - return graph_config; + return graphConfig; } - Node *flow_limit_calculator_node = graph_config.add_node(); + Node *flowLimitCalculatorNode = graphConfig.add_node(); - flow_limit_calculator_node->set_calculator("FlowLimiterCalculator"); + flowLimitCalculatorNode->set_calculator("FlowLimiterCalculator"); - InputStreamInfo *input_stream_info = flow_limit_calculator_node->add_input_stream_info(); - input_stream_info->set_tag_index("FINISHED"); - input_stream_info->set_back_edge(true); + InputStreamInfo *inputStreamInfo = flowLimitCalculatorNode->add_input_stream_info(); + inputStreamInfo->set_tag_index("FINISHED"); + inputStreamInfo->set_back_edge(true); - FlowLimiterCalculatorOptions *flow_limit_calculator_options = - flow_limit_calculator_node->mutable_options()->MutableExtension( + FlowLimiterCalculatorOptions *flowLimitCalculatorOptions = + flowLimitCalculatorNode->mutable_options()->MutableExtension( FlowLimiterCalculatorOptions::ext); - flow_limit_calculator_options->set_max_in_flight(1); - flow_limit_calculator_options->set_max_in_queue(1); + flowLimitCalculatorOptions->set_max_in_flight(1); + flowLimitCalculatorOptions->set_max_in_queue(1); for (NSString *inputStream in self.inputStreams) { - graph_config.add_input_stream(inputStream.cppString); + graphConfig.add_input_stream(inputStream.cppString); NSString *strippedInputStream = [MPPTaskInfo stripTagIndex:inputStream]; - flow_limit_calculator_node->add_input_stream(strippedInputStream.cppString); + flowLimitCalculatorNode->add_input_stream(strippedInputStream.cppString); NSString *taskInputStream = [MPPTaskInfo addStreamNamePrefix:inputStream]; - task_subgraph_node->add_input_stream(taskInputStream.cppString); + taskSubgraphNode->add_input_stream(taskInputStream.cppString); NSString *strippedTaskInputStream = [MPPTaskInfo stripTagIndex:taskInputStream]; - flow_limit_calculator_node->add_output_stream(strippedTaskInputStream.cppString); + flowLimitCalculatorNode->add_output_stream(strippedTaskInputStream.cppString); } NSString *firstOutputStream = self.outputStreams[0]; - auto finished_output_stream = "FINISHED:" + firstOutputStream.cppString; - flow_limit_calculator_node->add_input_stream(finished_output_stream); + auto finishedOutputStream = "FINISHED:" + firstOutputStream.cppString; + flowLimitCalculatorNode->add_input_stream(finishedOutputStream); - return graph_config; + return graphConfig; } + (NSString *)stripTagIndex:(NSString *)tagIndexName { From 61d16b284b9d0b063a61f31ae9565532f6e69798 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Fri, 6 Jan 2023 16:23:22 +0530 Subject: [PATCH 4/7] Updated comments in MPPTaskOptions.h --- mediapipe/tasks/ios/core/sources/MPPTaskOptions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskOptions.h b/mediapipe/tasks/ios/core/sources/MPPTaskOptions.h index ee2f7d032..e10678348 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskOptions.h +++ b/mediapipe/tasks/ios/core/sources/MPPTaskOptions.h @@ -25,7 +25,7 @@ NS_SWIFT_NAME(TaskOptions) @interface MPPTaskOptions : NSObject /** - * Base options for configuring the Mediapipe task. + * Base options for configuring the MediaPipe task. */ @property(nonatomic, copy) MPPBaseOptions *baseOptions; From 16f9831c3fece5d9907868ea60c7bb7fb0c01cc5 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Fri, 6 Jan 2023 16:23:37 +0530 Subject: [PATCH 5/7] Updated formatting in MPPTaskOptions.m --- mediapipe/tasks/ios/core/sources/MPPTaskOptions.m | 1 + 1 file changed, 1 insertion(+) diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskOptions.m b/mediapipe/tasks/ios/core/sources/MPPTaskOptions.m index fe74517c3..ad11bbc6e 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskOptions.m +++ b/mediapipe/tasks/ios/core/sources/MPPTaskOptions.m @@ -13,6 +13,7 @@ // limitations under the License. #import "mediapipe/tasks/ios/core/sources/MPPTaskOptions.h" + #import "mediapipe/tasks/ios/core/sources/MPPBaseOptions.h" @implementation MPPTaskOptions From bc1b069edf818e9431697ceb040cc1c105984ef3 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Fri, 6 Jan 2023 16:24:41 +0530 Subject: [PATCH 6/7] Updated property name in MPPTaskResult --- mediapipe/tasks/ios/core/sources/MPPTaskResult.h | 4 ++-- mediapipe/tasks/ios/core/sources/MPPTaskResult.m | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskResult.h b/mediapipe/tasks/ios/core/sources/MPPTaskResult.h index d15d4f258..4ee7b2fc6 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskResult.h +++ b/mediapipe/tasks/ios/core/sources/MPPTaskResult.h @@ -26,11 +26,11 @@ NS_SWIFT_NAME(TaskResult) /** * Timestamp that is associated with the task result object. */ -@property(nonatomic, assign, readonly) long timestamp; +@property(nonatomic, assign, readonly) NSInteger timestampMs; - (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithTimestamp:(long)timestamp NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithTimestampMs:(NSInteger)timestampMs NS_DESIGNATED_INITIALIZER; @end diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskResult.m b/mediapipe/tasks/ios/core/sources/MPPTaskResult.m index 7088eb246..6c08014ff 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskResult.m +++ b/mediapipe/tasks/ios/core/sources/MPPTaskResult.m @@ -16,16 +16,16 @@ @implementation MPPTaskResult -- (instancetype)initWithTimestamp:(long)timestamp { +- (instancetype)initWithTimestampMs:(NSInteger)timestampMs { self = [super init]; if (self) { - _timestamp = timestamp; + _timestampMs = timestampMs; } return self; } - (id)copyWithZone:(NSZone *)zone { - return [[MPPTaskResult alloc] initWithTimestamp:self.timestamp]; + return [[MPPTaskResult alloc] initWithTimestampMs:self.timestampMs]; } @end From c6bae99a2fc120c4de58f352dc64b6dc0aff728b Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Fri, 6 Jan 2023 16:25:56 +0530 Subject: [PATCH 7/7] Updated formatting in MPPTextPacketCreator.mm --- mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm b/mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm index ca86e7a0b..fb59b363d 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm +++ b/mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm @@ -13,6 +13,7 @@ // limitations under the License. #import "mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.h" + #import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" namespace {