Internal change

PiperOrigin-RevId: 482906478

mediapipe/tasks/cc/vision/gesture_recognizer/gesture_recognizer.h

@@ -23,10 +23,10 @@ limitations under the License.
 #include "mediapipe/framework/formats/classification.pb.h"
 #include "mediapipe/framework/formats/image.h"
 #include "mediapipe/framework/formats/landmark.pb.h"
-#include "mediapipe/framework/formats/rect.pb.h"
 #include "mediapipe/tasks/cc/components/containers/gesture_recognition_result.h"
 #include "mediapipe/tasks/cc/core/base_options.h"
 #include "mediapipe/tasks/cc/vision/core/base_vision_task_api.h"
+#include "mediapipe/tasks/cc/vision/core/image_processing_options.h"
 #include "mediapipe/tasks/cc/vision/core/running_mode.h"
 
 namespace mediapipe {
@@ -129,36 +129,36 @@ class GestureRecognizer : tasks::vision::core::BaseVisionTaskApi {
   // Only use this method when the GestureRecognizer is created with the image
   // running mode.
   //
-  // image - mediapipe::Image
-  //   Image to perform hand gesture recognition on.
-  // imageProcessingOptions - std::optional<NormalizedRect>
-  //   If provided, can be used to specify the rotation to apply to the image
-  //   before performing classification, by setting its 'rotation' field in
-  //   radians (e.g. 'M_PI / 2' for a 90° anti-clockwise rotation). Note that
-  //   specifying a region-of-interest using the 'x_center', 'y_center', 'width'
-  //   and 'height' fields is NOT supported and will result in an invalid
-  //   argument error being returned.
+  // The optional 'image_processing_options' parameter can be used to specify
+  // the rotation to apply to the image before performing recognition, by
+  // setting its 'rotation_degrees' field. Note that specifying a
+  // region-of-interest using the 'region_of_interest' field is NOT supported
+  // and will result in an invalid argument error being returned.
   //
   // The image can be of any size with format RGB or RGBA.
   // TODO: Describes how the input image will be preprocessed
   // after the yuv support is implemented.
-  // TODO: use an ImageProcessingOptions struct instead of
-  // NormalizedRect.
   absl::StatusOr<components::containers::GestureRecognitionResult> Recognize(
       Image image,
-      std::optional<mediapipe::NormalizedRect> image_processing_options =
+      std::optional<core::ImageProcessingOptions> image_processing_options =
           std::nullopt);
 
   // Performs gesture recognition on the provided video frame.
   // Only use this method when the GestureRecognizer is created with the video
   // running mode.
   //
+  // The optional 'image_processing_options' parameter can be used to specify
+  // the rotation to apply to the image before performing recognition, by
+  // setting its 'rotation_degrees' field. Note that specifying a
+  // region-of-interest using the 'region_of_interest' field is NOT supported
+  // and will result in an invalid argument error being returned.
+  //
   // The image can be of any size with format RGB or RGBA. It's required to
   // provide the video frame's timestamp (in milliseconds). The input timestamps
   // must be monotonically increasing.
   absl::StatusOr<components::containers::GestureRecognitionResult>
   RecognizeForVideo(Image image, int64 timestamp_ms,
-                    std::optional<mediapipe::NormalizedRect>
+                    std::optional<core::ImageProcessingOptions>
                         image_processing_options = std::nullopt);
 
   // Sends live image data to perform gesture recognition, and the results will
@@ -171,6 +171,12 @@ class GestureRecognizer : tasks::vision::core::BaseVisionTaskApi {
   // sent to the gesture recognizer. The input timestamps must be monotonically
   // increasing.
   //
+  // The optional 'image_processing_options' parameter can be used to specify
+  // the rotation to apply to the image before performing recognition, by
+  // setting its 'rotation_degrees' field. Note that specifying a
+  // region-of-interest using the 'region_of_interest' field is NOT supported
+  // and will result in an invalid argument error being returned.
+  //
   // The "result_callback" provides
   //   - A vector of GestureRecognitionResult, each is the recognized results
   //     for a input frame.
@@ -180,7 +186,7 @@ class GestureRecognizer : tasks::vision::core::BaseVisionTaskApi {
   //     outside of the callback, callers need to make a copy of the image.
   //   - The input timestamp in milliseconds.
   absl::Status RecognizeAsync(Image image, int64 timestamp_ms,
-                              std::optional<mediapipe::NormalizedRect>
+                              std::optional<core::ImageProcessingOptions>
                                   image_processing_options = std::nullopt);
 
   // Shuts down the GestureRecognizer when all works are done.