From 7800d238e916d7b74ba019c254c33999cae834e1 Mon Sep 17 00:00:00 2001 From: MediaPipe Team Date: Wed, 24 May 2023 20:15:30 -0700 Subject: [PATCH] add needed enum type for choose fuse pipeline. PiperOrigin-RevId: 535076733 --- mediapipe/calculators/core/BUILD | 4 ++-- mediapipe/calculators/core/begin_loop_calculator.cc | 4 ++++ mediapipe/calculators/core/end_loop_calculator.cc | 4 ++++ mediapipe/calculators/core/split_vector_calculator.cc | 9 +++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/mediapipe/calculators/core/BUILD b/mediapipe/calculators/core/BUILD index 3294c0383..4e32ed59f 100644 --- a/mediapipe/calculators/core/BUILD +++ b/mediapipe/calculators/core/BUILD @@ -194,6 +194,7 @@ cc_library( "//mediapipe/framework:calculator_framework", "//mediapipe/framework:packet", "//mediapipe/framework/formats:detection_cc_proto", + "//mediapipe/framework/formats:image", "//mediapipe/framework/formats:image_frame", "//mediapipe/framework/formats:landmark_cc_proto", "//mediapipe/framework/formats:matrix", @@ -225,10 +226,8 @@ cc_library( "//mediapipe/framework/formats:rect_cc_proto", "//mediapipe/framework/formats:tensor", "//mediapipe/framework/port:ret_check", - "//mediapipe/framework/port:status", "//mediapipe/gpu:gpu_buffer", "//mediapipe/util:render_data_cc_proto", - "@com_google_absl//absl/memory", "@com_google_absl//absl/status", "@org_tensorflow//tensorflow/lite:framework", ], @@ -907,6 +906,7 @@ cc_library( "//mediapipe/framework:calculator_framework", "//mediapipe/framework/formats:classification_cc_proto", "//mediapipe/framework/formats:detection_cc_proto", + "//mediapipe/framework/formats:image", "//mediapipe/framework/formats:landmark_cc_proto", "//mediapipe/framework/formats:matrix", "//mediapipe/framework/formats:rect_cc_proto", diff --git a/mediapipe/calculators/core/begin_loop_calculator.cc b/mediapipe/calculators/core/begin_loop_calculator.cc index ac74bb382..7da90989b 100644 --- a/mediapipe/calculators/core/begin_loop_calculator.cc +++ b/mediapipe/calculators/core/begin_loop_calculator.cc @@ -17,6 +17,7 @@ #include #include "mediapipe/framework/formats/detection.pb.h" +#include "mediapipe/framework/formats/image.h" #include "mediapipe/framework/formats/image_frame.h" #include "mediapipe/framework/formats/landmark.pb.h" #include "mediapipe/framework/formats/matrix.h" @@ -72,4 +73,7 @@ typedef BeginLoopCalculator> BeginLoopGpuBufferCalculator; REGISTER_CALCULATOR(BeginLoopGpuBufferCalculator); +// A calculator to process std::vector. +typedef BeginLoopCalculator> BeginLoopImageCalculator; +REGISTER_CALCULATOR(BeginLoopImageCalculator); } // namespace mediapipe diff --git a/mediapipe/calculators/core/end_loop_calculator.cc b/mediapipe/calculators/core/end_loop_calculator.cc index dea2b6cad..752580cfd 100644 --- a/mediapipe/calculators/core/end_loop_calculator.cc +++ b/mediapipe/calculators/core/end_loop_calculator.cc @@ -80,4 +80,8 @@ typedef EndLoopCalculator> EndLoopImageCalculator; REGISTER_CALCULATOR(EndLoopImageCalculator); +typedef EndLoopCalculator>> + EndLoopAffineMatrixCalculator; +REGISTER_CALCULATOR(EndLoopAffineMatrixCalculator); + } // namespace mediapipe diff --git a/mediapipe/calculators/core/split_vector_calculator.cc b/mediapipe/calculators/core/split_vector_calculator.cc index b76722de9..67fc38ce9 100644 --- a/mediapipe/calculators/core/split_vector_calculator.cc +++ b/mediapipe/calculators/core/split_vector_calculator.cc @@ -18,6 +18,7 @@ #include "mediapipe/framework/formats/classification.pb.h" #include "mediapipe/framework/formats/detection.pb.h" +#include "mediapipe/framework/formats/image.h" #include "mediapipe/framework/formats/landmark.pb.h" #include "mediapipe/framework/formats/matrix.h" #include "mediapipe/framework/formats/rect.pb.h" @@ -86,4 +87,12 @@ REGISTER_CALCULATOR(SplitUint64tVectorCalculator); typedef SplitVectorCalculator SplitFloatVectorCalculator; REGISTER_CALCULATOR(SplitFloatVectorCalculator); +typedef SplitVectorCalculator + SplitImageVectorCalculator; +REGISTER_CALCULATOR(SplitImageVectorCalculator); + +typedef SplitVectorCalculator, false> + SplitAffineMatrixVectorCalculator; +REGISTER_CALCULATOR(SplitAffineMatrixVectorCalculator); + } // namespace mediapipe