From d83f400b0860001dcca0952c6762bb2e4cc62d3e Mon Sep 17 00:00:00 2001 From: kinaryml Date: Tue, 14 Mar 2023 22:32:39 -0700 Subject: [PATCH] Updated API and tests --- .../test/vision/face_landmarker_test.py | 28 +++++++++---------- .../tasks/python/vision/face_landmarker.py | 1 - 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/mediapipe/tasks/python/test/vision/face_landmarker_test.py b/mediapipe/tasks/python/test/vision/face_landmarker_test.py index 49cdacbf..eec19d58 100644 --- a/mediapipe/tasks/python/test/vision/face_landmarker_test.py +++ b/mediapipe/tasks/python/test/vision/face_landmarker_test.py @@ -207,20 +207,20 @@ class HandLandmarkerTest(parameterized.TestCase): _PORTRAIT_EXPECTED_FACE_LANDMARKS_WITH_ATTENTION), _get_expected_face_blendshapes( _PORTRAIT_EXPECTED_BLENDSHAPES), None), - # (ModelFileType.FILE_NAME, - # _FACE_LANDMARKER_WITH_BLENDSHAPES_BUNDLE_ASSET_FILE, - # _get_expected_face_landmarks( - # _PORTRAIT_EXPECTED_FACE_LANDMARKS_WITH_ATTENTION), - # _get_expected_face_blendshapes( - # _PORTRAIT_EXPECTED_BLENDSHAPES), - # _make_expected_facial_transformation_matrixes()), - # (ModelFileType.FILE_CONTENT, - # _FACE_LANDMARKER_WITH_BLENDSHAPES_BUNDLE_ASSET_FILE, - # _get_expected_face_landmarks( - # _PORTRAIT_EXPECTED_FACE_LANDMARKS_WITH_ATTENTION), - # _get_expected_face_blendshapes( - # _PORTRAIT_EXPECTED_BLENDSHAPES), - # _make_expected_facial_transformation_matrixes()) + (ModelFileType.FILE_NAME, + _FACE_LANDMARKER_WITH_BLENDSHAPES_BUNDLE_ASSET_FILE, + _get_expected_face_landmarks( + _PORTRAIT_EXPECTED_FACE_LANDMARKS_WITH_ATTENTION), + _get_expected_face_blendshapes( + _PORTRAIT_EXPECTED_BLENDSHAPES), + _make_expected_facial_transformation_matrixes()), + (ModelFileType.FILE_CONTENT, + _FACE_LANDMARKER_WITH_BLENDSHAPES_BUNDLE_ASSET_FILE, + _get_expected_face_landmarks( + _PORTRAIT_EXPECTED_FACE_LANDMARKS_WITH_ATTENTION), + _get_expected_face_blendshapes( + _PORTRAIT_EXPECTED_BLENDSHAPES), + _make_expected_facial_transformation_matrixes()) ) def test_detect(self, model_file_type, model_name, expected_face_landmarks, expected_face_blendshapes, expected_facial_transformation_matrix): diff --git a/mediapipe/tasks/python/vision/face_landmarker.py b/mediapipe/tasks/python/vision/face_landmarker.py index 519a78df..c109c646 100644 --- a/mediapipe/tasks/python/vision/face_landmarker.py +++ b/mediapipe/tasks/python/vision/face_landmarker.py @@ -162,7 +162,6 @@ def _build_landmarker_result( facial_transformation_matrixes_results = [] if _FACE_GEOMETRY_STREAM_NAME in output_packets: - print(output_packets[_FACE_GEOMETRY_STREAM_NAME]) facial_transformation_matrixes_proto_list = packet_getter.get_proto_list( output_packets[_FACE_GEOMETRY_STREAM_NAME]) for proto in facial_transformation_matrixes_proto_list: