Merge branch 'google:master' into face-aligner-python

This commit is contained in:
Kinar R 2023-05-01 22:56:00 +05:30 committed by GitHub
commit 544e4b66f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View File

@ -52,7 +52,7 @@ int select = cc->Inputs().Tag(kSelectTag).Get<int>();
write 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 Sets of multiple ports can be declared with `::Multiple`. Note, also, that a tag

View File

@ -130,9 +130,11 @@ absl::Status SetSubTaskBaseOptions(const ModelAssetBundleResources& resources,
face_landmarks_detector_graph_options->mutable_base_options() face_landmarks_detector_graph_options->mutable_base_options()
->set_use_stream_mode(options->base_options().use_stream_mode()); ->set_use_stream_mode(options->base_options().use_stream_mode());
ASSIGN_OR_RETURN(const auto face_stylizer_file, if (face_stylizer_external_file) {
resources.GetFile(kFaceStylizerTFLiteName)); ASSIGN_OR_RETURN(const auto face_stylizer_file,
SetExternalFile(face_stylizer_file, face_stylizer_external_file, is_copy); resources.GetFile(kFaceStylizerTFLiteName));
SetExternalFile(face_stylizer_file, face_stylizer_external_file, is_copy);
}
return absl::OkStatus(); return absl::OkStatus();
} }
@ -234,7 +236,7 @@ class FaceStylizerGraph : public core::ModelTaskGraph {
MP_RETURN_IF_ERROR(SetSubTaskBaseOptions( MP_RETURN_IF_ERROR(SetSubTaskBaseOptions(
*model_asset_bundle_resources, *model_asset_bundle_resources,
sc->MutableOptions<FaceStylizerGraphOptions>(), sc->MutableOptions<FaceStylizerGraphOptions>(),
face_stylizer_external_file.get(), output_stylized ? face_stylizer_external_file.get() : nullptr,
!sc->Service(::mediapipe::tasks::core::kModelResourcesCacheService) !sc->Service(::mediapipe::tasks::core::kModelResourcesCacheService)
.IsAvailable())); .IsAvailable()));
Graph graph; Graph graph;