From 52afa02b28a46a0d6fb19c379427aa6a1e4dc44a Mon Sep 17 00:00:00 2001 From: Vinh Thai T <102006662+st-vinhthai@users.noreply.github.com> Date: Wed, 22 May 2024 01:28:58 +0700 Subject: [PATCH] Feat: Update the dependencies for the MediaPipe Task samples (#397) * feat: migrate audio classification dependencies * feat: migrate audio classification dependencies * feat: migrate face detection dependencies * feat: migrate face landmarks dependencies * feat: migrate face stylizer dependencies * feat: remove dowload later files * feat: remove dowload later files * feat: migrate gesture recognizer dependencies * feat: migrate hand landmarks dependencies * feat: remove dowload later files * feat: migrate image classification dependencies * feat: migrate image embedder dependencies * feat: migrate image generation dependencies * feat: remove dowload later files * feat: migrate category masks dependencies * feat: migrate category masks dependencies * feat: migrate interactive segmentation dependencies * feat: migrate language detection dependencies * feat: migrate llm inference dependencies * feat: migrate objects detection dependencies * feat: migrate pose landmarkers dependencies * feat: remove dowload later files * feat: migrate text classifier dependencies * feat: migrate text embedder dependencies --- examples/audio_classifier/android/app/build.gradle | 2 +- examples/face_detector/android/app/build.gradle | 2 +- examples/face_landmarker/android/app/build.gradle | 2 +- examples/face_stylizer/android/app/build.gradle | 2 +- .../google/mediapipe/examples/facestylizer/MainActivity.kt | 4 +++- examples/gesture_recognizer/android/app/build.gradle | 2 +- examples/hand_landmarker/android/app/build.gradle | 2 +- examples/image_classification/android/app/build.gradle | 2 +- examples/image_embedder/android/app/build.gradle | 2 +- examples/image_generation/android/app/build.gradle | 2 +- .../image_segmentation/android/category_mask/app/build.gradle | 2 +- .../android/confidence_mask/app/build.gradle | 2 +- examples/interactive_segmentation/android/app/build.gradle | 2 +- examples/language_detector/android/app/build.gradle | 2 +- examples/llm_inference/android/app/build.gradle.kts | 2 +- examples/object_detection/android/app/build.gradle | 2 +- examples/pose_landmarker/android/app/build.gradle | 2 +- examples/text_classification/android/app/build.gradle | 2 +- examples/text_embedder/android/app/build.gradle | 2 +- 19 files changed, 21 insertions(+), 19 deletions(-) diff --git a/examples/audio_classifier/android/app/build.gradle b/examples/audio_classifier/android/app/build.gradle index 513304a6..5f2b0d7c 100644 --- a/examples/audio_classifier/android/app/build.gradle +++ b/examples/audio_classifier/android/app/build.gradle @@ -81,5 +81,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' // Mediapipe Library - implementation 'com.google.mediapipe:tasks-audio:0.10.0' + implementation 'com.google.mediapipe:tasks-audio:0.10.14' } diff --git a/examples/face_detector/android/app/build.gradle b/examples/face_detector/android/app/build.gradle index 1066ab5d..15370524 100644 --- a/examples/face_detector/android/app/build.gradle +++ b/examples/face_detector/android/app/build.gradle @@ -119,6 +119,6 @@ dependencies { androidTestImplementation "androidx.test:runner:1.4.0" androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0" - implementation 'com.google.mediapipe:tasks-vision:0.10.0' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } \ No newline at end of file diff --git a/examples/face_landmarker/android/app/build.gradle b/examples/face_landmarker/android/app/build.gradle index 3d92c19c..2ebea196 100644 --- a/examples/face_landmarker/android/app/build.gradle +++ b/examples/face_landmarker/android/app/build.gradle @@ -95,5 +95,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' // MediaPipe Library - implementation 'com.google.mediapipe:tasks-vision:0.10.0' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } \ No newline at end of file diff --git a/examples/face_stylizer/android/app/build.gradle b/examples/face_stylizer/android/app/build.gradle index b3255567..84da7e93 100644 --- a/examples/face_stylizer/android/app/build.gradle +++ b/examples/face_stylizer/android/app/build.gradle @@ -55,5 +55,5 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.4' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' - implementation 'com.google.mediapipe:tasks-vision:0.10.5' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } diff --git a/examples/face_stylizer/android/app/src/main/java/com/google/mediapipe/examples/facestylizer/MainActivity.kt b/examples/face_stylizer/android/app/src/main/java/com/google/mediapipe/examples/facestylizer/MainActivity.kt index 73ff0ce0..d05f5774 100644 --- a/examples/face_stylizer/android/app/src/main/java/com/google/mediapipe/examples/facestylizer/MainActivity.kt +++ b/examples/face_stylizer/android/app/src/main/java/com/google/mediapipe/examples/facestylizer/MainActivity.kt @@ -29,6 +29,7 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import com.google.mediapipe.examples.facestylizer.databinding.ActivityMainBinding import com.google.mediapipe.framework.image.ByteBufferExtractor +import kotlin.jvm.optionals.getOrNull class MainActivity : AppCompatActivity(), @@ -112,8 +113,9 @@ class MainActivity : AppCompatActivity(), Toast.makeText(this, error, Toast.LENGTH_SHORT).show() } + @OptIn(ExperimentalStdlibApi::class) private fun onResult(result: FaceStylizationHelper.ResultBundle) { - if (result.stylizedFace == null) { + if (result.stylizedFace == null || result.stylizedFace.stylizedImage().getOrNull() == null) { onError("Failed to stylize image") return } diff --git a/examples/gesture_recognizer/android/app/build.gradle b/examples/gesture_recognizer/android/app/build.gradle index 9e33489e..580fdbfd 100644 --- a/examples/gesture_recognizer/android/app/build.gradle +++ b/examples/gesture_recognizer/android/app/build.gradle @@ -98,5 +98,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' // Mediapipe Library - implementation 'com.google.mediapipe:tasks-vision:0.10.0' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } diff --git a/examples/hand_landmarker/android/app/build.gradle b/examples/hand_landmarker/android/app/build.gradle index d12162c1..837626e4 100644 --- a/examples/hand_landmarker/android/app/build.gradle +++ b/examples/hand_landmarker/android/app/build.gradle @@ -95,5 +95,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' // MediaPipe Library - implementation 'com.google.mediapipe:tasks-vision:0.10.0' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } diff --git a/examples/image_classification/android/app/build.gradle b/examples/image_classification/android/app/build.gradle index 2f01c266..7341e0f1 100644 --- a/examples/image_classification/android/app/build.gradle +++ b/examples/image_classification/android/app/build.gradle @@ -107,5 +107,5 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - implementation 'com.google.mediapipe:tasks-vision:0.10.0' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } diff --git a/examples/image_embedder/android/app/build.gradle b/examples/image_embedder/android/app/build.gradle index 80014b6d..49070abe 100644 --- a/examples/image_embedder/android/app/build.gradle +++ b/examples/image_embedder/android/app/build.gradle @@ -54,5 +54,5 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.4' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' - implementation 'com.google.mediapipe:tasks-vision:0.10.0' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } diff --git a/examples/image_generation/android/app/build.gradle b/examples/image_generation/android/app/build.gradle index 6eca078e..6bc834f8 100644 --- a/examples/image_generation/android/app/build.gradle +++ b/examples/image_generation/android/app/build.gradle @@ -50,5 +50,5 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - implementation 'com.google.mediapipe:tasks-vision-image-generator:0.10.5.2' + implementation 'com.google.mediapipe:tasks-vision-image-generator:0.10.14' } \ No newline at end of file diff --git a/examples/image_segmentation/android/category_mask/app/build.gradle b/examples/image_segmentation/android/category_mask/app/build.gradle index 54c0fcd1..0ecd9ed5 100644 --- a/examples/image_segmentation/android/category_mask/app/build.gradle +++ b/examples/image_segmentation/android/category_mask/app/build.gradle @@ -109,5 +109,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'com.google.truth:truth:1.1.3' - implementation 'com.google.mediapipe:tasks-vision:0.10.0' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } diff --git a/examples/image_segmentation/android/confidence_mask/app/build.gradle b/examples/image_segmentation/android/confidence_mask/app/build.gradle index 79339a94..445b5d00 100644 --- a/examples/image_segmentation/android/confidence_mask/app/build.gradle +++ b/examples/image_segmentation/android/confidence_mask/app/build.gradle @@ -109,5 +109,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'com.google.truth:truth:1.1.3' - implementation 'com.google.mediapipe:tasks-vision:0.10.0' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } diff --git a/examples/interactive_segmentation/android/app/build.gradle b/examples/interactive_segmentation/android/app/build.gradle index 12694768..b04da742 100644 --- a/examples/interactive_segmentation/android/app/build.gradle +++ b/examples/interactive_segmentation/android/app/build.gradle @@ -64,7 +64,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // MediaPipe Library - implementation 'com.google.mediapipe:tasks-vision:0.1.0-alpha-11' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/examples/language_detector/android/app/build.gradle b/examples/language_detector/android/app/build.gradle index e168d44f..075c74c9 100644 --- a/examples/language_detector/android/app/build.gradle +++ b/examples/language_detector/android/app/build.gradle @@ -77,5 +77,5 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - implementation 'com.google.mediapipe:tasks-text:0.10.0' + implementation 'com.google.mediapipe:tasks-text:0.10.14' } \ No newline at end of file diff --git a/examples/llm_inference/android/app/build.gradle.kts b/examples/llm_inference/android/app/build.gradle.kts index 39a368f6..3977c94b 100644 --- a/examples/llm_inference/android/app/build.gradle.kts +++ b/examples/llm_inference/android/app/build.gradle.kts @@ -64,7 +64,7 @@ dependencies { implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.material3:material3") - implementation ("com.google.mediapipe:tasks-genai:0.10.11") + implementation ("com.google.mediapipe:tasks-genai:0.10.14") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") diff --git a/examples/object_detection/android/app/build.gradle b/examples/object_detection/android/app/build.gradle index a359197f..c71c53f2 100644 --- a/examples/object_detection/android/app/build.gradle +++ b/examples/object_detection/android/app/build.gradle @@ -116,5 +116,5 @@ dependencies { androidTestImplementation "androidx.test:runner:1.4.0" androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0" - implementation 'com.google.mediapipe:tasks-vision:0.10.2' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } diff --git a/examples/pose_landmarker/android/app/build.gradle b/examples/pose_landmarker/android/app/build.gradle index 75fe79bd..338c6d82 100644 --- a/examples/pose_landmarker/android/app/build.gradle +++ b/examples/pose_landmarker/android/app/build.gradle @@ -97,5 +97,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' // MediaPipe Library - implementation 'com.google.mediapipe:tasks-vision:0.10.0' + implementation 'com.google.mediapipe:tasks-vision:0.10.14' } \ No newline at end of file diff --git a/examples/text_classification/android/app/build.gradle b/examples/text_classification/android/app/build.gradle index f406d783..d1feadaa 100644 --- a/examples/text_classification/android/app/build.gradle +++ b/examples/text_classification/android/app/build.gradle @@ -70,5 +70,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' // MediaPipe Library - implementation 'com.google.mediapipe:tasks-text:0.10.0' + implementation 'com.google.mediapipe:tasks-text:0.10.14' } diff --git a/examples/text_embedder/android/app/build.gradle b/examples/text_embedder/android/app/build.gradle index 3c03f865..e9ec9407 100644 --- a/examples/text_embedder/android/app/build.gradle +++ b/examples/text_embedder/android/app/build.gradle @@ -54,5 +54,5 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.4' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' - implementation 'com.google.mediapipe:tasks-text:0.10.0' + implementation 'com.google.mediapipe:tasks-text:0.10.14' }