Renamed iOS gesture recognizer protobuf utils
This commit is contained in:
		
							parent
							
								
									955489d71d
								
							
						
					
					
						commit
						ebeffc27eb
					
				| 
						 | 
					@ -42,7 +42,7 @@ objc_library(
 | 
				
			||||||
        "//mediapipe/tasks/ios/common:MPPCommon",
 | 
					        "//mediapipe/tasks/ios/common:MPPCommon",
 | 
				
			||||||
        "//mediapipe/tasks/ios/test/vision/utils:MPPImageTestUtils",
 | 
					        "//mediapipe/tasks/ios/test/vision/utils:MPPImageTestUtils",
 | 
				
			||||||
        "//mediapipe/tasks/ios/vision/gesture_recognizer:MPPGestureRecognizer",
 | 
					        "//mediapipe/tasks/ios/vision/gesture_recognizer:MPPGestureRecognizer",
 | 
				
			||||||
        "//mediapipe/tasks/ios/test/vision/gesture_recognizer/utils:MPPGestureRecognizerResultProtoHelpers",
 | 
					        "//mediapipe/tasks/ios/test/vision/gesture_recognizer/utils:MPPGestureRecognizerResultProtobufHelpers",
 | 
				
			||||||
    ] + select({
 | 
					    ] + select({
 | 
				
			||||||
        "//third_party:opencv_ios_sim_arm64_source_build": ["@ios_opencv_source//:opencv_xcframework"],
 | 
					        "//third_party:opencv_ios_sim_arm64_source_build": ["@ios_opencv_source//:opencv_xcframework"],
 | 
				
			||||||
        "//third_party:opencv_ios_arm64_source_build": ["@ios_opencv_source//:opencv_xcframework"],
 | 
					        "//third_party:opencv_ios_arm64_source_build": ["@ios_opencv_source//:opencv_xcframework"],
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,7 +15,7 @@
 | 
				
			||||||
#import <XCTest/XCTest.h>
 | 
					#import <XCTest/XCTest.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#import "mediapipe/tasks/ios/common/sources/MPPCommon.h"
 | 
					#import "mediapipe/tasks/ios/common/sources/MPPCommon.h"
 | 
				
			||||||
#import "mediapipe/tasks/ios/test/vision/gesture_recognizer/utils/sources/MPPGestureRecognizerResult+ProtoHelpers.h"
 | 
					#import "mediapipe/tasks/ios/test/vision/gesture_recognizer/utils/sources/MPPGestureRecognizerResult+ProtobufHelpers.h"
 | 
				
			||||||
#import "mediapipe/tasks/ios/test/vision/utils/sources/MPPImage+TestUtils.h"
 | 
					#import "mediapipe/tasks/ios/test/vision/utils/sources/MPPImage+TestUtils.h"
 | 
				
			||||||
#import "mediapipe/tasks/ios/vision/gesture_recognizer/sources/MPPGestureRecognizer.h"
 | 
					#import "mediapipe/tasks/ios/vision/gesture_recognizer/sources/MPPGestureRecognizer.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -64,13 +64,6 @@ static const float kLandmarksErrorTolerance = 0.03f;
 | 
				
			||||||
  XCTAssertEqualWithAccuracy(landmark.y, expectedLandmark.y, kLandmarksErrorTolerance,            \
 | 
					  XCTAssertEqualWithAccuracy(landmark.y, expectedLandmark.y, kLandmarksErrorTolerance,            \
 | 
				
			||||||
                             @"hand index = %d landmark index j = %d", handIndex, landmarkIndex);
 | 
					                             @"hand index = %d landmark index j = %d", handIndex, landmarkIndex);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define AssertApproximatelyEqualMultiHandLandmarks(multiHandLandmarks, expectedMultiHandLandmars) \
 | 
					 | 
				
			||||||
  XCTAssertEqual(multiHandLandmarks.count, expectedMultiHandLandmars.count)                       \
 | 
					 | 
				
			||||||
      XCTAssertEqualWithAccuracy(landmark.x, expectedLandmark.x, kLandmarksErrorTolerance,        \
 | 
					 | 
				
			||||||
                                 @"hand index = %d landmark index j = %d", handIndex, handIndex); \
 | 
					 | 
				
			||||||
  XCTAssertEqualWithAccuracy(landmark.y, expectedLandmark.y, kLandmarksErrorTolerance,            \
 | 
					 | 
				
			||||||
                             @"hand index = %d landmark index j = %d", handIndex, handIndex);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define AssertGestureRecognizerResultIsEmpty(gestureRecognizerResult) \
 | 
					#define AssertGestureRecognizerResultIsEmpty(gestureRecognizerResult) \
 | 
				
			||||||
  XCTAssertTrue(gestureRecognizerResult.gestures.count == 0);         \
 | 
					  XCTAssertTrue(gestureRecognizerResult.gestures.count == 0);         \
 | 
				
			||||||
  XCTAssertTrue(gestureRecognizerResult.handedness.count == 0);       \
 | 
					  XCTAssertTrue(gestureRecognizerResult.handedness.count == 0);       \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,9 +3,9 @@ package(default_visibility = ["//mediapipe/tasks:internal"])
 | 
				
			||||||
licenses(["notice"])
 | 
					licenses(["notice"])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
objc_library(
 | 
					objc_library(
 | 
				
			||||||
    name = "MPPGestureRecognizerResultProtoHelpers",
 | 
					    name = "MPPGestureRecognizerResultProtobufHelpers",
 | 
				
			||||||
    srcs = ["sources/MPPGestureRecognizerResult+ProtoHelpers.mm"],
 | 
					    srcs = ["sources/MPPGestureRecognizerResult+ProtobufHelpers.mm"],
 | 
				
			||||||
    hdrs = ["sources/MPPGestureRecognizerResult+ProtoHelpers.h"],
 | 
					    hdrs = ["sources/MPPGestureRecognizerResult+ProtobufHelpers.h"],
 | 
				
			||||||
    copts = [
 | 
					    copts = [
 | 
				
			||||||
        "-ObjC++",
 | 
					        "-ObjC++",
 | 
				
			||||||
        "-std=c++17",
 | 
					        "-std=c++17",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,7 +16,7 @@
 | 
				
			||||||
#import "mediapipe/tasks/ios/vision/gesture_recognizer/sources/MPPGestureRecognizerResult.h"
 | 
					#import "mediapipe/tasks/ios/vision/gesture_recognizer/sources/MPPGestureRecognizerResult.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
NS_ASSUME_NONNULL_BEGIN
 | 
					NS_ASSUME_NONNULL_BEGIN
 | 
				
			||||||
@interface MPPGestureRecognizerResult (ProtoHelpers)
 | 
					@interface MPPGestureRecognizerResult (ProtobufHelpers)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
+ (MPPGestureRecognizerResult *)
 | 
					+ (MPPGestureRecognizerResult *)
 | 
				
			||||||
    gestureRecognizerResultsFromTextEncodedProtobufFileWithName:(NSString *)fileName
 | 
					    gestureRecognizerResultsFromTextEncodedProtobufFileWithName:(NSString *)fileName
 | 
				
			||||||
| 
						 | 
					@ -29,7 +29,7 @@ using LandmarksDetectionResultProto =
 | 
				
			||||||
using ::mediapipe::tasks::ios::test::vision::utils::get_proto_from_pbtxt;
 | 
					using ::mediapipe::tasks::ios::test::vision::utils::get_proto_from_pbtxt;
 | 
				
			||||||
}  // anonymous namespace
 | 
					}  // anonymous namespace
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@implementation MPPGestureRecognizerResult (ProtoHelpers)
 | 
					@implementation MPPGestureRecognizerResult (ProtobufHelpers)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
+ (MPPGestureRecognizerResult *)
 | 
					+ (MPPGestureRecognizerResult *)
 | 
				
			||||||
    gestureRecognizerResultsFromTextEncodedProtobufFileWithName:(NSString *)fileName
 | 
					    gestureRecognizerResultsFromTextEncodedProtobufFileWithName:(NSString *)fileName
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user