From 79c8cfb7307a961854288abbf5467a000ff64bca Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Thu, 6 Apr 2023 21:39:56 +0530 Subject: [PATCH] Added MPPObjectDetectorOptionsHelpers --- .../ios/vision/object_detector/utils/BUILD | 32 +++++++++++ .../MPPObjectDetectorOptions+Helpers.h | 32 +++++++++++ .../MPPObjectDetectorOptions+Helpers.mm | 54 +++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 mediapipe/tasks/ios/vision/object_detector/utils/BUILD create mode 100644 mediapipe/tasks/ios/vision/object_detector/utils/sources/MPPObjectDetectorOptions+Helpers.h create mode 100644 mediapipe/tasks/ios/vision/object_detector/utils/sources/MPPObjectDetectorOptions+Helpers.mm diff --git a/mediapipe/tasks/ios/vision/object_detector/utils/BUILD b/mediapipe/tasks/ios/vision/object_detector/utils/BUILD new file mode 100644 index 000000000..78b3c286e --- /dev/null +++ b/mediapipe/tasks/ios/vision/object_detector/utils/BUILD @@ -0,0 +1,32 @@ +# Copyright 2023 The MediaPipe Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +package(default_visibility = ["//mediapipe/tasks:internal"]) + +licenses(["notice"]) + +objc_library( + name = "MPPObjectDetectorOptionsHelpers", + srcs = ["sources/MPPObjectDetectorOptions+Helpers.mm"], + hdrs = ["sources/MPPObjectDetectorOptions+Helpers.h"], + deps = [ + "//mediapipe/framework:calculator_options_cc_proto", + "//mediapipe/tasks/cc/vision/object_detector/proto:object_detector_options_cc_proto", + "//mediapipe/tasks/ios/common/utils:NSStringHelpers", + "//mediapipe/tasks/ios/core:MPPTaskOptionsProtocol", + "//mediapipe/tasks/ios/core/utils:MPPBaseOptionsHelpers", + "//mediapipe/tasks/ios/vision/object_detector:MPPObjectDetectorOptions", + ], +) + diff --git a/mediapipe/tasks/ios/vision/object_detector/utils/sources/MPPObjectDetectorOptions+Helpers.h b/mediapipe/tasks/ios/vision/object_detector/utils/sources/MPPObjectDetectorOptions+Helpers.h new file mode 100644 index 000000000..150c4c71a --- /dev/null +++ b/mediapipe/tasks/ios/vision/object_detector/utils/sources/MPPObjectDetectorOptions+Helpers.h @@ -0,0 +1,32 @@ +// Copyright 2023 The MediaPipe Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "mediapipe/framework/calculator_options.pb.h" +#import "mediapipe/tasks/ios/core/sources/MPPTaskOptionsProtocol.h" +#import "mediapipe/tasks/ios/vision/object_detector/sources/MPPObjectDetectorOptions.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MPPObjectDetectorOptions (Helpers) + +/** + * Populates the provided `CalculatorOptions` proto container with the current settings. + * + * @param optionsProto The `CalculatorOptions` proto object to copy the settings to. + */ +- (void)copyToProto:(::mediapipe::CalculatorOptions *)optionsProto; + +@end + +NS_ASSUME_NONNULL_END diff --git a/mediapipe/tasks/ios/vision/object_detector/utils/sources/MPPObjectDetectorOptions+Helpers.mm b/mediapipe/tasks/ios/vision/object_detector/utils/sources/MPPObjectDetectorOptions+Helpers.mm new file mode 100644 index 000000000..2966bf6c7 --- /dev/null +++ b/mediapipe/tasks/ios/vision/object_detector/utils/sources/MPPObjectDetectorOptions+Helpers.mm @@ -0,0 +1,54 @@ +// Copyright 2023 The MediaPipe Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#import "mediapipe/tasks/ios/vision/object_detector/utils/sources/MPPObjectDetectorOptions+Helpers.h" + +#import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" +#import "mediapipe/tasks/ios/core/utils/sources/MPPBaseOptions+Helpers.h" + +#include "mediapipe/tasks/cc/vision/object_detector/proto/object_detector_options.pb.h" + +namespace { +using CalculatorOptionsProto = ::mediapipe::CalculatorOptions; +using ObjectDetectorOptionsProto = + ::mediapipe::tasks::vision::object_detector::proto::ObjectDetectorOptions; +} // namespace + +@implementation MPPObjectDetectorOptions (Helpers) + +- (void)copyToProto:(CalculatorOptionsProto *)optionsProto { + ObjectDetectorOptionsProto *graphOptions = + optionsProto->MutableExtension(ObjectDetectorOptionsProto::ext); + + graphOptions->Clear(); + + [self.baseOptions copyToProto:graphOptions->mutable_base_options()]; + + if (self.displayNamesLocale) { + graphOptions->set_display_names_locale(self.displayNamesLocale.cppString); + } + + graphOptions->set_max_results((int)self.maxResults); + graphOptions->set_score_threshold(self.scoreThreshold); + + for (NSString *category in self.categoryAllowlist) { + graphOptions->add_category_allowlist(category.cppString); + } + + for (NSString *category in self.categoryDenylist) { + graphOptions->add_category_denylist(category.cppString); + } +} + +@end