Accept null data in Frames

husaynhakeem · Jun 27, 2018 · d3eafa6 · d3eafa6
1 parent 0e7c7ee
commit d3eafa6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 80 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     implementation "com.otaliastudios:cameraview:1.5.1"
 
     // Android face detector
-    implementation 'com.github.husaynhakeem:android-face-detector:v1.0'
+    implementation 'com.github.husaynhakeem:android-face-detector:v1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/facedetector/src/main/java/husaynhakeem/io/facedetector/FaceDetector.kt b/facedetector/src/main/java/husaynhakeem/io/facedetector/FaceDetector.kt
@@ -32,18 +32,20 @@ class FaceDetector(private val faceBoundsOverlay: FaceBoundsOverlay) {
     }
 
     private fun detectFacesIn(frame: Frame) {
-        firebaseFaceDetectorWrapper.process(
-                image = convertFrameToImage(frame),
-                onSuccess = {
-                    faceBoundsOverlay.updateFaces(convertToListOfFaceBounds(it))
-                },
-                onError = {
-                    Toast.makeText(faceBoundsOverlay.context, "Error processing images: $it", Toast.LENGTH_LONG).show()
-                })
+        frame.data?.let {
+            firebaseFaceDetectorWrapper.process(
+                    image = convertFrameToImage(frame),
+                    onSuccess = {
+                        faceBoundsOverlay.updateFaces(convertToListOfFaceBounds(it))
+                    },
+                    onError = {
+                        Toast.makeText(faceBoundsOverlay.context, "Error processing images: $it", Toast.LENGTH_LONG).show()
+                    })
+        }
     }
 
     private fun convertFrameToImage(frame: Frame) =
-            FirebaseVisionImage.fromByteArray(frame.data, extractFrameMetadata(frame))
+            FirebaseVisionImage.fromByteArray(frame.data!!, extractFrameMetadata(frame))
 
     private fun extractFrameMetadata(frame: Frame): FirebaseVisionImageMetadata =
             FirebaseVisionImageMetadata.Builder()

diff --git a/facedetector/src/main/java/husaynhakeem/io/facedetector/models/models.kt b/facedetector/src/main/java/husaynhakeem/io/facedetector/models/models.kt
@@ -6,7 +6,7 @@ import android.graphics.Rect
 data class FaceBounds(val id: Int, val box: Rect)
 
 data class Frame(
-        val data: ByteArray,
+        val data: ByteArray?,
         val rotation: Int,
         val size: Size,
         val format: Int,