From b9a9da5de54e34c3dff2a3232a5674ab4fbf9a78 Mon Sep 17 00:00:00 2001 From: Jiuqiang Tang Date: Mon, 1 May 2023 10:16:20 -0700 Subject: [PATCH 1/2] Ignore fetching face stylizer model when the graph doesn't output stylized face images. PiperOrigin-RevId: 528504312 --- .../cc/vision/face_stylizer/face_stylizer_graph.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mediapipe/tasks/cc/vision/face_stylizer/face_stylizer_graph.cc b/mediapipe/tasks/cc/vision/face_stylizer/face_stylizer_graph.cc index 6f2777fc7..7bb2e9c8d 100644 --- a/mediapipe/tasks/cc/vision/face_stylizer/face_stylizer_graph.cc +++ b/mediapipe/tasks/cc/vision/face_stylizer/face_stylizer_graph.cc @@ -130,9 +130,11 @@ absl::Status SetSubTaskBaseOptions(const ModelAssetBundleResources& resources, face_landmarks_detector_graph_options->mutable_base_options() ->set_use_stream_mode(options->base_options().use_stream_mode()); - ASSIGN_OR_RETURN(const auto face_stylizer_file, - resources.GetFile(kFaceStylizerTFLiteName)); - SetExternalFile(face_stylizer_file, face_stylizer_external_file, is_copy); + if (face_stylizer_external_file) { + ASSIGN_OR_RETURN(const auto face_stylizer_file, + resources.GetFile(kFaceStylizerTFLiteName)); + SetExternalFile(face_stylizer_file, face_stylizer_external_file, is_copy); + } return absl::OkStatus(); } @@ -234,7 +236,7 @@ class FaceStylizerGraph : public core::ModelTaskGraph { MP_RETURN_IF_ERROR(SetSubTaskBaseOptions( *model_asset_bundle_resources, sc->MutableOptions(), - face_stylizer_external_file.get(), + output_stylized ? face_stylizer_external_file.get() : nullptr, !sc->Service(::mediapipe::tasks::core::kModelResourcesCacheService) .IsAvailable())); Graph graph; From cab619f8da145b2759fc130288d8c9125d074de4 Mon Sep 17 00:00:00 2001 From: MediaPipe Team Date: Mon, 1 May 2023 10:22:38 -0700 Subject: [PATCH 2/2] Fix typo in README PiperOrigin-RevId: 528506206 --- mediapipe/framework/api2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediapipe/framework/api2/README.md b/mediapipe/framework/api2/README.md index eb53dd67e..849a5f4c4 100644 --- a/mediapipe/framework/api2/README.md +++ b/mediapipe/framework/api2/README.md @@ -52,7 +52,7 @@ int select = cc->Inputs().Tag(kSelectTag).Get(); write ``` -int select = kSelectTag(cc).Get(); // alternative: *kSelectTag(cc) +int select = kSelect(cc).Get(); // alternative: *kSelect(cc) ``` Sets of multiple ports can be declared with `::Multiple`. Note, also, that a tag