From 435bee71e8bbdef994c10e81f115d7cbdf7f61d3 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Sat, 23 Sep 2023 00:08:07 +0530 Subject: [PATCH] Updated iOS hand landmarker Objective C API names --- .../hand_landmarker/MPPHandLandmarkerTests.m | 60 +++++++++---------- .../sources/MPPHandLandmarker.h | 6 +- .../sources/MPPHandLandmarker.mm | 6 +- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/mediapipe/tasks/ios/test/vision/hand_landmarker/MPPHandLandmarkerTests.m b/mediapipe/tasks/ios/test/vision/hand_landmarker/MPPHandLandmarkerTests.m index 1e7470d8e..9e27937d8 100644 --- a/mediapipe/tasks/ios/test/vision/hand_landmarker/MPPHandLandmarkerTests.m +++ b/mediapipe/tasks/ios/test/vision/hand_landmarker/MPPHandLandmarkerTests.m @@ -208,10 +208,10 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; return image; } -- (MPPHandLandmarkerResult *)detectInImageWithFileInfo:(ResourceFileInfo *)imageFileInfo - usingHandLandmarker:(MPPHandLandmarker *)handLandmarker { +- (MPPHandLandmarkerResult *)detectImageWithFileInfo:(ResourceFileInfo *)imageFileInfo + usingHandLandmarker:(MPPHandLandmarker *)handLandmarker { MPPImage *mppImage = [self imageWithFileInfo:imageFileInfo]; - MPPHandLandmarkerResult *handLandmarkerResult = [handLandmarker detectInImage:mppImage error:nil]; + MPPHandLandmarkerResult *handLandmarkerResult = [handLandmarker detectImage:mppImage error:nil]; XCTAssertNotNil(handLandmarkerResult); return handLandmarkerResult; @@ -221,8 +221,8 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; usingHandLandmarker:(MPPHandLandmarker *)handLandmarker approximatelyEqualsHandLandmarkerResult: (MPPHandLandmarkerResult *)expectedHandLandmarkerResult { - MPPHandLandmarkerResult *handLandmarkerResult = [self detectInImageWithFileInfo:fileInfo - usingHandLandmarker:handLandmarker]; + MPPHandLandmarkerResult *handLandmarkerResult = [self detectImageWithFileInfo:fileInfo + usingHandLandmarker:handLandmarker]; [self assertHandLandmarkerResult:handLandmarkerResult isApproximatelyEqualToExpectedResult:expectedHandLandmarkerResult]; } @@ -249,8 +249,8 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; MPPHandLandmarker *handLandmarker = [self createHandLandmarkerWithOptionsSucceeds:handLandmarkerOptions]; - MPPHandLandmarkerResult *handLandmarkerResult = [self detectInImageWithFileInfo:kNoHandsImage - usingHandLandmarker:handLandmarker]; + MPPHandLandmarkerResult *handLandmarkerResult = [self detectImageWithFileInfo:kNoHandsImage + usingHandLandmarker:handLandmarker]; AssertHandLandmarkerResultIsEmpty(handLandmarkerResult); } @@ -264,8 +264,8 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; MPPHandLandmarker *handLandmarker = [self createHandLandmarkerWithOptionsSucceeds:handLandmarkerOptions]; - MPPHandLandmarkerResult *handLandmarkerResult = [self detectInImageWithFileInfo:kTwoHandsImage - usingHandLandmarker:handLandmarker]; + MPPHandLandmarkerResult *handLandmarkerResult = [self detectImageWithFileInfo:kTwoHandsImage + usingHandLandmarker:handLandmarker]; XCTAssertTrue(handLandmarkerResult.handedness.count == numHands); } @@ -280,7 +280,7 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; MPPImage *mppImage = [self imageWithFileInfo:kPointingUpRotatedImage orientation:UIImageOrientationRight]; - MPPHandLandmarkerResult *handLandmarkerResult = [handLandmarker detectInImage:mppImage error:nil]; + MPPHandLandmarkerResult *handLandmarkerResult = [handLandmarker detectImage:mppImage error:nil]; [self assertHandLandmarkerResult:handLandmarkerResult isApproximatelyEqualToExpectedResult:[MPPHandLandmarkerTests @@ -339,9 +339,9 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; MPPImage *image = [self imageWithFileInfo:kThumbUpImage]; NSError *liveStreamApiCallError; - XCTAssertFalse([handLandmarker detectAsyncInImage:image - timestampInMilliseconds:0 - error:&liveStreamApiCallError]); + XCTAssertFalse([handLandmarker detectAsyncImage:image + timestampInMilliseconds:0 + error:&liveStreamApiCallError]); NSError *expectedLiveStreamApiCallError = [NSError errorWithDomain:kExpectedErrorDomain @@ -354,9 +354,9 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; AssertEqualErrors(liveStreamApiCallError, expectedLiveStreamApiCallError); NSError *videoApiCallError; - XCTAssertFalse([handLandmarker detectInVideoFrame:image - timestampInMilliseconds:0 - error:&videoApiCallError]); + XCTAssertFalse([handLandmarker detectVideoFrame:image + timestampInMilliseconds:0 + error:&videoApiCallError]); NSError *expectedVideoApiCallError = [NSError errorWithDomain:kExpectedErrorDomain @@ -378,9 +378,9 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; MPPImage *image = [self imageWithFileInfo:kThumbUpImage]; NSError *liveStreamApiCallError; - XCTAssertFalse([handLandmarker detectAsyncInImage:image - timestampInMilliseconds:0 - error:&liveStreamApiCallError]); + XCTAssertFalse([handLandmarker detectAsyncImage:image + timestampInMilliseconds:0 + error:&liveStreamApiCallError]); NSError *expectedLiveStreamApiCallError = [NSError errorWithDomain:kExpectedErrorDomain @@ -393,7 +393,7 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; AssertEqualErrors(liveStreamApiCallError, expectedLiveStreamApiCallError); NSError *imageApiCallError; - XCTAssertFalse([handLandmarker detectInImage:image error:&imageApiCallError]); + XCTAssertFalse([handLandmarker detectImage:image error:&imageApiCallError]); NSError *expectedImageApiCallError = [NSError errorWithDomain:kExpectedErrorDomain @@ -416,7 +416,7 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; MPPImage *image = [self imageWithFileInfo:kThumbUpImage]; NSError *imageApiCallError; - XCTAssertFalse([handLandmarker detectInImage:image error:&imageApiCallError]); + XCTAssertFalse([handLandmarker detectImage:image error:&imageApiCallError]); NSError *expectedImageApiCallError = [NSError errorWithDomain:kExpectedErrorDomain @@ -428,9 +428,9 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; AssertEqualErrors(imageApiCallError, expectedImageApiCallError); NSError *videoApiCallError; - XCTAssertFalse([handLandmarker detectInVideoFrame:image - timestampInMilliseconds:0 - error:&videoApiCallError]); + XCTAssertFalse([handLandmarker detectVideoFrame:image + timestampInMilliseconds:0 + error:&videoApiCallError]); NSError *expectedVideoApiCallError = [NSError errorWithDomain:kExpectedErrorDomain @@ -452,9 +452,9 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; MPPImage *image = [self imageWithFileInfo:kThumbUpImage]; for (int i = 0; i < 3; i++) { - MPPHandLandmarkerResult *handLandmarkerResult = [handLandmarker detectInVideoFrame:image - timestampInMilliseconds:i - error:nil]; + MPPHandLandmarkerResult *handLandmarkerResult = [handLandmarker detectVideoFrame:image + timestampInMilliseconds:i + error:nil]; [self assertHandLandmarkerResult:handLandmarkerResult isApproximatelyEqualToExpectedResult:[MPPHandLandmarkerTests thumbUpHandLandmarkerResult]]; } @@ -480,10 +480,10 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; MPPImage *image = [self imageWithFileInfo:kThumbUpImage]; - XCTAssertTrue([handLandmarker detectAsyncInImage:image timestampInMilliseconds:1 error:nil]); + XCTAssertTrue([handLandmarker detectAsyncImage:image timestampInMilliseconds:1 error:nil]); NSError *error; - XCTAssertFalse([handLandmarker detectAsyncInImage:image timestampInMilliseconds:0 error:&error]); + XCTAssertFalse([handLandmarker detectAsyncImage:image timestampInMilliseconds:0 error:&error]); NSError *expectedError = [NSError errorWithDomain:kExpectedErrorDomain @@ -533,7 +533,7 @@ static NSString *const kLiveStreamTestsDictExpectationKey = @"expectation"; MPPImage *image = [self imageWithFileInfo:kThumbUpImage]; for (int i = 0; i < iterationCount; i++) { - XCTAssertTrue([handLandmarker detectAsyncInImage:image timestampInMilliseconds:i error:nil]); + XCTAssertTrue([handLandmarker detectAsyncImage:image timestampInMilliseconds:i error:nil]); } NSTimeInterval timeout = 0.5f; diff --git a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h index 80973d391..645f33cd1 100644 --- a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h +++ b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h @@ -146,7 +146,7 @@ NS_SWIFT_NAME(HandLandmarker) * @return An `HandLandmarkerResult` object that contains the hand hand landmarks detection * results. */ -- (nullable MPPHandLandmarkerResult *)detectInImage:(MPPImage *)image +- (nullable MPPHandLandmarkerResult *)detectImage:(MPPImage *)image error:(NSError **)error NS_SWIFT_NAME(detect(image:)); /** @@ -176,7 +176,7 @@ NS_SWIFT_NAME(HandLandmarker) * @return An `HandLandmarkerResult` object that contains the hand hand landmarks detection * results. */ -- (nullable MPPHandLandmarkerResult *)detectInVideoFrame:(MPPImage *)image +- (nullable MPPHandLandmarkerResult *)detectVideoFrame:(MPPImage *)image timestampInMilliseconds:(NSInteger)timestampInMilliseconds error:(NSError **)error NS_SWIFT_NAME(detect(videoFrame:timestampInMilliseconds:)); @@ -216,7 +216,7 @@ NS_SWIFT_NAME(HandLandmarker) * * @return `YES` if the image was sent to the task successfully, otherwise `NO`. */ -- (BOOL)detectAsyncInImage:(MPPImage *)image +- (BOOL)detectAsyncImage:(MPPImage *)image timestampInMilliseconds:(NSInteger)timestampInMilliseconds error:(NSError **)error NS_SWIFT_NAME(detectAsync(image:timestampInMilliseconds:)); diff --git a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.mm b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.mm index cedbf0f23..950cfae91 100644 --- a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.mm +++ b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.mm @@ -140,13 +140,13 @@ static NSString *const kTaskName = @"handLandmarker"; return [self initWithOptions:options error:error]; } -- (nullable MPPHandLandmarkerResult *)detectInImage:(MPPImage *)image error:(NSError **)error { +- (nullable MPPHandLandmarkerResult *)detectImage:(MPPImage *)image error:(NSError **)error { std::optional outputPacketMap = [_visionTaskRunner processImage:image error:error]; return [MPPHandLandmarker handLandmarkerResultWithOptionalOutputPacketMap:outputPacketMap]; } -- (nullable MPPHandLandmarkerResult *)detectInVideoFrame:(MPPImage *)image +- (nullable MPPHandLandmarkerResult *)detectVideoFrame:(MPPImage *)image timestampInMilliseconds:(NSInteger)timestampInMilliseconds error:(NSError **)error { std::optional outputPacketMap = @@ -157,7 +157,7 @@ static NSString *const kTaskName = @"handLandmarker"; return [MPPHandLandmarker handLandmarkerResultWithOptionalOutputPacketMap:outputPacketMap]; } -- (BOOL)detectAsyncInImage:(MPPImage *)image +- (BOOL)detectAsyncImage:(MPPImage *)image timestampInMilliseconds:(NSInteger)timestampInMilliseconds error:(NSError **)error { return [_visionTaskRunner processLiveStreamImage:image