cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated API and tests

Browse Source
This commit is contained in:
kinaryml 2023-03-16 12:51:19 -07:00
parent 2753c79fde
commit b36b0bb3e8
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mediapipe/tasks/python/test/vision/face_landmarker_test.py
View File

@ -89,9 +89,9 @@ def _get_expected_face_blendshapes(file_path: str):
def _make_expected_facial_transformation_matrixes(): def _make_expected_facial_transformation_matrixes():
matrix = np.array([[0.9995292, -0.005092691, 0.030254554, -0.37340546], matrix = np.array([[0.9995292, -0.005092691, 0.030254554, -0.37340546],
[0.0072318087, 0.99744856, -0.07102106, 22.212194], [0.0072318087, 0.99744856, -0.07102106, 22.212194],
[-0.029815676, 0.07120642, 0.9970159, -64.76358], [-0.029815676, 0.07120642, 0.9970159, -64.76358],
[0, 0, 0, 1]]) [0, 0, 0, 1]])
facial_transformation_matrixes_results = [] facial_transformation_matrixes_results = []
facial_transformation_matrixes_results.append(matrix) facial_transformation_matrixes_results.append(matrix)
return facial_transformation_matrixes_results return facial_transformation_matrixes_results
@ -145,10 +145,10 @@ class FaceLandmarkerTest(parameterized.TestCase):
expected_matrix_list[i].shape[0]) expected_matrix_list[i].shape[0])
self.assertEqual(rename_me.shape[1], self.assertEqual(rename_me.shape[1],
expected_matrix_list[i].shape[1]) expected_matrix_list[i].shape[1])
self.assertAlmostEqual( self.assertSequenceAlmostEqual(
rename_me.all(), rename_me.flatten(),
expected_matrix_list[i].all(), expected_matrix_list[i].flatten(),
delta=_FACIAL_TRANSFORMATION_MATRIX_DIFF_MARGIN) delta=_FACIAL_TRANSFORMATION_MATRIX_DIFF_MARGIN)
def test_create_from_file_succeeds_with_valid_model_path(self): def test_create_from_file_succeeds_with_valid_model_path(self):
# Creates with default option and valid model file successfully. # Creates with default option and valid model file successfully.
@ -441,12 +441,7 @@ class FaceLandmarkerTest(parameterized.TestCase):
(_FACE_LANDMARKER_WITH_BLENDSHAPES_BUNDLE_ASSET_FILE, (_FACE_LANDMARKER_WITH_BLENDSHAPES_BUNDLE_ASSET_FILE,
_get_expected_face_landmarks( _get_expected_face_landmarks(
_PORTRAIT_EXPECTED_FACE_LANDMARKS_WITH_ATTENTION), _PORTRAIT_EXPECTED_FACE_LANDMARKS_WITH_ATTENTION),
_get_expected_face_blendshapes(_PORTRAIT_EXPECTED_BLENDSHAPES), None), _get_expected_face_blendshapes(_PORTRAIT_EXPECTED_BLENDSHAPES), None))
(_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_for_video( def test_detect_for_video(
self, model_name, expected_face_landmarks, expected_face_blendshapes, self, model_name, expected_face_landmarks, expected_face_blendshapes,
expected_facial_transformation_matrixes): expected_facial_transformation_matrixes):
@ -519,12 +514,7 @@ class FaceLandmarkerTest(parameterized.TestCase):
(_PORTRAIT_IMAGE, _FACE_LANDMARKER_WITH_BLENDSHAPES_BUNDLE_ASSET_FILE, (_PORTRAIT_IMAGE, _FACE_LANDMARKER_WITH_BLENDSHAPES_BUNDLE_ASSET_FILE,
_get_expected_face_landmarks( _get_expected_face_landmarks(
_PORTRAIT_EXPECTED_FACE_LANDMARKS_WITH_ATTENTION), _PORTRAIT_EXPECTED_FACE_LANDMARKS_WITH_ATTENTION),
_get_expected_face_blendshapes(_PORTRAIT_EXPECTED_BLENDSHAPES), None), _get_expected_face_blendshapes(_PORTRAIT_EXPECTED_BLENDSHAPES), None))
(_PORTRAIT_IMAGE, _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_async_calls( def test_detect_async_calls(
self, image_path, model_name, expected_face_landmarks, self, image_path, model_name, expected_face_landmarks,
expected_face_blendshapes, expected_facial_transformation_matrixes): expected_face_blendshapes, expected_facial_transformation_matrixes):

6
mediapipe/tasks/python/vision/face_landmarker.py
View File

@ -171,9 +171,9 @@ def _build_landmarker_result(
if proto.pose_transform_matrix: if proto.pose_transform_matrix:
matrix_data = matrix_data_pb2.MatrixData() matrix_data = matrix_data_pb2.MatrixData()
matrix_data.MergeFrom(proto.pose_transform_matrix) matrix_data.MergeFrom(proto.pose_transform_matrix)
order = 'C' if matrix_data.layout == _LayoutEnum.ROW_MAJOR else 'F' matrix = np.array(matrix_data.packed_data)
data = np.array(matrix_data.packed_data, order=order) matrix = matrix.reshape((matrix_data.rows, matrix_data.cols))
matrix = data.reshape((matrix_data.rows, matrix_data.cols)) matrix = matrix if matrix_data.layout == _LayoutEnum.ROW_MAJOR else matrix.T
facial_transformation_matrixes_results.append(matrix) facial_transformation_matrixes_results.append(matrix)
return FaceLandmarkerResult(face_landmarks_results, face_blendshapes_results, return FaceLandmarkerResult(face_landmarks_results, face_blendshapes_results,