react-native-rectangle-doc-scanner 10.46.0 → 10.47.0

package/android/src/camera2/kotlin/com/reactnativerectangledocscanner/CameraController.kt

@@ -246,8 +246,20 @@ class CameraController(
         }
     }
 
+    // Frame rate throttling for better performance
+    private var lastAnalysisTimestamp: Long = 0
+    private val minAnalysisIntervalMs: Long = 150  // Process at most ~6-7 fps instead of 30 fps
+
     @androidx.annotation.OptIn(ExperimentalGetImage::class)
     private fun analyzeImage(imageProxy: ImageProxy) {
+        // Throttle frame processing to improve performance
+        val currentTime = System.currentTimeMillis()
+        if (currentTime - lastAnalysisTimestamp < minAnalysisIntervalMs) {
+            imageProxy.close()
+            return
+        }
+        lastAnalysisTimestamp = currentTime
+
         val mediaImage = imageProxy.image
         if (mediaImage == null) {
             imageProxy.close()
@@ -533,10 +545,23 @@ class CameraController(
         val centerX = viewWidth / 2f
         val centerY = viewHeight / 2f
 
-        // CameraX already handles rotation via targetRotation
-        // The buffer is already in the correct orientation
-        val rotatedBufferWidth = bufferWidth
-        val rotatedBufferHeight = bufferHeight
+        // For sensor=0 (tablet landscape), we need to manually rotate the buffer
+        // CameraX only handles rotation automatically for sensor=90 (phone portrait)
+        if (sensorOrientation == 0 && displayRotationDegrees != 0) {
+            matrix.postRotate(displayRotationDegrees.toFloat(), centerX, centerY)
+        }
+
+        // Calculate rotated buffer dimensions
+        val rotatedBufferWidth = if (sensorOrientation == 0 && (displayRotationDegrees == 90 || displayRotationDegrees == 270)) {
+            bufferHeight
+        } else {
+            bufferWidth
+        }
+        val rotatedBufferHeight = if (sensorOrientation == 0 && (displayRotationDegrees == 90 || displayRotationDegrees == 270)) {
+            bufferWidth
+        } else {
+            bufferHeight
+        }
 
         // Scale to fill the view while maintaining aspect ratio (center-crop).
         val scaleX = viewWidth.toFloat() / rotatedBufferWidth.toFloat()

package/android/src/camera2/kotlin/com/reactnativerectangledocscanner/DocumentScannerView.kt

@@ -694,14 +694,16 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
 
     /**
      * Overlay view for drawing detected rectangle
+     * Performance optimized: draws only corner points instead of filled polygon
      */
     private class OverlayView(context: Context) : View(context) {
         private var rectangle: Rectangle? = null
         private var overlayColor: Int = Color.parseColor("#80FFFFFF")
-        private val paint = Paint().apply {
+        private val cornerPaint = Paint().apply {
             style = Paint.Style.FILL
-            xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_OVER)
+            isAntiAlias = true
         }
+        private val cornerRadius = 12f // Circle radius for corner points
 
         fun setRectangle(rect: Rectangle?, color: Int) {
             this.rectangle = rect
@@ -713,18 +715,13 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
             super.onDraw(canvas)
 
             rectangle?.let { rect ->
-                paint.color = overlayColor
-
-                // Draw the rectangle overlay (simplified - just a filled polygon)
-                val path = android.graphics.Path().apply {
-                    moveTo(rect.topLeft.x.toFloat(), rect.topLeft.y.toFloat())
-                    lineTo(rect.topRight.x.toFloat(), rect.topRight.y.toFloat())
-                    lineTo(rect.bottomRight.x.toFloat(), rect.bottomRight.y.toFloat())
-                    lineTo(rect.bottomLeft.x.toFloat(), rect.bottomLeft.y.toFloat())
-                    close()
-                }
+                cornerPaint.color = overlayColor
 
-                canvas.drawPath(path, paint)
+                // Draw only corner points for better performance
+                canvas.drawCircle(rect.topLeft.x.toFloat(), rect.topLeft.y.toFloat(), cornerRadius, cornerPaint)
+                canvas.drawCircle(rect.topRight.x.toFloat(), rect.topRight.y.toFloat(), cornerRadius, cornerPaint)
+                canvas.drawCircle(rect.bottomLeft.x.toFloat(), rect.bottomLeft.y.toFloat(), cornerRadius, cornerPaint)
+                canvas.drawCircle(rect.bottomRight.x.toFloat(), rect.bottomRight.y.toFloat(), cornerRadius, cornerPaint)
             }
         }
     }

package/android/src/common/kotlin/com/reactnativerectangledocscanner/DocumentDetector.kt

@@ -472,6 +472,7 @@ class DocumentDetector {
 
         /**
          * Evaluate rectangle quality in view coordinates (closer to iOS behavior).
+         * Improved thresholds for better detection accuracy.
          */
         fun evaluateRectangleQualityInView(
             rectangle: Rectangle,
@@ -483,18 +484,39 @@ class DocumentDetector {
             }
 
             val minDim = kotlin.math.min(viewWidth.toDouble(), viewHeight.toDouble())
-            val angleThreshold = max(140.0, minDim * 0.18)
+
+            // Calculate actual edge lengths for better angle evaluation
+            val topEdgeLength = distance(rectangle.topLeft, rectangle.topRight)
+            val bottomEdgeLength = distance(rectangle.bottomLeft, rectangle.bottomRight)
+            val leftEdgeLength = distance(rectangle.topLeft, rectangle.bottomLeft)
+            val rightEdgeLength = distance(rectangle.topRight, rectangle.bottomRight)
+
+            // Use more lenient threshold: 12% of minimum dimension (reduced from 18%)
+            // This allows for more realistic perspective angles
+            val angleThreshold = max(80.0, minDim * 0.12)
 
             val topYDiff = abs(rectangle.topRight.y - rectangle.topLeft.y)
             val bottomYDiff = abs(rectangle.bottomLeft.y - rectangle.bottomRight.y)
             val leftXDiff = abs(rectangle.topLeft.x - rectangle.bottomLeft.x)
             val rightXDiff = abs(rectangle.topRight.x - rectangle.bottomRight.x)
 
-            if (topYDiff > angleThreshold || bottomYDiff > angleThreshold || leftXDiff > angleThreshold || rightXDiff > angleThreshold) {
+            // Check if edges are too skewed (perspective too extreme)
+            if (topYDiff > angleThreshold || bottomYDiff > angleThreshold ||
+                leftXDiff > angleThreshold || rightXDiff > angleThreshold) {
+                return RectangleQuality.BAD_ANGLE
+            }
+
+            // Additional check: opposite edges should be somewhat similar in length
+            // Allow up to 60% difference (more lenient for perspective)
+            val topBottomRatio = if (bottomEdgeLength > 0) topEdgeLength / bottomEdgeLength else 0.0
+            val leftRightRatio = if (rightEdgeLength > 0) leftEdgeLength / rightEdgeLength else 0.0
+            if (topBottomRatio < 0.4 || topBottomRatio > 2.5 ||
+                leftRightRatio < 0.4 || leftRightRatio > 2.5) {
                 return RectangleQuality.BAD_ANGLE
             }
 
-            val margin = max(50.0, minDim * 0.05)
+            // More lenient margin check: 8% of minimum dimension (increased from 5%)
+            val margin = max(80.0, minDim * 0.08)
             if (rectangle.topLeft.y > margin ||
                 rectangle.topRight.y > margin ||
                 rectangle.bottomLeft.y < (viewHeight - margin) ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rectangle-doc-scanner",
-  "version": "10.46.0",
+  "version": "10.47.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",