List of included changes imported by Copybara:

- Add pose detection screenshoot to Android quickstart README page - Use the kotlin base class for PoseDetectorProcessor.kt and SegmenterProcessor.kt PiperOrigin-RevId: 360283708 Change-Id: Ia4019d02527ea0f44225ac163f8eea8ab695ed9d
JaminZhou · Mar 1, 2021 · caf19a0 · caf19a0
1 parent ae9032e
commit caf19a0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 32 deletions.
diff --git a/android/screenshots/quickstart-pose-detection.png b/android/screenshots/quickstart-pose-detection.png
diff --git a/android/vision-quickstart/README.md b/android/vision-quickstart/README.md
@@ -16,7 +16,7 @@ Features that are included in this Quickstart app:
 * [Pose Detection](https://developers.google.com/ml-kit/vision/pose-detection/android) - Detect the position of the human body in real time.
 * [Selfie Segmentation](https://developers.google.com/ml-kit/vision/selfie-segmentation/android) - Segment people from the background in real time.
 
-<img src="../screenshots/quickstart-picker.png" width="256"/> <img src="../screenshots/quickstart-image-labeling.png" width="256"/> <img src="../screenshots/quickstart-object-detection.png" width="256"/>
+<img src="../screenshots/quickstart-picker.png" width="256"/> <img src="../screenshots/quickstart-image-labeling.png" width="256"/> <img src="../screenshots/quickstart-object-detection.png" width="256"/> <img src="../screenshots/quickstart-pose-detection.png" width="256"/>
 
 ## Getting Started
 

diff --git a/...p/src/main/java/com/google/mlkit/vision/demo/kotlin/posedetector/PoseDetectorProcessor.kt b/...p/src/main/java/com/google/mlkit/vision/demo/kotlin/posedetector/PoseDetectorProcessor.kt
@@ -21,8 +21,8 @@ import android.util.Log
 import com.google.android.gms.tasks.Task
 import com.google.mlkit.vision.common.InputImage
 import com.google.mlkit.vision.demo.GraphicOverlay
-import com.google.mlkit.vision.demo.java.VisionProcessorBase
 import com.google.mlkit.vision.demo.java.posedetector.classification.PoseClassifierProcessor
+import com.google.mlkit.vision.demo.kotlin.VisionProcessorBase
 import com.google.mlkit.vision.pose.Pose
 import com.google.mlkit.vision.pose.PoseDetection
 import com.google.mlkit.vision.pose.PoseDetector

diff --git a/...ckstart/app/src/main/java/com/google/mlkit/vision/demo/kotlin/posedetector/PoseGraphic.kt b/...ckstart/app/src/main/java/com/google/mlkit/vision/demo/kotlin/posedetector/PoseGraphic.kt
@@ -114,32 +114,32 @@ class PoseGraphic internal constructor(
     val leftFootIndex = pose.getPoseLandmark(PoseLandmark.LEFT_FOOT_INDEX)
     val rightFootIndex = pose.getPoseLandmark(PoseLandmark.RIGHT_FOOT_INDEX)
 
-    drawLine(canvas, leftShoulder!!, rightShoulder!!, whitePaint)
-    drawLine(canvas, leftHip!!, rightHip!!, whitePaint)
+    drawLine(canvas, leftShoulder, rightShoulder, whitePaint)
+    drawLine(canvas, leftHip, rightHip, whitePaint)
     // Left body
-    drawLine(canvas, leftShoulder, leftElbow!!, leftPaint)
-    drawLine(canvas, leftElbow, leftWrist!!, leftPaint)
+    drawLine(canvas, leftShoulder, leftElbow, leftPaint)
+    drawLine(canvas, leftElbow, leftWrist, leftPaint)
     drawLine(canvas, leftShoulder, leftHip, leftPaint)
-    drawLine(canvas, leftHip, leftKnee!!, leftPaint)
-    drawLine(canvas, leftKnee, leftAnkle!!, leftPaint)
-    drawLine(canvas, leftWrist, leftThumb!!, leftPaint)
-    drawLine(canvas, leftWrist, leftPinky!!, leftPaint)
-    drawLine(canvas, leftWrist, leftIndex!!, leftPaint)
-    drawLine(canvas, leftIndex, leftPinky!!, leftPaint)
-    drawLine(canvas, leftAnkle, leftHeel!!, leftPaint)
-    drawLine(canvas, leftHeel, leftFootIndex!!, leftPaint)
+    drawLine(canvas, leftHip, leftKnee, leftPaint)
+    drawLine(canvas, leftKnee, leftAnkle, leftPaint)
+    drawLine(canvas, leftWrist, leftThumb, leftPaint)
+    drawLine(canvas, leftWrist, leftPinky, leftPaint)
+    drawLine(canvas, leftWrist, leftIndex, leftPaint)
+    drawLine(canvas, leftIndex, leftPinky, leftPaint)
+    drawLine(canvas, leftAnkle, leftHeel, leftPaint)
+    drawLine(canvas, leftHeel, leftFootIndex, leftPaint)
     // Right body
-    drawLine(canvas, rightShoulder, rightElbow!!, rightPaint)
-    drawLine(canvas, rightElbow, rightWrist!!, rightPaint)
+    drawLine(canvas, rightShoulder, rightElbow, rightPaint)
+    drawLine(canvas, rightElbow, rightWrist, rightPaint)
     drawLine(canvas, rightShoulder, rightHip, rightPaint)
-    drawLine(canvas, rightHip, rightKnee!!, rightPaint)
-    drawLine(canvas, rightKnee, rightAnkle!!, rightPaint)
-    drawLine(canvas, rightWrist, rightThumb!!, rightPaint)
-    drawLine(canvas, rightWrist, rightPinky!!, rightPaint)
-    drawLine(canvas, rightWrist, rightIndex!!, rightPaint)
-    drawLine(canvas, rightIndex, rightPinky!!, rightPaint)
-    drawLine(canvas, rightAnkle, rightHeel!!, rightPaint)
-    drawLine(canvas, rightHeel, rightFootIndex!!, rightPaint)
+    drawLine(canvas, rightHip, rightKnee, rightPaint)
+    drawLine(canvas, rightKnee, rightAnkle, rightPaint)
+    drawLine(canvas, rightWrist, rightThumb, rightPaint)
+    drawLine(canvas, rightWrist, rightPinky, rightPaint)
+    drawLine(canvas, rightWrist, rightIndex, rightPaint)
+    drawLine(canvas, rightIndex, rightPinky, rightPaint)
+    drawLine(canvas, rightAnkle, rightHeel, rightPaint)
+    drawLine(canvas, rightHeel, rightFootIndex, rightPaint)
 
     // Draw inFrameLikelihood for all points
     if (showInFrameLikelihood) {
@@ -161,15 +161,15 @@ class PoseGraphic internal constructor(
 
   internal fun drawLine(
     canvas: Canvas,
-    startLandmark: PoseLandmark,
-    endLandmark: PoseLandmark,
+    startLandmark: PoseLandmark?,
+    endLandmark: PoseLandmark?,
     paint: Paint
   ) {
     // When visualizeZ is true, sets up the paint to draw body line in different colors based on
     // their z values.
     if (visualizeZ) {
-      val start = startLandmark.position3D
-      val end = endLandmark.position3D
+      val start = startLandmark!!.position3D
+      val end = endLandmark!!.position3D
 
       // Gets the range of z value.
       val zLowerBoundInScreenPixel: Float
@@ -213,8 +213,8 @@ class PoseGraphic internal constructor(
         paint
       )
     } else {
-      val start = startLandmark.position
-      val end = endLandmark.position
+      val start = startLandmark!!.position
+      val end = endLandmark!!.position
       canvas.drawLine(
         translateX(start.x), translateY(start.y), translateX(end.x), translateY(end.y), paint
       )

diff --git a/...art/app/src/main/java/com/google/mlkit/vision/demo/kotlin/segmenter/SegmenterProcessor.kt b/...art/app/src/main/java/com/google/mlkit/vision/demo/kotlin/segmenter/SegmenterProcessor.kt
@@ -21,7 +21,7 @@ import android.util.Log
 import com.google.android.gms.tasks.Task
 import com.google.mlkit.vision.common.InputImage
 import com.google.mlkit.vision.demo.GraphicOverlay
-import com.google.mlkit.vision.demo.java.VisionProcessorBase
+import com.google.mlkit.vision.demo.kotlin.VisionProcessorBase
 import com.google.mlkit.vision.demo.preference.PreferenceUtils
 import com.google.mlkit.vision.segmentation.Segmentation
 import com.google.mlkit.vision.segmentation.SegmentationMask
@@ -55,7 +55,7 @@ class SegmenterProcessor :
     Log.d(TAG, "SegmenterProcessor created with option: " + options)
   }
 
-  override fun detectInImage(image: InputImage): Task<SegmentationMask?>? {
+  override fun detectInImage(image: InputImage): Task<SegmentationMask> {
     return segmenter.process(image)
   }