Merge pull request #713 from khanhlvg:c-object-detection-headers

PiperOrigin-RevId: 411174291

Author: tflite-support-robot

tensorflow_lite_support/c/task/processor/BUILD

@@ -3,12 +3,20 @@ package(
     licenses = ["notice"],  # Apache 2.0
 )
 
+cc_library(
+    name = "category",
+    hdrs = ["category.h"],
+)
+
 cc_library(
     name = "classification_result",
     srcs = [
         "classification_result.cc",
     ],
     hdrs = ["classification_result.h"],
+    deps = [
+        ":category",
+    ],
 )
 
 cc_library(
@@ -20,3 +28,15 @@ cc_library(
     name = "classification_options",
     hdrs = ["classification_options.h"],
 )
+
+cc_library(
+    name = "detection_result",
+    srcs = [
+        "detection_result.cc",
+    ],
+    hdrs = ["detection_result.h"],
+    deps = [
+        ":bounding_box",
+        ":category",
+    ],
+)

tensorflow_lite_support/c/task/processor/category.h

@@ -0,0 +1,49 @@
+/* Copyright 2021 The TensorFlow 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.
+==============================================================================*/
+#ifndef TENSORFLOW_LITE_SUPPORT_C_TASK_PROCESSOR_CATEGORY_H_
+#define TENSORFLOW_LITE_SUPPORT_C_TASK_PROCESSOR_CATEGORY_H_
+
+// Defines C structure for a Category which encapsulates a single predicted
+// class.
+
+#ifdef __cplusplus
+extern "C" {
+#endif  // __cplusplus
+
+// A single predicted class.
+typedef struct TfLiteCategory {
+  // The index of the class in the corresponding label map, usually packed in
+  // the TFLite Model Metadata [1].
+  //
+  // [1]: https://www.tensorflow.org/lite/convert/metadata
+  int index;
+
+  // The score for this class e.g. (but not necessarily) a probability in [0,1].
+  float score;
+
+  // A human readable name of the class filled from the label map.
+  char* display_name;
+  // An ID for the class, not necessarily human-readable (e.g. a Google
+  // Knowledge Graph ID [1]), filled from the label map.
+  //
+  // [1]: https://developers.google.com/knowledge-graph
+  char* label;
+} TfLiteCategory;
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
+
+#endif  // TENSORFLOW_LITE_SUPPORT_C_TASK_VISION_CATEGORY_H_

tensorflow_lite_support/c/task/processor/classification_result.h

@@ -15,32 +15,14 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_SUPPORT_C_TASK_PROCESSOR_CLASSIFICATION_RESULT_H_
 #define TENSORFLOW_LITE_SUPPORT_C_TASK_PROCESSOR_CLASSIFICATION_RESULT_H_
 
+#include "tensorflow_lite_support/c/task/processor/category.h"
+
 // Defines C structure for Classification Results and associated helper methods.
 
 #ifdef __cplusplus
 extern "C" {
 #endif  // __cplusplus
 
-// A single predicted class.
-typedef struct TfLiteCategory {
-  // The index of the class in the corresponding label map, usually packed in
-  // the TFLite Model Metadata [1].
-  //
-  // [1]: https://www.tensorflow.org/lite/convert/metadata
-  int index;
-
-  // The score for this class e.g. (but not necessarily) a probability in [0,1].
-  float score;
-
-  // A human readable name of the class filled from the label map.
-  char* display_name;
-  // An ID for the class, not necessarily human-readable (e.g. a Google
-  // Knowledge Graph ID [1]), filled from the label map.
-  //
-  // [1]: https://developers.google.com/knowledge-graph
-  char* label;
-} TfLiteCategory;
-
 // List of predicted classes (aka labels) for a given image classifier head.
 typedef struct TfLiteClassifications {
   // The index of the image classifier head these classes refer to. This is

tensorflow_lite_support/c/task/processor/detection_result.h

@@ -0,0 +1,65 @@
+/* Copyright 2021 The TensorFlow 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.
+==============================================================================*/
+#ifndef TENSORFLOW_LITE_SUPPORT_C_TASK_PROCESSOR_DETECTION_RESULT_H_
+#define TENSORFLOW_LITE_SUPPORT_C_TASK_PROCESSOR_DETECTION_RESULT_H_
+
+#include "tensorflow_lite_support/c/task/processor/bounding_box.h"
+#include "tensorflow_lite_support/c/task/processor/category.h"
+
+// Defines C structure for Object Detection Results and associated helper
+// methods.
+
+#ifdef __cplusplus
+extern "C" {
+#endif  // __cplusplus
+
+// Bounding box and list of predicted classes (aka labels) for a detected
+// object.
+typedef struct TfLiteDetection {
+  // The bounding box of the detected object.
+  TfLiteBoundingBox bounding_box;
+
+  // The array of predicted classes for the object detection represented by an
+  // instance of TfLiteDetection, usually sorted by descending scores (e.g. from
+  // high to low probability). Since this array is dynamically allocated, use
+  // size to traverse through the array.
+  TfLiteCategory* categories;
+
+  // Number of detectd objects be used to traverse the array of the detected
+  // objects.
+  int size;
+} TfLiteDetection;
+
+// Holds Object Detection results.
+// Contains one set of results per detected object.
+typedef struct TfLiteDetectionResult {
+  // Number of detectd objects be used to traverse the array of the detected
+  // objects.
+  int size;
+
+  // Array of results per detected object. This array can
+  // have any number of results. size holds the size of this array. size should
+  // be used to traverse this array.
+  TfLiteDetection* detections;
+} TfLiteDetectionResult;
+
+// Frees up the DetectionResult Structure.
+void TfLiteDetectionResultDelete(TfLiteDetectionResult* detection_result);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
+
+#endif  // TENSORFLOW_LITE_SUPPORT_C_TASK_VISION_DETECTION_H_

tensorflow_lite_support/c/task/vision/BUILD

@@ -31,3 +31,20 @@ cc_library_with_tflite(
         "//tensorflow_lite_support/cc/task/vision/proto:image_classifier_options_proto_inc",
     ],
 )
+
+cc_library_with_tflite(
+    name = "object_detector",
+    hdrs = [
+        "object_detector.h",
+    ],
+    tflite_deps = [
+        "//tensorflow_lite_support/cc/task/vision:object_detector",
+    ],
+    deps = [
+        "//tensorflow_lite_support/c:common",
+        "//tensorflow_lite_support/c/task/core:base_options",
+        "//tensorflow_lite_support/c/task/processor:classification_options",
+        "//tensorflow_lite_support/c/task/processor:detection_result",
+        "//tensorflow_lite_support/c/task/vision/core:frame_buffer",
+    ],
+)