From 1fa79195ece347ee2270831d4d37d9221fe9eefe Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Wed, 20 Dec 2023 11:05:06 -0800 Subject: [PATCH] Rename Holistic's landmarksConfidence to presenceConfidence to match other APIs better PiperOrigin-RevId: 592607279 --- .../holisticlandmarker/HolisticLandmarker.java | 16 ++++++++-------- .../holistic_landmarker/holistic_landmarker.ts | 8 ++++---- .../holistic_landmarker_options.d.ts | 4 ++-- .../holistic_landmarker_test.ts | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/holisticlandmarker/HolisticLandmarker.java b/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/holisticlandmarker/HolisticLandmarker.java index e80da4fca..d8b6e7a1e 100644 --- a/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/holisticlandmarker/HolisticLandmarker.java +++ b/mediapipe/tasks/java/com/google/mediapipe/tasks/vision/holisticlandmarker/HolisticLandmarker.java @@ -479,7 +479,7 @@ public final class HolisticLandmarker extends BaseVisionTaskApi { * Sets minimum confidence score for the face landmark detection to be considered successful. * Defaults to 0.5. */ - public abstract Builder setMinFaceLandmarksConfidence(Float value); + public abstract Builder setMinFacePresenceConfidence(Float value); /** * The minimum confidence score for the pose detection to be considered successful. Defaults @@ -497,7 +497,7 @@ public final class HolisticLandmarker extends BaseVisionTaskApi { * The minimum confidence score for the pose landmarks detection to be considered successful. * Defaults to 0.5. */ - public abstract Builder setMinPoseLandmarksConfidence(Float value); + public abstract Builder setMinPosePresenceConfidence(Float value); /** * The minimum confidence score for the hand landmark detection to be considered successful. @@ -555,13 +555,13 @@ public final class HolisticLandmarker extends BaseVisionTaskApi { abstract Optional minFaceSuppressionThreshold(); - abstract Optional minFaceLandmarksConfidence(); + abstract Optional minFacePresenceConfidence(); abstract Optional minPoseDetectionConfidence(); abstract Optional minPoseSuppressionThreshold(); - abstract Optional minPoseLandmarksConfidence(); + abstract Optional minPosePresenceConfidence(); abstract Optional minHandLandmarksConfidence(); @@ -578,10 +578,10 @@ public final class HolisticLandmarker extends BaseVisionTaskApi { .setRunningMode(RunningMode.IMAGE) .setMinFaceDetectionConfidence(DEFAULT_PRESENCE_THRESHOLD) .setMinFaceSuppressionThreshold(DEFAULT_SUPPRESION_THRESHOLD) - .setMinFaceLandmarksConfidence(DEFAULT_PRESENCE_THRESHOLD) + .setMinFacePresenceConfidence(DEFAULT_PRESENCE_THRESHOLD) .setMinPoseDetectionConfidence(DEFAULT_PRESENCE_THRESHOLD) .setMinPoseSuppressionThreshold(DEFAULT_SUPPRESION_THRESHOLD) - .setMinPoseLandmarksConfidence(DEFAULT_PRESENCE_THRESHOLD) + .setMinPosePresenceConfidence(DEFAULT_PRESENCE_THRESHOLD) .setMinHandLandmarksConfidence(DEFAULT_PRESENCE_THRESHOLD) .setOutputFaceBlendshapes(DEFAULT_OUTPUT_FACE_BLENDSHAPES) .setOutputPoseSegmentationMasks(DEFAULT_OUTPUT_SEGMENTATION_MASKS); @@ -616,12 +616,12 @@ public final class HolisticLandmarker extends BaseVisionTaskApi { // Configure pose detector options. minPoseDetectionConfidence().ifPresent(poseDetectorGraphOptions::setMinDetectionConfidence); minPoseSuppressionThreshold().ifPresent(poseDetectorGraphOptions::setMinSuppressionThreshold); - minPoseLandmarksConfidence().ifPresent(poseLandmarkerGraphOptions::setMinDetectionConfidence); + minPosePresenceConfidence().ifPresent(poseLandmarkerGraphOptions::setMinDetectionConfidence); // Configure face detector options. minFaceDetectionConfidence().ifPresent(faceDetectorGraphOptions::setMinDetectionConfidence); minFaceSuppressionThreshold().ifPresent(faceDetectorGraphOptions::setMinSuppressionThreshold); - minFaceLandmarksConfidence() + minFacePresenceConfidence() .ifPresent(faceLandmarksDetectorGraphOptions::setMinDetectionConfidence); holisticLandmarkerGraphOptions diff --git a/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker.ts b/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker.ts index c70515a92..16c20fdf5 100644 --- a/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker.ts +++ b/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker.ts @@ -303,9 +303,9 @@ export class HolisticLandmarker extends VisionTaskRunner { } // Configure face landmark detector options. - if ('minFaceLandmarksConfidence' in options) { + if ('minFacePresenceConfidence' in options) { this.faceLandmarksDetectorGraphOptions.setMinDetectionConfidence( - options.minFaceLandmarksConfidence ?? DEFAULT_SCORE_THRESHOLD); + options.minFacePresenceConfidence ?? DEFAULT_SCORE_THRESHOLD); } if ('outputFaceBlendshapes' in options) { this.outputFaceBlendshapes = !!options.outputFaceBlendshapes; @@ -322,9 +322,9 @@ export class HolisticLandmarker extends VisionTaskRunner { } // Configure pose landmark detector options. - if ('minPoseLandmarksConfidence' in options) { + if ('minPosePresenceConfidence' in options) { this.poseLandmarksDetectorGraphOptions.setMinDetectionConfidence( - options.minPoseLandmarksConfidence ?? DEFAULT_SCORE_THRESHOLD); + options.minPosePresenceConfidence ?? DEFAULT_SCORE_THRESHOLD); } if ('outputPoseSegmentationMasks' in options) { this.outputPoseSegmentationMasks = !!options.outputPoseSegmentationMasks; diff --git a/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker_options.d.ts b/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker_options.d.ts index 5967b8746..1fc7b2ef4 100644 --- a/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker_options.d.ts +++ b/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker_options.d.ts @@ -34,7 +34,7 @@ export declare interface HolisticLandmarkerOptions extends VisionTaskOptions { * The minimum confidence score of face presence score in the face landmarks * detection. Defaults to 0.5. */ - minFaceLandmarksConfidence?: number|undefined; + minFacePresenceConfidence?: number|undefined; /** * Whether FaceLandmarker outputs face blendshapes classification. Face @@ -58,7 +58,7 @@ export declare interface HolisticLandmarkerOptions extends VisionTaskOptions { * The minimum confidence score of pose presence score in the pose landmarks * detection. Defaults to 0.5. */ - minPoseLandmarksConfidence?: number|undefined; + minPosePresenceConfidence?: number|undefined; /** Whether to output segmentation masks. Defaults to false. */ outputPoseSegmentationMasks?: boolean|undefined; diff --git a/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker_test.ts b/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker_test.ts index bef67106f..e61ae4121 100644 --- a/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker_test.ts +++ b/mediapipe/tasks/web/vision/holistic_landmarker/holistic_landmarker_test.ts @@ -122,10 +122,10 @@ describe('HolisticLandmarker', () => { it('merges options', async () => { await holisticLandmarker.setOptions({minFaceDetectionConfidence: 0.5}); await holisticLandmarker.setOptions({minFaceSuppressionThreshold: 0.5}); - await holisticLandmarker.setOptions({minFaceLandmarksConfidence: 0.5}); + await holisticLandmarker.setOptions({minFacePresenceConfidence: 0.5}); await holisticLandmarker.setOptions({minPoseDetectionConfidence: 0.5}); await holisticLandmarker.setOptions({minPoseSuppressionThreshold: 0.5}); - await holisticLandmarker.setOptions({minPoseLandmarksConfidence: 0.5}); + await holisticLandmarker.setOptions({minPosePresenceConfidence: 0.5}); await holisticLandmarker.setOptions({minHandLandmarksConfidence: 0.5}); verifyGraph( @@ -202,7 +202,7 @@ describe('HolisticLandmarker', () => { defaultValue: 0.3 }, { - optionPath: ['minFaceLandmarksConfidence'], + optionPath: ['minFacePresenceConfidence'], fieldPath: ['faceLandmarksDetectorGraphOptions', 'minDetectionConfidence'], customValue: 0.2, @@ -221,7 +221,7 @@ describe('HolisticLandmarker', () => { defaultValue: 0.3 }, { - optionPath: ['minPoseLandmarksConfidence'], + optionPath: ['minPosePresenceConfidence'], fieldPath: ['poseLandmarksDetectorGraphOptions', 'minDetectionConfidence'], customValue: 0.2,