diff --git a/README.md b/README.md index 483a247..cc60135 100644 --- a/README.md +++ b/README.md @@ -66,12 +66,11 @@ This library currently is full developed in Kotlin with C++, no additional depen - [x] Face detection - [x] Pupil detection - [x] Landmarks detection +- [x] Pure Java Pidroid (to delete avoid Kotlin dependency) - [ ] Publish Library as Github Package -- [ ] Pure Java Pidroid (to delete avoid Kotlin dependency) - [ ] Rotated faces detection - [ ] Neon support - [ ] SSE support -- [ ] Tegra support ## Usage diff --git a/imagesample/src/main/java/com/suaro/imagesample/CanvasView.kt b/imagesample/src/main/java/com/suaro/imagesample/CanvasView.kt index ec3d4cf..397a749 100644 --- a/imagesample/src/main/java/com/suaro/imagesample/CanvasView.kt +++ b/imagesample/src/main/java/com/suaro/imagesample/CanvasView.kt @@ -36,7 +36,11 @@ class CanvasView @JvmOverloads constructor(context: Context, attrs: AttributeSet paint.setColor(color) paint.setStrokeWidth(RECT_BORDER_WIDTH); - canvas?.drawRoundRect(rect.left.toFloat(), rect.top.toFloat(), rect.right.toFloat(), rect.bottom.toFloat(), RECT_BORDER_RADIUS, RECT_BORDER_RADIUS, paint); + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) { + canvas?.drawRoundRect(rect.left.toFloat(), rect.top.toFloat(), rect.right.toFloat(), rect.bottom.toFloat(), RECT_BORDER_RADIUS, RECT_BORDER_RADIUS, paint) + } else { + canvas?.drawRect(rect, paint) + } } fun drawCircle(circle: Circle, canvas: Canvas?, color: Int = Color.GREEN) {; diff --git a/pidroid/src/main/java/com/suaro/pidroid/core/PidroidConfig.java b/pidroid/src/main/java/com/suaro/pidroid/core/PidroidConfig.java index 4ce29a7..6aec845 100644 --- a/pidroid/src/main/java/com/suaro/pidroid/core/PidroidConfig.java +++ b/pidroid/src/main/java/com/suaro/pidroid/core/PidroidConfig.java @@ -6,7 +6,7 @@ public final class PidroidConfig { private float scalefactor = 1.1F; private float stridefactorWidth = 0.2F; private float stridefactorHeight = 0.12F; - private float qthreshold = 1.0F; + private float qthreshold = 3.0F; private int perturbs = 10; private boolean clustering = true; private boolean pupilDetectionEnable = true; @@ -69,7 +69,7 @@ public void setPerturbs(int perturbs) { this.perturbs = perturbs; } - public boolean isClustering() { + public boolean getClustering() { return clustering; } @@ -77,7 +77,7 @@ public void setClustering(boolean clustering) { this.clustering = clustering; } - public boolean isPupilDetectionEnable() { + public boolean getPupilDetectionEnable() { return pupilDetectionEnable; } @@ -85,7 +85,7 @@ public void setPupilDetectionEnable(boolean pupilDetectionEnable) { this.pupilDetectionEnable = pupilDetectionEnable; } - public boolean isLandmarkDetectionEnable() { + public boolean getLandmarkDetectionEnable() { return landmarkDetectionEnable; } @@ -93,7 +93,7 @@ public void setLandmarkDetectionEnable(boolean landmarkDetectionEnable) { this.landmarkDetectionEnable = landmarkDetectionEnable; } - public boolean isProminentFaceOnly() { + public boolean getProminentFaceOnly() { return prominentFaceOnly; } diff --git a/realtimesample/src/main/java/com/suaro/realtimesample/MainActivity.kt b/realtimesample/src/main/java/com/suaro/realtimesample/MainActivity.kt index 2c156ae..154b814 100644 --- a/realtimesample/src/main/java/com/suaro/realtimesample/MainActivity.kt +++ b/realtimesample/src/main/java/com/suaro/realtimesample/MainActivity.kt @@ -39,7 +39,8 @@ class MainActivity : AppCompatActivity(), Camera.View, Capturer.View{ private fun setupNative() { val pidroidConfig = PidroidConfig() - pidroidConfig.isProminentFaceOnly = true + pidroidConfig.prominentFaceOnly = true + pidroidConfig.qthreshold = 1.5f Pidroid.setup(this, pidroidConfig) }