From 77de8b0bb058845af4c28a716fea8245f89d8fb8 Mon Sep 17 00:00:00 2001 From: MediaPipe Team Date: Wed, 12 Oct 2022 00:31:05 -0700 Subject: [PATCH] Split RotationMode proto target for reuse. PiperOrigin-RevId: 480548644 --- mediapipe/calculators/image/BUILD | 8 ++++++ .../image/image_transformation_calculator.cc | 1 + .../image_transformation_calculator.proto | 12 +------- .../calculators/image/rotation_mode.proto | 28 +++++++++++++++++++ 4 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 mediapipe/calculators/image/rotation_mode.proto diff --git a/mediapipe/calculators/image/BUILD b/mediapipe/calculators/image/BUILD index 458c5368b..89e2d371c 100644 --- a/mediapipe/calculators/image/BUILD +++ b/mediapipe/calculators/image/BUILD @@ -209,11 +209,18 @@ cc_library( alwayslink = 1, ) +mediapipe_proto_library( + name = "rotation_mode_proto", + srcs = ["rotation_mode.proto"], + visibility = ["//visibility:public"], +) + mediapipe_proto_library( name = "image_transformation_calculator_proto", srcs = ["image_transformation_calculator.proto"], visibility = ["//visibility:public"], deps = [ + ":rotation_mode_proto", "//mediapipe/framework:calculator_options_proto", "//mediapipe/framework:calculator_proto", "//mediapipe/gpu:scale_mode_proto", @@ -238,6 +245,7 @@ cc_library( }), visibility = ["//visibility:public"], deps = [ + ":rotation_mode_cc_proto", ":image_transformation_calculator_cc_proto", "//mediapipe/framework:packet", "//mediapipe/framework:timestamp", diff --git a/mediapipe/calculators/image/image_transformation_calculator.cc b/mediapipe/calculators/image/image_transformation_calculator.cc index bc7fd8df7..84697cc62 100644 --- a/mediapipe/calculators/image/image_transformation_calculator.cc +++ b/mediapipe/calculators/image/image_transformation_calculator.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "mediapipe/calculators/image/image_transformation_calculator.pb.h" +#include "mediapipe/calculators/image/rotation_mode.pb.h" #include "mediapipe/framework/calculator_framework.h" #include "mediapipe/framework/formats/image_frame.h" #include "mediapipe/framework/formats/image_frame_opencv.h" diff --git a/mediapipe/calculators/image/image_transformation_calculator.proto b/mediapipe/calculators/image/image_transformation_calculator.proto index c90e03be9..739c5bfbb 100644 --- a/mediapipe/calculators/image/image_transformation_calculator.proto +++ b/mediapipe/calculators/image/image_transformation_calculator.proto @@ -16,20 +16,10 @@ syntax = "proto2"; package mediapipe; +import "mediapipe/calculators/image/rotation_mode.proto"; import "mediapipe/framework/calculator.proto"; import "mediapipe/gpu/scale_mode.proto"; -// Counterclockwise rotation. -message RotationMode { - enum Mode { - UNKNOWN = 0; - ROTATION_0 = 1; - ROTATION_90 = 2; - ROTATION_180 = 3; - ROTATION_270 = 4; - } -} - message ImageTransformationCalculatorOptions { extend CalculatorOptions { optional ImageTransformationCalculatorOptions ext = 251952830; diff --git a/mediapipe/calculators/image/rotation_mode.proto b/mediapipe/calculators/image/rotation_mode.proto new file mode 100644 index 000000000..d4859aa4c --- /dev/null +++ b/mediapipe/calculators/image/rotation_mode.proto @@ -0,0 +1,28 @@ +// Copyright 2019 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. + +syntax = "proto2"; + +package mediapipe; + +// Counterclockwise rotation. +message RotationMode { + enum Mode { + UNKNOWN = 0; + ROTATION_0 = 1; + ROTATION_90 = 2; + ROTATION_180 = 3; + ROTATION_270 = 4; + } +}