Merge branch 'v0.8.11-main' into lindera-android-api

# Conflicts:
#	.gitignore
This commit is contained in:
Mautisim Munir 2022-10-16 06:00:30 +05:00
commit ad83051b8b
2 changed files with 81 additions and 4 deletions

80
.gitignore vendored
View File

@ -4,7 +4,79 @@ mediapipe/MediaPipe.tulsiproj/*.tulsiconf-user
mediapipe/provisioning_profile.mobileprovision mediapipe/provisioning_profile.mobileprovision
.configure.bazelrc .configure.bazelrc
.user.bazelrc .user.bazelrc
/mediapipe/examples/android/solutions/posetracking/libs/
/mediapipe/examples/android/solutions/.idea/
/mediapipe/examples/android/solutions/posetracking-camera/libs/ # Built application files
/mediapipe/examples/android/solutions/posetracking-camera/build/ *.apk
*.aar
*.ap_
*.aab
# Files for the ART/Dalvik VM
*.dex
# Java class files
*.class
# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/
# Gradle files
.gradle/
build/
# Local configuration file (sdk path, etc)
local.properties
# Proguard folder generated by Eclipse
proguard/
# Log Files
*.log
# Android Studio Navigation editor temp files
.navigation/
# Android Studio captures folder
captures/
# IntelliJ
*.iml
.idea/
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/gradle.xml
# .idea/assetWizardSettings.xml
# .idea/dictionaries
.idea/libraries
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml
# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
*.jks
*.keystore
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/
# Google Services (e.g. APIs or Firebase)
google-services.json
# Freeline
freeline.py
freeline/
freeline_project_description.json
# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
# Version control
vcs.xml
# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
# MacOS
.DS_Store
# App Specific cases
app/release/output.json
.idea/codeStyles/

View File

@ -140,6 +140,11 @@ node {
input_side_packet: "MODEL:model" input_side_packet: "MODEL:model"
input_stream: "TENSORS:input_tensors" input_stream: "TENSORS:input_tensors"
output_stream: "TENSORS:output_tensors" output_stream: "TENSORS:output_tensors"
options: {
[mediapipe.InferenceCalculatorOptions.ext] {
delegate { gpu { use_advanced_gpu_api: true } }
}
}
} }
# Decodes the tensors into the corresponding landmark and segmentation mask # Decodes the tensors into the corresponding landmark and segmentation mask