-
-
Notifications
You must be signed in to change notification settings - Fork 459
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* build: upgrade mediapipe to v0.10.9 * build: add proto dependencies * build: use local jdk because toolchain_type won't be resolved * build: keep MEDIAPIPE_MOBILE * build: copy platform_mappings to containers
- Loading branch information
Showing
20 changed files
with
346 additions
and
625 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
# This file allows automatically mapping flags such as '--cpu' to the more | ||
# modern Bazel platforms (https://bazel.build/concepts/platforms). | ||
|
||
# In particular, Bazel platforms lack support for Apple for now if no such | ||
# mapping is put into place. It's inspired from: | ||
# https://github.com/bazelbuild/rules_apple/issues/1764 | ||
|
||
flags: | ||
--cpu=x86 | ||
--crosstool_top=//external:android/crosstool | ||
@com_google_mediapipe//mediapipe:android_x86_platform | ||
|
||
--cpu=x86_64 | ||
--crosstool_top=//external:android/crosstool | ||
@com_google_mediapipe//mediapipe:android_x86_64_platform | ||
|
||
--cpu=armeabi-v7a | ||
--crosstool_top=//external:android/crosstool | ||
@com_google_mediapipe//mediapipe:android_arm_platform | ||
|
||
--cpu=arm64-v8a | ||
--crosstool_top=//external:android/crosstool | ||
@com_google_mediapipe//mediapipe:android_arm64_platform | ||
|
||
--cpu=darwin_x86_64 | ||
--apple_platform_type=macos | ||
@com_google_mediapipe//mediapipe:macos_x86_64_platform | ||
|
||
--cpu=darwin_arm64 | ||
--apple_platform_type=macos | ||
@com_google_mediapipe//mediapipe:macos_arm64_platform | ||
|
||
--cpu=ios_i386 | ||
--apple_platform_type=ios | ||
@com_google_mediapipe//mediapipe:ios_i386_platform | ||
|
||
--cpu=ios_x86_64 | ||
--apple_platform_type=ios | ||
@com_google_mediapipe//mediapipe:ios_x86_64_platform | ||
|
||
--cpu=ios_sim_arm64 | ||
--apple_platform_type=ios | ||
@com_google_mediapipe//mediapipe:ios_sim_arm64_platform | ||
|
||
--cpu=ios_armv7 | ||
--apple_platform_type=ios | ||
@com_google_mediapipe//mediapipe:ios_armv7_platform | ||
|
||
--cpu=ios_arm64 | ||
--apple_platform_type=ios | ||
@com_google_mediapipe//mediapipe:ios_arm64_platform | ||
|
||
--cpu=ios_arm64e | ||
--apple_platform_type=ios | ||
@com_google_mediapipe//mediapipe:ios_arm64e_platform | ||
|
||
--cpu=x64_windows | ||
@com_google_mediapipe//mediapipe:windows_platform | ||
|
||
--cpu=k8 | ||
@com_google_mediapipe//mediapipe:linux_platform |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
diff --git a/mediapipe/framework/tool/switch_container.proto b/mediapipe/framework/tool/switch_container.proto | ||
index a9c2d90..f38de33 100644 | ||
--- a/mediapipe/framework/tool/switch_container.proto | ||
+++ b/mediapipe/framework/tool/switch_container.proto | ||
@@ -27,4 +27,7 @@ message SwitchContainerOptions { | ||
|
||
// Use DefaultInputStreamHandler for muxing & demuxing. | ||
optional bool synchronize_io = 5; | ||
+ | ||
+ optional bool synchronize_demux_io = 6; | ||
+ optional bool synchronize_mux_io = 7; | ||
} | ||
diff --git a/mediapipe/framework/tool/switch_demux_calculator.cc b/mediapipe/framework/tool/switch_demux_calculator.cc | ||
index 1c1d59d..7ea68d7 100644 | ||
--- a/mediapipe/framework/tool/switch_demux_calculator.cc | ||
+++ b/mediapipe/framework/tool/switch_demux_calculator.cc | ||
@@ -115,7 +115,7 @@ absl::Status SwitchDemuxCalculator::GetContract(CalculatorContract* cc) { | ||
} | ||
} | ||
auto& options = cc->Options<mediapipe::SwitchContainerOptions>(); | ||
- if (!options.synchronize_io()) { | ||
+ if (!options.synchronize_io() && !options.synchronize_demux_io()) { | ||
cc->SetInputStreamHandler("ImmediateInputStreamHandler"); | ||
} | ||
cc->SetProcessTimestampBounds(true); | ||
diff --git a/mediapipe/framework/tool/switch_mux_calculator.cc b/mediapipe/framework/tool/switch_mux_calculator.cc | ||
index 9982ae4..a44bc00 100644 | ||
--- a/mediapipe/framework/tool/switch_mux_calculator.cc | ||
+++ b/mediapipe/framework/tool/switch_mux_calculator.cc | ||
@@ -154,7 +154,7 @@ absl::Status SwitchMuxCalculator::Process(CalculatorContext* cc) { | ||
// Update the input channel index if specified. | ||
channel_index_ = tool::GetChannelIndex(*cc, channel_index_); | ||
|
||
- if (options_.synchronize_io()) { | ||
+ if (options_.synchronize_io() || options_.synchronize_mux_io()) { | ||
// Start with adding input signals into channel_history_ and packet_history_ | ||
if (cc->Inputs().HasTag("ENABLE") && | ||
!cc->Inputs().Tag("ENABLE").IsEmpty()) { | ||
diff --git a/mediapipe/modules/pose_landmark/pose_landmark_filtering.pbtxt b/mediapipe/modules/pose_landmark/pose_landmark_filtering.pbtxt | ||
index bb3665f..27d141c 100644 | ||
--- a/mediapipe/modules/pose_landmark/pose_landmark_filtering.pbtxt | ||
+++ b/mediapipe/modules/pose_landmark/pose_landmark_filtering.pbtxt | ||
@@ -100,6 +100,7 @@ node { | ||
options: { | ||
[mediapipe.SwitchContainerOptions.ext] { | ||
enable: true | ||
+ synchronize_demux_io: true | ||
contained_node: { | ||
calculator: "LandmarksSmoothingCalculator" | ||
options: { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.