Project import generated by Copybara.

PiperOrigin-RevId: 263889205

mediapipe/graphs/object_detection/BUILD

@@ -1,4 +1,4 @@
-# Copyright 2019 The MediaPipeOSS Authors.
+# 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.
@@ -11,16 +11,15 @@
 # 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.
-#
 
 licenses(["notice"])  # Apache 2.0
 
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
-    name = "android_calculators",
+    name = "mobile_calculators",
     deps = [
-        "//mediapipe/calculators/core:real_time_flow_limiter_calculator",
+        "//mediapipe/calculators/core:flow_limiter_calculator",
         "//mediapipe/calculators/image:image_transformation_calculator",
         "//mediapipe/calculators/tflite:ssd_anchors_calculator",
         "//mediapipe/calculators/tflite:tflite_converter_calculator",
@@ -77,35 +76,15 @@ load(
 )
 
 mediapipe_binary_graph(
-    name = "android_cpu_binary_graph",
-    graph = "object_detection_android_cpu.pbtxt",
-    output_name = "android_cpu.binarypb",
-    deps = [
-        "//mediapipe/calculators/image:image_transformation_calculator_proto",
-        "//mediapipe/calculators/tflite:ssd_anchors_calculator_proto",
-        "//mediapipe/calculators/tflite:tflite_converter_calculator_proto",
-        "//mediapipe/calculators/tflite:tflite_inference_calculator_proto",
-        "//mediapipe/calculators/tflite:tflite_tensors_to_detections_calculator_proto",
-        "//mediapipe/calculators/util:annotation_overlay_calculator_proto",
-        "//mediapipe/calculators/util:detection_label_id_to_text_calculator_proto",
-        "//mediapipe/calculators/util:detections_to_render_data_calculator_proto",
-        "//mediapipe/calculators/util:non_max_suppression_calculator_proto",
-    ],
+    name = "mobile_cpu_binary_graph",
+    graph = "object_detection_mobile_cpu.pbtxt",
+    output_name = "mobile_cpu.binarypb",
+    deps = [":mobile_calculators"],
 )
 
 mediapipe_binary_graph(
-    name = "android_gpu_binary_graph",
-    graph = "object_detection_android_gpu.pbtxt",
-    output_name = "android_gpu.binarypb",
-    deps = [
-        "//mediapipe/calculators/image:image_transformation_calculator_proto",
-        "//mediapipe/calculators/tflite:ssd_anchors_calculator_proto",
-        "//mediapipe/calculators/tflite:tflite_converter_calculator_proto",
-        "//mediapipe/calculators/tflite:tflite_inference_calculator_proto",
-        "//mediapipe/calculators/tflite:tflite_tensors_to_detections_calculator_proto",
-        "//mediapipe/calculators/util:annotation_overlay_calculator_proto",
-        "//mediapipe/calculators/util:detection_label_id_to_text_calculator_proto",
-        "//mediapipe/calculators/util:detections_to_render_data_calculator_proto",
-        "//mediapipe/calculators/util:non_max_suppression_calculator_proto",
-    ],
+    name = "mobile_gpu_binary_graph",
+    graph = "object_detection_mobile_gpu.pbtxt",
+    output_name = "mobile_gpu.binarypb",
+    deps = [":mobile_calculators"],
 )

mediapipe/graphs/object_detection/object_detection_desktop_tensorflow_graph.pbtxt

@@ -96,7 +96,7 @@ node {
 # Converts the detections to drawing primitives for annotation overlay.
 node {
   calculator: "DetectionsToRenderDataCalculator"
-  input_stream: "DETECTION_VECTOR:output_detections"
+  input_stream: "DETECTIONS:output_detections"
   output_stream: "RENDER_DATA:render_data"
   node_options: {
     [type.googleapis.com/mediapipe.DetectionsToRenderDataCalculatorOptions] {
@@ -106,8 +106,7 @@ node {
   }
 }
 
-# Draws annotations and overlays them on top of the original image coming into
-# the graph.
+# Draws annotations and overlays them on top of the input images.
 node {
   calculator: "AnnotationOverlayCalculator"
   input_stream: "INPUT_FRAME:input_video"

mediapipe/graphs/object_detection/object_detection_desktop_tflite_graph.pbtxt

@@ -146,7 +146,7 @@ node {
 # Converts the detections to drawing primitives for annotation overlay.
 node {
   calculator: "DetectionsToRenderDataCalculator"
-  input_stream: "DETECTION_VECTOR:output_detections"
+  input_stream: "DETECTIONS:output_detections"
   output_stream: "RENDER_DATA:render_data"
   node_options: {
     [type.googleapis.com/mediapipe.DetectionsToRenderDataCalculatorOptions] {
@@ -156,8 +156,7 @@ node {
   }
 }
 
-# Draws annotations and overlays them on top of the original image coming into
-# the graph.
+# Draws annotations and overlays them on top of the input images.
 node {
   calculator: "AnnotationOverlayCalculator"
   input_stream: "INPUT_FRAME:input_video"

mediapipe/graphs/object_detection/object_detection_mobile_cpu.pbtxt

@@ -1,6 +1,7 @@
 # MediaPipe graph that performs object detection with TensorFlow Lite on CPU.
-# Used in the example in
-# mediapipie/examples/android/src/java/com/mediapipe/apps/objectdetectioncpu.
+# Used in the examples in
+# mediapipie/examples/android/src/java/com/mediapipe/apps/objectdetectioncpu and
+# mediapipie/examples/ios/objectdetectioncpu.
 
 # Images on GPU coming into and out of the graph.
 input_stream: "input_video"
@@ -30,7 +31,7 @@ node: {
 # TfLiteConverterCalculator or TfLiteInferenceCalculator is still busy
 # processing previous inputs.
 node {
-  calculator: "RealTimeFlowLimiterCalculator"
+  calculator: "FlowLimiterCalculator"
   input_stream: "input_video_cpu"
   input_stream: "FINISHED:detections"
   input_stream_info: {
@@ -57,22 +58,12 @@ node: {
   }
 }
 
-# Converts the transformed input image on CPU into an image tensor as a
-# TfLiteTensor. The zero_center option is set to true to normalize the
-# pixel values to [-1.f, 1.f] as opposed to [0.f, 1.f]. The flip_vertically
-# option is set to true to account for the descrepancy between the
-# representation of the input image (origin at the bottom-left corner) and what
-# the model used in this graph is expecting (origin at the top-left corner).
+# Converts the transformed input image on CPU into an image tensor stored as a
+# TfLiteTensor.
 node {
   calculator: "TfLiteConverterCalculator"
   input_stream: "IMAGE:transformed_input_video_cpu"
   output_stream: "TENSORS:image_tensor"
-  node_options: {
-    [type.googleapis.com/mediapipe.TfLiteConverterCalculatorOptions] {
-      zero_center: true
-      flip_vertically: true
-    }
-  }
 }
 
 # Runs a TensorFlow Lite model on CPU that takes an image tensor and outputs a
@@ -139,7 +130,7 @@ node {
       y_scale: 10.0
       h_scale: 5.0
       w_scale: 5.0
-      flip_vertically: true
+      min_score_thresh: 0.6
     }
   }
 }
@@ -152,9 +143,9 @@ node {
   node_options: {
     [type.googleapis.com/mediapipe.NonMaxSuppressionCalculatorOptions] {
       min_suppression_threshold: 0.4
-      min_score_threshold: 0.6
       max_num_detections: 3
       overlap_type: INTERSECTION_OVER_UNION
+      return_empty_detections: true
     }
   }
 }
@@ -175,7 +166,7 @@ node {
 # Converts the detections to drawing primitives for annotation overlay.
 node {
   calculator: "DetectionsToRenderDataCalculator"
-  input_stream: "DETECTION_VECTOR:output_detections"
+  input_stream: "DETECTIONS:output_detections"
   output_stream: "RENDER_DATA:render_data"
   node_options: {
     [type.googleapis.com/mediapipe.DetectionsToRenderDataCalculatorOptions] {
@@ -185,21 +176,12 @@ node {
   }
 }
 
-# Draws annotations and overlays them on top of the CPU copy of the original
-# image coming into the graph. The calculator assumes that image origin is
-# always at the top-left corner and renders text accordingly. However, the input
-# image has its origin at the bottom-left corner (OpenGL convention) and the
-# flip_text_vertically option is set to true to compensate that.
+# Draws annotations and overlays them on top of the input images.
 node {
   calculator: "AnnotationOverlayCalculator"
   input_stream: "INPUT_FRAME:throttled_input_video_cpu"
   input_stream: "render_data"
   output_stream: "OUTPUT_FRAME:output_video_cpu"
-  node_options: {
-    [type.googleapis.com/mediapipe.AnnotationOverlayCalculatorOptions] {
-      flip_text_vertically: true
-    }
-  }
 }
 
 # Transfers the annotated image from CPU back to GPU memory, to be sent out of

mediapipe/graphs/object_detection/object_detection_mobile_gpu.pbtxt

@@ -1,6 +1,7 @@
 # MediaPipe graph that performs object detection with TensorFlow Lite on GPU.
-# Used in the example in
-# mediapipie/examples/android/src/java/com/mediapipe/apps/objectdetectiongpu.
+# Used in the examples in
+# mediapipie/examples/android/src/java/com/mediapipe/apps/objectdetectiongpu and
+# mediapipie/examples/ios/objectdetectiongpu.
 
 # Images on GPU coming into and out of the graph.
 input_stream: "input_video"
@@ -20,7 +21,7 @@ output_stream: "output_video"
 # TfLiteConverterCalculator or TfLiteInferenceCalculator is still busy
 # processing previous inputs.
 node {
-  calculator: "RealTimeFlowLimiterCalculator"
+  calculator: "FlowLimiterCalculator"
   input_stream: "input_video"
   input_stream: "FINISHED:detections"
   input_stream_info: {
@@ -47,23 +48,12 @@ node: {
   }
 }
 
-# Converts the transformed input image on GPU into an image tensor stored in
-# tflite::gpu::GlBuffer. The zero_center option is set to true to normalize the
-# pixel values to [-1.f, 1.f] as opposed to [0.f, 1.f]. The flip_vertically
-# option is set to true to account for the descrepancy between the
-# representation of the input image (origin at the bottom-left corner, the
-# OpenGL convention) and what the model used in this graph is expecting (origin
-# at the top-left corner).
+# Converts the transformed input image on GPU into an image tensor stored as a
+# TfLiteTensor.
 node {
   calculator: "TfLiteConverterCalculator"
   input_stream: "IMAGE_GPU:transformed_input_video"
   output_stream: "TENSORS_GPU:image_tensor"
-  node_options: {
-    [type.googleapis.com/mediapipe.TfLiteConverterCalculatorOptions] {
-      zero_center: true
-      flip_vertically: true
-    }
-  }
 }
 
 # Runs a TensorFlow Lite model on GPU that takes an image tensor and outputs a
@@ -72,7 +62,7 @@ node {
 node {
   calculator: "TfLiteInferenceCalculator"
   input_stream: "TENSORS_GPU:image_tensor"
-  output_stream: "TENSORS_GPU:detection_tensors"
+  output_stream: "TENSORS:detection_tensors"
   node_options: {
     [type.googleapis.com/mediapipe.TfLiteInferenceCalculatorOptions] {
       model_path: "ssdlite_object_detection.tflite"
@@ -115,7 +105,7 @@ node {
 # detections. Each detection describes a detected object.
 node {
   calculator: "TfLiteTensorsToDetectionsCalculator"
-  input_stream: "TENSORS_GPU:detection_tensors"
+  input_stream: "TENSORS:detection_tensors"
   input_side_packet: "ANCHORS:anchors"
   output_stream: "DETECTIONS:detections"
   node_options: {
@@ -130,7 +120,7 @@ node {
       y_scale: 10.0
       h_scale: 5.0
       w_scale: 5.0
-      flip_vertically: true
+      min_score_thresh: 0.6
     }
   }
 }
@@ -143,9 +133,9 @@ node {
   node_options: {
     [type.googleapis.com/mediapipe.NonMaxSuppressionCalculatorOptions] {
       min_suppression_threshold: 0.4
-      min_score_threshold: 0.6
       max_num_detections: 3
       overlap_type: INTERSECTION_OVER_UNION
+      return_empty_detections: true
     }
   }
 }
@@ -166,7 +156,7 @@ node {
 # Converts the detections to drawing primitives for annotation overlay.
 node {
   calculator: "DetectionsToRenderDataCalculator"
-  input_stream: "DETECTION_VECTOR:output_detections"
+  input_stream: "DETECTIONS:output_detections"
   output_stream: "RENDER_DATA:render_data"
   node_options: {
     [type.googleapis.com/mediapipe.DetectionsToRenderDataCalculatorOptions] {
@@ -176,21 +166,10 @@ node {
   }
 }
 
-# Draws annotations and overlays them on top of the original image coming into
-# the graph. Annotation drawing is performed on CPU, and the result is
-# transferred to GPU and overlaid on the input image. The calculator assumes
-# that image origin is always at the top-left corner and renders text
-# accordingly. However, the input image has its origin at the bottom-left corner
-# (OpenGL convention) and the flip_text_vertically option is set to true to
-# compensate that.
+# Draws annotations and overlays them on top of the input images.
 node {
   calculator: "AnnotationOverlayCalculator"
   input_stream: "INPUT_FRAME_GPU:throttled_input_video"
   input_stream: "render_data"
   output_stream: "OUTPUT_FRAME_GPU:output_video"
-  node_options: {
-    [type.googleapis.com/mediapipe.AnnotationOverlayCalculatorOptions] {
-      flip_text_vertically: true
-    }
-  }
 }