Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/image quality #58

Merged
merged 7 commits into from
Apr 6, 2021
+306 −43
Merged

Feature/image quality #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d415a7
feat: create ImageQualityController to analyze image quality
Goulartvic Apr 1, 2021
ca64990
Merge branch 'development' into FEATURE/image-quality
Goulartvic Apr 5, 2021
8455273
refactor: upgrade imageQuality algorithm
Goulartvic Apr 6, 2021
76e3f5e
feat: retrieve imageQuality Darkness, Lightness and Sharpness treshol…
Goulartvic Apr 6, 2021
4344849
fix: fix extensions bitmap.mirror bug
Goulartvic Apr 6, 2021
8a0d7b9
fix: change qrCode scanner input to RGB Bitmap to work with xiaomi ce…
Goulartvic Apr 6, 2021
708aaff
refactor: removed useless if
Goulartvic Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion app/src/main/java/ai/cyberlabs/yoonit/camerademo/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,10 @@ class MainActivity : AppCompatActivity() {
count: Int,
total: Int,
imagePath: String,
inferences: ArrayList<android.util.Pair<String, FloatArray>>
inferences: ArrayList<android.util.Pair<String, FloatArray>>,
darkness: Double,
lightness: Double,
sharpness: Double
) {
Log.d(TAG, "onImageCaptured . . . . . . . . . . . . . . . . . . . . . . . . .")

Expand All @@ -346,6 +349,13 @@ class MainActivity : AppCompatActivity() {
maskProbabilityTextView.text = probability.toString()
}

darknessTextView.text = if (darkness > 0.7) "Too Dark" else "Normal"
darknessProbabilityTextView.text = darkness.toString()
lightnessTextView.text = if (lightness > 0.65) "Too Light" else "Normal"
lightnessProbabilityTextView.text = lightness.toString()
sharpnessTextView.text = if (sharpness < 0.1591) "Blurred" else "Normal"
sharpnessProbabilityTextView.text = sharpness.toString()

Log.d(TAG, " . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .")

info_textview.text = "$count/$total"
Expand Down
82 changes: 74 additions & 8 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10px"
android:layout_marginRight="10dp"
android:text="Left Eye:" />
<TextView
android:id="@+id/leftEyeTextView"
Expand All @@ -370,7 +370,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10px"
android:layout_marginRight="10dp"
android:text="Right Eye:" />
<TextView
android:id="@+id/rightEyeTextView"
Expand All @@ -392,7 +392,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10px"
android:layout_marginRight="10dp"
android:text="Smiling:" />
<TextView
android:id="@+id/smlingTextView"
Expand All @@ -414,7 +414,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10px"
android:layout_marginRight="10dp"
android:text="Vertical:" />
<TextView
android:id="@+id/headVerticalTextView"
Expand All @@ -436,7 +436,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10px"
android:layout_marginRight="10dp"
android:text="Horizontal:" />
<TextView
android:id="@+id/headHorizontalTextView"
Expand All @@ -458,7 +458,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10px"
android:layout_marginRight="10dp"
android:text="Tilt:" />
<TextView
android:id="@+id/headTiltTextView"
Expand All @@ -475,11 +475,12 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_marginBottom="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10px"
android:layout_marginRight="10dp"
android:text="Using Mask:" />
<TextView
android:id="@+id/maskTextView"
Expand All @@ -493,6 +494,71 @@
android:layout_height="wrap_content"
android:text="-" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="Darkness:" />
<TextView
android:id="@+id/darknessTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="-" />
<TextView
android:id="@+id/darknessProbabilityTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="Lighness:" />
<TextView
android:id="@+id/lightnessTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="-" />
<TextView
android:id="@+id/lightnessProbabilityTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="Sharpness:" />
<TextView
android:id="@+id/sharpnessTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="-" />
<TextView
android:id="@+id/sharpnessProbabilityTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
12 changes: 10 additions & 2 deletions yoonit-camera/src/main/java/ai/cyberlabs/yoonit/camera/analyzers/CoordinatesController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import ai.cyberlabs.yoonit.facefy.model.FaceDetected
import android.graphics.PointF
import android.graphics.Rect
import android.graphics.RectF
import androidx.camera.core.CameraSelector
import com.google.mlkit.vision.common.InputImage

/**
Expand Down Expand Up @@ -76,7 +77,11 @@ class CoordinatesController(
((this.graphicView.height.toFloat() * imageAspectRatio) - this.graphicView.width.toFloat()) / 2
}

val x = this.scale(detectionBox.centerX().toFloat(), scaleFactor) - postScaleWidthOffset
var x = this.scale(detectionBox.centerX().toFloat(), scaleFactor) - postScaleWidthOffset
if (CaptureOptions.cameraLens == CameraSelector.LENS_FACING_BACK) {
x = this.graphicView.width - x
}

val y = this.scale(detectionBox.centerY().toFloat(), scaleFactor) - postScaleHeightOffset

val left = x - this.scale(detectionBox.width() / 2.0f, scaleFactor)
Expand Down Expand Up @@ -186,7 +191,10 @@ class CoordinatesController(
val faceContours = mutableListOf<PointF>()

contours.forEach { point ->
val x = this.scale(point.x, scaleFactor) - postScaleWidthOffset
var x = this.scale(point.x, scaleFactor) - postScaleWidthOffset
if (CaptureOptions.cameraLens == CameraSelector.LENS_FACING_BACK) {
x = this.graphicView.width - x
}
val y = this.scale(point.y, scaleFactor) - postScaleHeightOffset
faceContours.add(PointF(x, y))
}
Expand Down
46 changes: 29 additions & 17 deletions yoonit-camera/src/main/java/ai/cyberlabs/yoonit/camera/analyzers/face/FaceAnalyzer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ package ai.cyberlabs.yoonit.camera.analyzers.face
import ai.cyberlabs.yoonit.camera.CameraGraphicView
import ai.cyberlabs.yoonit.camera.analyzers.CoordinatesController
import ai.cyberlabs.yoonit.camera.controllers.ComputerVisionController
import ai.cyberlabs.yoonit.camera.controllers.ImageQualityController
import ai.cyberlabs.yoonit.camera.interfaces.CameraCallback
import ai.cyberlabs.yoonit.camera.interfaces.CameraEventListener
import ai.cyberlabs.yoonit.camera.models.CaptureOptions
Expand All @@ -25,6 +26,7 @@ import android.graphics.Bitmap
import android.graphics.Rect
import android.graphics.RectF
import android.media.Image
import androidx.camera.core.CameraSelector
import androidx.camera.core.ImageAnalysis
import androidx.camera.core.ImageProxy
import java.io.File
Expand Down Expand Up @@ -55,10 +57,10 @@ class FaceAnalyzer(

val mediaImage = imageProxy.image ?: return

val bitmap = mediaImage
var bitmap = mediaImage
.toRGBBitmap(context)
.rotate(imageProxy.imageInfo.rotationDegrees.toFloat())
.mirror(imageProxy.imageInfo.rotationDegrees.toFloat())
.mirror()

this.facefy.detect(
bitmap,
Expand Down Expand Up @@ -107,16 +109,16 @@ class FaceAnalyzer(

// Emit face analysis.
this.cameraEventListener.onFaceDetected(
detectionBox.left.pxToDPI(this.context),
detectionBox.top.pxToDPI(this.context),
detectionBox.width().pxToDPI(this.context),
detectionBox.height().pxToDPI(this.context),
faceDetected.leftEyeOpenProbability,
faceDetected.rightEyeOpenProbability,
faceDetected.smilingProbability,
faceDetected.headEulerAngleX,
faceDetected.headEulerAngleY,
faceDetected.headEulerAngleZ
detectionBox.left.pxToDPI(this.context),
detectionBox.top.pxToDPI(this.context),
detectionBox.width().pxToDPI(this.context),
detectionBox.height().pxToDPI(this.context),
faceDetected.leftEyeOpenProbability,
faceDetected.rightEyeOpenProbability,
faceDetected.smilingProbability,
faceDetected.headEulerAngleX,
faceDetected.headEulerAngleY,
faceDetected.headEulerAngleZ
)

// Continue only if current time stamp is within the interval.
Expand All @@ -140,8 +142,11 @@ class FaceAnalyzer(
if (CaptureOptions.saveImageCaptured) this.handleSaveImage(faceBitmap)
else ""

val imageQuality: Triple<Double, Double, Double> =
ImageQualityController.processImage(faceBitmap, true)

// Handle to emit image path and the inferences.
this.handleEmitImageCaptured(imagePath, inferences)
this.handleEmitImageCaptured(imagePath, inferences, imageQuality)
}
},
{ errorMessage ->
Expand Down Expand Up @@ -210,7 +215,7 @@ class FaceAnalyzer(

val faceBitmap: Bitmap = colorEncodedBitmap
.rotate(cameraRotation)
.mirror(cameraRotation)
.mirror()
.crop(boundingBox)

return Bitmap.createScaledBitmap(
Expand All @@ -229,7 +234,8 @@ class FaceAnalyzer(
*/
private fun handleEmitImageCaptured(
imagePath: String,
inferences: ArrayList<android.util.Pair<String, FloatArray>>
inferences: ArrayList<android.util.Pair<String, FloatArray>>,
imageQuality: Triple<Double, Double, Double>
) {
if (imagePath == "") return

Expand All @@ -242,7 +248,10 @@ class FaceAnalyzer(
this.numberOfImages,
CaptureOptions.numberOfImages,
imagePath,
inferences
inferences,
imageQuality.first,
imageQuality.second,
imageQuality.third
)
return
}
Expand All @@ -259,7 +268,10 @@ class FaceAnalyzer(
this.numberOfImages,
CaptureOptions.numberOfImages,
imagePath,
inferences
inferences,
imageQuality.first,
imageQuality.second,
imageQuality.third
)
}

Expand Down
21 changes: 16 additions & 5 deletions yoonit-camera/src/main/java/ai/cyberlabs/yoonit/camera/analyzers/frame/FrameAnalyzer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ package ai.cyberlabs.yoonit.camera.analyzers.frame

import ai.cyberlabs.yoonit.camera.CameraGraphicView
import ai.cyberlabs.yoonit.camera.controllers.ComputerVisionController
import ai.cyberlabs.yoonit.camera.controllers.ImageQualityController
import ai.cyberlabs.yoonit.camera.interfaces.CameraCallback
import ai.cyberlabs.yoonit.camera.interfaces.CameraEventListener
import ai.cyberlabs.yoonit.camera.models.CaptureOptions
Expand Down Expand Up @@ -80,9 +81,12 @@ class FrameAnalyzer(
)
}

val imageQuality: Triple<Double, Double, Double> =
ImageQualityController.processImage(frameBitmap, false)

// Handle to emit image path and the inference.
Handler(Looper.getMainLooper()).post {
this.handleEmitImageCaptured(imagePath, inferences)
this.handleEmitImageCaptured(imagePath, inferences, imageQuality)
}
}
}
Expand Down Expand Up @@ -131,7 +135,8 @@ class FrameAnalyzer(
*/
private fun handleEmitImageCaptured(
imagePath: String,
inferences: ArrayList<android.util.Pair<String, FloatArray>>
inferences: ArrayList<android.util.Pair<String, FloatArray>>,
imageQuality: Triple<Double, Double, Double>
) {

// process face number of images.
Expand All @@ -143,7 +148,10 @@ class FrameAnalyzer(
this.numberOfImages,
CaptureOptions.numberOfImages,
imagePath,
inferences
inferences,
imageQuality.first,
imageQuality.second,
imageQuality.third
)
return
}
Expand All @@ -160,7 +168,10 @@ class FrameAnalyzer(
this.numberOfImages,
CaptureOptions.numberOfImages,
imagePath,
inferences
inferences,
imageQuality.first,
imageQuality.second,
imageQuality.third
)
}

Expand All @@ -182,7 +193,7 @@ class FrameAnalyzer(

mediaBitmap
.rotate(rotationDegrees)
.mirror(rotationDegrees)
.mirror()
.compress(
Bitmap.CompressFormat.JPEG,
100,
Expand Down
Loading