Merge pull request #5021 from kinaryml:c-face-landmarker-api

PiperOrigin-RevId: 591062403

mediapipe/tasks/c/components/containers/BUILD

@@ -43,6 +43,33 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "matrix",
+    hdrs = ["matrix.h"],
+)
+
+cc_library(
+    name = "matrix_converter",
+    srcs = ["matrix_converter.cc"],
+    hdrs = ["matrix_converter.h"],
+    deps = [
+        ":matrix",
+        "@eigen_archive//:eigen3",
+    ],
+)
+
+cc_test(
+    name = "matrix_converter_test",
+    srcs = ["matrix_converter_test.cc"],
+    deps = [
+        ":matrix",
+        ":matrix_converter",
+        "//mediapipe/framework/port:gtest",
+        "@com_google_googletest//:gtest_main",
+        "@eigen_archive//:eigen3",
+    ],
+)
+
 cc_library(
     name = "landmark",
     hdrs = ["landmark.h"],

mediapipe/tasks/c/components/containers/matrix.h

@@ -0,0 +1,41 @@
+/* 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.
+==============================================================================*/
+
+#ifndef MEDIAPIPE_TASKS_C_COMPONENTS_CONTAINERS_MATRIX_H_
+#define MEDIAPIPE_TASKS_C_COMPONENTS_CONTAINERS_MATRIX_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Data are stored in column-major order by default.
+struct Matrix {
+  // The number of rows in the matrix.
+  uint32_t rows;
+
+  // The number of columns in the matrix.
+  uint32_t cols;
+
+  // The matrix data stored in a column-first layout.
+  float* data;
+};
+
+#ifdef __cplusplus
+}  // extern C
+#endif
+
+#endif  // MEDIAPIPE_TASKS_C_COMPONENTS_CONTAINERS_MATRIX_H_

mediapipe/tasks/c/components/containers/matrix_converter.cc

@@ -0,0 +1,43 @@
+/* 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/tasks/c/components/containers/matrix_converter.h"
+
+#include <cstring>
+
+#include "Eigen/Core"
+#include "mediapipe/tasks/c/components/containers/matrix.h"
+
+namespace mediapipe::tasks::c::components::containers {
+
+void CppConvertToMatrix(const Eigen::MatrixXf& in, ::Matrix* out) {
+  out->rows = in.rows();
+  out->cols = in.cols();
+  out->data = new float[out->rows * out->cols];
+
+  // Copies data from an Eigen matrix (default column-major as used by
+  // MediaPipe) to a C-style matrix, preserving the sequence of elements as per
+  // the Eigen matrix's internal storage (column-major order by default).
+  memcpy(out->data, in.data(), sizeof(float) * out->rows * out->cols);
+}
+
+void CppCloseMatrix(::Matrix* m) {
+  if (m->data) {
+    delete[] m->data;
+    m->data = nullptr;
+  }
+}
+
+}  // namespace mediapipe::tasks::c::components::containers

mediapipe/tasks/c/components/containers/matrix_converter.h

@@ -0,0 +1,30 @@
+/* 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.
+==============================================================================*/
+
+#ifndef MEDIAPIPE_TASKS_C_COMPONENTS_CONTAINERS_MATRIX_CONVERTER_H_
+#define MEDIAPIPE_TASKS_C_COMPONENTS_CONTAINERS_MATRIX_CONVERTER_H_
+
+#include "Eigen/Core"
+#include "mediapipe/tasks/c/components/containers/matrix.h"
+
+namespace mediapipe::tasks::c::components::containers {
+
+void CppConvertToMatrix(const Eigen::MatrixXf& in, ::Matrix* out);
+
+void CppCloseMatrix(::Matrix* m);
+
+}  // namespace mediapipe::tasks::c::components::containers
+
+#endif  // MEDIAPIPE_TASKS_C_COMPONENTS_CONTAINERS_MATRIX_CONVERTER_H_

mediapipe/tasks/c/components/containers/matrix_converter_test.cc

@@ -0,0 +1,49 @@
+/* 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/tasks/c/components/containers/matrix_converter.h"
+
+#include "Eigen/Core"
+#include "mediapipe/framework/port/gtest.h"
+#include "mediapipe/tasks/c/components/containers/matrix.h"
+
+namespace mediapipe::tasks::c::components::containers {
+
+TEST(MatrixConversionTest, ConvertsEigenMatrixToCMatrixAndFreesMemory) {
+  // Initialize an Eigen::MatrixXf
+  Eigen::MatrixXf cpp_matrix(2, 2);
+  cpp_matrix << 1.0f, 2.0f, 3.0f, 4.0f;
+
+  // Convert this Eigen matrix to C-style Matrix
+  ::Matrix c_matrix;
+  CppConvertToMatrix(cpp_matrix, &c_matrix);
+
+  // Verify the conversion
+  EXPECT_EQ(c_matrix.rows, 2);
+  EXPECT_EQ(c_matrix.cols, 2);
+  ASSERT_NE(c_matrix.data, nullptr);
+  EXPECT_FLOAT_EQ(c_matrix.data[0], 1.0f);
+  EXPECT_FLOAT_EQ(c_matrix.data[1], 3.0f);
+  EXPECT_FLOAT_EQ(c_matrix.data[2], 2.0f);
+  EXPECT_FLOAT_EQ(c_matrix.data[3], 4.0f);
+
+  // Close the C-style Matrix
+  CppCloseMatrix(&c_matrix);
+
+  // Verify that memory is freed
+  EXPECT_EQ(c_matrix.data, nullptr);
+}
+
+}  // namespace mediapipe::tasks::c::components::containers

mediapipe/tasks/c/vision/face_landmarker/BUILD

@@ -0,0 +1,149 @@
+# 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.
+
+package(default_visibility = ["//mediapipe/tasks:internal"])
+
+licenses(["notice"])
+
+cc_library(
+    name = "face_landmarker_result",
+    hdrs = ["face_landmarker_result.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//mediapipe/tasks/c/components/containers:category",
+        "//mediapipe/tasks/c/components/containers:landmark",
+        "//mediapipe/tasks/c/components/containers:matrix",
+    ],
+)
+
+cc_library(
+    name = "face_landmarker_result_converter",
+    srcs = ["face_landmarker_result_converter.cc"],
+    hdrs = ["face_landmarker_result_converter.h"],
+    deps = [
+        ":face_landmarker_result",
+        "//mediapipe/tasks/c/components/containers:category",
+        "//mediapipe/tasks/c/components/containers:category_converter",
+        "//mediapipe/tasks/c/components/containers:landmark",
+        "//mediapipe/tasks/c/components/containers:landmark_converter",
+        "//mediapipe/tasks/c/components/containers:matrix",
+        "//mediapipe/tasks/c/components/containers:matrix_converter",
+        "//mediapipe/tasks/cc/components/containers:category",
+        "//mediapipe/tasks/cc/components/containers:landmark",
+        "//mediapipe/tasks/cc/vision/face_landmarker:face_landmarker_result",
+    ],
+)
+
+cc_test(
+    name = "face_landmarker_result_converter_test",
+    srcs = ["face_landmarker_result_converter_test.cc"],
+    linkstatic = 1,
+    deps = [
+        ":face_landmarker_result",
+        ":face_landmarker_result_converter",
+        "//mediapipe/framework/formats:matrix",
+        "//mediapipe/framework/port:gtest",
+        "//mediapipe/tasks/c/components/containers:landmark",
+        "//mediapipe/tasks/cc/components/containers:category",
+        "//mediapipe/tasks/cc/components/containers:classification_result",
+        "//mediapipe/tasks/cc/components/containers:landmark",
+        "//mediapipe/tasks/cc/vision/face_landmarker:face_landmarker_result",
+        "@com_google_googletest//:gtest_main",
+        "@eigen_archive//:eigen3",
+    ],
+)
+
+cc_library(
+    name = "face_landmarker_lib",
+    srcs = ["face_landmarker.cc"],
+    hdrs = ["face_landmarker.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":face_landmarker_result",
+        ":face_landmarker_result_converter",
+        "//mediapipe/framework/formats:image",
+        "//mediapipe/framework/formats:image_frame",
+        "//mediapipe/tasks/c/core:base_options",
+        "//mediapipe/tasks/c/core:base_options_converter",
+        "//mediapipe/tasks/c/vision/core:common",
+        "//mediapipe/tasks/cc/vision/core:running_mode",
+        "//mediapipe/tasks/cc/vision/face_landmarker",
+        "//mediapipe/tasks/cc/vision/face_landmarker:face_landmarker_result",
+        "//mediapipe/tasks/cc/vision/utils:image_utils",
+        "@com_google_absl//absl/log:absl_log",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:statusor",
+    ],
+    alwayslink = 1,
+)
+
+cc_test(
+    name = "face_landmarker_test",
+    srcs = ["face_landmarker_test.cc"],
+    data = [
+        "//mediapipe/framework/formats:image_frame_opencv",
+        "//mediapipe/framework/port:opencv_core",
+        "//mediapipe/framework/port:opencv_imgproc",
+        "//mediapipe/tasks/testdata/vision:test_images",
+        "//mediapipe/tasks/testdata/vision:test_models",
+    ],
+    linkstatic = 1,
+    deps = [
+        ":face_landmarker_lib",
+        ":face_landmarker_result",
+        "//mediapipe/framework/deps:file_path",
+        "//mediapipe/framework/formats:image",
+        "//mediapipe/framework/port:gtest",
+        "//mediapipe/tasks/c/components/containers:landmark",
+        "//mediapipe/tasks/c/vision/core:common",
+        "//mediapipe/tasks/cc/vision/utils:image_utils",
+        "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/strings",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+# bazel build -c opt --linkopt -s --strip always --define MEDIAPIPE_DISABLE_GPU=1 \
+# //mediapipe/tasks/c/vision/face_landmarker:libface_landmarker.so
+cc_binary(
+    name = "libface_landmarker.so",
+    linkopts = [
+        "-Wl,-soname=libface_landmarker.so",
+        "-fvisibility=hidden",
+    ],
+    linkshared = True,
+    tags = [
+        "manual",
+        "nobuilder",
+        "notap",
+    ],
+    deps = [":face_landmarker_lib"],
+)
+
+# bazel build --config darwin_arm64 -c opt --strip always --define MEDIAPIPE_DISABLE_GPU=1 \
+# //mediapipe/tasks/c/vision/face_landmarker:libface_landmarker.dylib
+cc_binary(
+    name = "libface_landmarker.dylib",
+    linkopts = [
+        "-Wl,-install_name,libface_landmarker.dylib",
+        "-fvisibility=hidden",
+    ],
+    linkshared = True,
+    tags = [
+        "manual",
+        "nobuilder",
+        "notap",
+    ],
+    deps = [":face_landmarker_lib"],
+)