PiperOrigin-RevId: 518603982
This commit is contained in:
Sebastian Schmidt 2023-03-22 10:17:30 -07:00 committed by Copybara-Service
parent cb2ee87705
commit eda8cb6b42

View File

@ -65,7 +65,7 @@ constexpr char kFaceLandmarkerWithBlendshapesModelBundleName[] =
constexpr char kPortraitImageName[] = "portrait.jpg"; constexpr char kPortraitImageName[] = "portrait.jpg";
constexpr char kPortraitExpectedFaceLandamrksName[] = constexpr char kPortraitExpectedFaceLandamrksName[] =
"portrait_expected_face_landmarks.pbtxt"; "portrait_expected_face_landmarks.pbtxt";
constexpr char kPortraitExpectedFaceLandamrksWithAttentionName[] = constexpr char kPortraitExpectedFaceLandmarksWithAttentionName[] =
"portrait_expected_face_landmarks_with_attention.pbtxt"; "portrait_expected_face_landmarks_with_attention.pbtxt";
constexpr char kPortraitExpectedBlendshapesName[] = constexpr char kPortraitExpectedBlendshapesName[] =
"portrait_expected_blendshapes_with_attention.pbtxt"; "portrait_expected_blendshapes_with_attention.pbtxt";
@ -250,7 +250,7 @@ INSTANTIATE_TEST_SUITE_P(
/* expected_result= */ /* expected_result= */
ConvertToFaceLandmarkerResult( ConvertToFaceLandmarkerResult(
{GetExpectedProto<NormalizedLandmarkList>( {GetExpectedProto<NormalizedLandmarkList>(
kPortraitExpectedFaceLandamrksWithAttentionName)})}, kPortraitExpectedFaceLandmarksWithAttentionName)})},
FaceLandmarkerTestParams{ FaceLandmarkerTestParams{
/* test_name= */ "PortraitWithBlendshapes", /* test_name= */ "PortraitWithBlendshapes",
/* input_model_name= */ /* input_model_name= */
@ -260,7 +260,7 @@ INSTANTIATE_TEST_SUITE_P(
/* expected_result= */ /* expected_result= */
ConvertToFaceLandmarkerResult( ConvertToFaceLandmarkerResult(
{GetExpectedProto<NormalizedLandmarkList>( {GetExpectedProto<NormalizedLandmarkList>(
kPortraitExpectedFaceLandamrksWithAttentionName)}, kPortraitExpectedFaceLandmarksWithAttentionName)},
{{GetExpectedProto<ClassificationList>( {{GetExpectedProto<ClassificationList>(
kPortraitExpectedBlendshapesName)}})}, kPortraitExpectedBlendshapesName)}})},
FaceLandmarkerTestParams{ FaceLandmarkerTestParams{
@ -273,7 +273,7 @@ INSTANTIATE_TEST_SUITE_P(
/* expected_result= */ /* expected_result= */
ConvertToFaceLandmarkerResult( ConvertToFaceLandmarkerResult(
{GetExpectedProto<NormalizedLandmarkList>( {GetExpectedProto<NormalizedLandmarkList>(
kPortraitExpectedFaceLandamrksWithAttentionName)}, kPortraitExpectedFaceLandmarksWithAttentionName)},
{{GetExpectedProto<ClassificationList>( {{GetExpectedProto<ClassificationList>(
kPortraitExpectedBlendshapesName)}}, kPortraitExpectedBlendshapesName)}},
{{MakePortraitExpectedFacialTransformationMatrix()}})}), {{MakePortraitExpectedFacialTransformationMatrix()}})}),
@ -336,7 +336,7 @@ INSTANTIATE_TEST_SUITE_P(
/* expected_result= */ /* expected_result= */
ConvertToFaceLandmarkerResult( ConvertToFaceLandmarkerResult(
{GetExpectedProto<NormalizedLandmarkList>( {GetExpectedProto<NormalizedLandmarkList>(
kPortraitExpectedFaceLandamrksWithAttentionName)})}, kPortraitExpectedFaceLandmarksWithAttentionName)})},
FaceLandmarkerTestParams{ FaceLandmarkerTestParams{
/* test_name= */ "PortraitWithBlendshapes", /* test_name= */ "PortraitWithBlendshapes",
/* input_model_name= */ /* input_model_name= */
@ -346,7 +346,7 @@ INSTANTIATE_TEST_SUITE_P(
/* expected_result= */ /* expected_result= */
ConvertToFaceLandmarkerResult( ConvertToFaceLandmarkerResult(
{GetExpectedProto<NormalizedLandmarkList>( {GetExpectedProto<NormalizedLandmarkList>(
kPortraitExpectedFaceLandamrksWithAttentionName)}, kPortraitExpectedFaceLandmarksWithAttentionName)},
{{GetExpectedProto<ClassificationList>( {{GetExpectedProto<ClassificationList>(
kPortraitExpectedBlendshapesName)}})}), kPortraitExpectedBlendshapesName)}})}),
[](const TestParamInfo<VideoModeTest::ParamType>& info) { [](const TestParamInfo<VideoModeTest::ParamType>& info) {
@ -431,7 +431,7 @@ INSTANTIATE_TEST_SUITE_P(
/* expected_result= */ /* expected_result= */
ConvertToFaceLandmarkerResult( ConvertToFaceLandmarkerResult(
{GetExpectedProto<NormalizedLandmarkList>( {GetExpectedProto<NormalizedLandmarkList>(
kPortraitExpectedFaceLandamrksWithAttentionName)})}, kPortraitExpectedFaceLandmarksWithAttentionName)})},
FaceLandmarkerTestParams{ FaceLandmarkerTestParams{
/* test_name= */ "PortraitWithBlendshapes", /* test_name= */ "PortraitWithBlendshapes",
/* input_model_name= */ /* input_model_name= */
@ -441,7 +441,7 @@ INSTANTIATE_TEST_SUITE_P(
/* expected_result= */ /* expected_result= */
ConvertToFaceLandmarkerResult( ConvertToFaceLandmarkerResult(
{GetExpectedProto<NormalizedLandmarkList>( {GetExpectedProto<NormalizedLandmarkList>(
kPortraitExpectedFaceLandamrksWithAttentionName)}, kPortraitExpectedFaceLandmarksWithAttentionName)},
{{GetExpectedProto<ClassificationList>( {{GetExpectedProto<ClassificationList>(
kPortraitExpectedBlendshapesName)}})}), kPortraitExpectedBlendshapesName)}})}),
[](const TestParamInfo<LiveStreamModeTest::ParamType>& info) { [](const TestParamInfo<LiveStreamModeTest::ParamType>& info) {