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

Fix crash when FaceLandmarker does not return a result

Browse Source 
PiperOrigin-RevId: 518410060
This commit is contained in:
Sebastian Schmidt 2023-03-21 16:15:11 -07:00 committed by Copybara-Service
parent bbd21e9a6d
commit 788e8d8777
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mediapipe/tasks/cc/vision/face_geometry/calculators/geometry_pipeline_calculator.cc
View File

@ -169,12 +169,11 @@ class GeometryPipelineCalculator : public CalculatorBase {
} }
absl::Status Process(CalculatorContext* cc) override { absl::Status Process(CalculatorContext* cc) override {
// Both the `IMAGE_SIZE` and the `MULTI_FACE_LANDMARKS` streams are required // Both the `IMAGE_SIZE` and either the `FACE_LANDMARKS` or
// to have a non-empty packet. In case this requirement is not met, there's // `MULTI_FACE_LANDMARKS` streams are required to have a non-empty packet.
// nothing to be processed at the current timestamp. // In case this requirement is not met, there's nothing to be processed at
if (cc->Inputs().Tag(kImageSizeTag).IsEmpty() || // the current timestamp and we return early (checked here and below).
(cc->Inputs().Tag(kMultiFaceLandmarksTag).IsEmpty() && if (cc->Inputs().Tag(kImageSizeTag).IsEmpty()) {
cc->Inputs().Tag(kFaceLandmarksTag).IsEmpty())) {
return absl::OkStatus(); return absl::OkStatus();
} }
@ -182,6 +181,10 @@ class GeometryPipelineCalculator : public CalculatorBase {
cc->Inputs().Tag(kImageSizeTag).Get<std::pair<int, int>>(); cc->Inputs().Tag(kImageSizeTag).Get<std::pair<int, int>>();
if (cc->Inputs().HasTag(kMultiFaceLandmarksTag)) { if (cc->Inputs().HasTag(kMultiFaceLandmarksTag)) {
if (cc->Inputs().Tag(kMultiFaceLandmarksTag).IsEmpty()) {
return absl::OkStatus();
}
const auto& multi_face_landmarks = const auto& multi_face_landmarks =
cc->Inputs() cc->Inputs()
.Tag(kMultiFaceLandmarksTag) .Tag(kMultiFaceLandmarksTag)
@ -202,10 +205,14 @@ class GeometryPipelineCalculator : public CalculatorBase {
.AddPacket(mediapipe::Adopt<std::vector<FaceGeometry>>( .AddPacket(mediapipe::Adopt<std::vector<FaceGeometry>>(
multi_face_geometry.release()) multi_face_geometry.release())
.At(cc->InputTimestamp())); .At(cc->InputTimestamp()));
} else { } else if (cc->Inputs().HasTag(kFaceLandmarksTag)) {
if (cc->Inputs().Tag(kFaceLandmarksTag).IsEmpty()) {
return absl::OkStatus();
}
const auto& face_landmarks = const auto& face_landmarks =
cc->Inputs() cc->Inputs()
.Tag(kMultiFaceLandmarksTag) .Tag(kFaceLandmarksTag)
.Get<mediapipe::NormalizedLandmarkList>(); .Get<mediapipe::NormalizedLandmarkList>();
ASSIGN_OR_RETURN( ASSIGN_OR_RETURN(