react-native-rectangle-doc-scanner 3.204.0 → 3.206.0

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

@@ -65,8 +65,8 @@ class CameraController(
 
     companion object {
         private const val TAG = "CameraController"
-        private const val MAX_PREVIEW_WIDTH = 2560
-        private const val MAX_PREVIEW_HEIGHT = 1440
+        private const val MAX_ANALYSIS_WIDTH = 1280
+        private const val MAX_ANALYSIS_HEIGHT = 720
     }
 
     private data class LastFrame(
@@ -267,9 +267,13 @@ class CameraController(
             null
         }
 
-        previewSize = chooseSize(previewChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
-        analysisSize = chooseSize(analysisChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
-        Log.d(TAG, "[CAMERA2] Selected sizes - preview: $previewSize, analysis: $analysisSize")
+        previewSize = choosePreviewSize(previewChoices, targetRatio)
+        analysisSize = chooseAnalysisSize(analysisChoices, targetRatio)
+        Log.d(
+            TAG,
+            "[CAMERA2] chooseCamera view=${viewWidth}x${viewHeight} ratio=$targetRatio " +
+                "sensorOrientation=$sensorOrientation preview=$previewSize analysis=$analysisSize"
+        )
     }
 
     private fun openCamera() {
@@ -320,6 +324,12 @@ class CameraController(
         val previewSize = sizes.first ?: return
         val analysisSize = sizes.second ?: previewSize
 
+        Log.d(
+            TAG,
+            "[CAMERA2] createPreviewSession view=${previewView.width}x${previewView.height} " +
+                "preview=${previewSize.width}x${previewSize.height} analysis=${analysisSize.width}x${analysisSize.height}"
+        )
+
         texture.setDefaultBufferSize(previewSize.width, previewSize.height)
         val previewSurface = Surface(texture)
 
@@ -386,8 +396,8 @@ class CameraController(
             null
         }
 
-        val newPreview = chooseSize(previewChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
-        val newAnalysis = chooseSize(analysisChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
+        val newPreview = choosePreviewSize(previewChoices, targetRatio)
+        val newAnalysis = chooseAnalysisSize(analysisChoices, targetRatio)
 
         if (newPreview != null && newPreview != previewSize) {
             previewSize = newPreview
@@ -396,6 +406,11 @@ class CameraController(
             analysisSize = newAnalysis
         }
 
+        Log.d(
+            TAG,
+            "[CAMERA2] ensurePreviewSizes view=${viewWidth}x${viewHeight} ratio=$targetRatio " +
+                "preview=${previewSize?.width}x${previewSize?.height} analysis=${analysisSize?.width}x${analysisSize?.height}"
+        )
         return Pair(previewSize, analysisSize)
     }
 
@@ -439,6 +454,11 @@ class CameraController(
         matrix.postTranslate(viewWidth / 2f, viewHeight / 2f)
 
         previewView.setTransform(matrix)
+        Log.d(
+            TAG,
+            "[CAMERA2] transform view=${viewWidth}x${viewHeight} buffer=${bufferWidth}x${bufferHeight} " +
+                "rotated=${rotatedBufferWidth}x${rotatedBufferHeight} rotation=$rotationDegrees scale=$scale"
+        )
     }
 
     private fun ensureMatchParent() {
@@ -462,6 +482,7 @@ class CameraController(
             layoutParams.gravity = Gravity.CENTER
             previewView.layoutParams = layoutParams
         }
+        Log.d(TAG, "[CAMERA2] parent=${parentWidth}x${parentHeight} previewView=${previewView.width}x${previewView.height}")
     }
 
     private fun handleImage(image: Image) {
@@ -578,20 +599,48 @@ class CameraController(
         }
     }
 
-    private fun chooseSize(
+    private fun choosePreviewSize(
+        choices: Array<Size>,
+        targetRatio: Float?
+    ): Size? {
+        if (choices.isEmpty()) {
+            return null
+        }
+        val candidates = choices.toList()
+
+        if (targetRatio == null) {
+            return candidates.maxByOrNull { it.width * it.height }
+        }
+
+        val normalizedTarget = targetRatio
+        val sorted = candidates.sortedWith(
+            compareBy<Size> { size ->
+                val ratio = if (normalizedTarget < 1f) {
+                    size.height.toFloat() / size.width.toFloat()
+                } else {
+                    size.width.toFloat() / size.height.toFloat()
+                }
+                kotlin.math.abs(ratio - normalizedTarget)
+            }.thenByDescending { size ->
+                size.width * size.height
+            }
+        )
+        return sorted.first()
+    }
+
+    private fun chooseAnalysisSize(
         choices: Array<Size>,
-        maxWidth: Int,
-        maxHeight: Int,
         targetRatio: Float?
     ): Size? {
         if (choices.isEmpty()) {
             return null
         }
-        val maxCandidates = choices.filter { it.width <= maxWidth && it.height <= maxHeight }
-        val candidates = if (maxCandidates.isNotEmpty()) maxCandidates else choices.toList()
+
+        val capped = choices.filter { it.width <= MAX_ANALYSIS_WIDTH && it.height <= MAX_ANALYSIS_HEIGHT }
+        val candidates = if (capped.isNotEmpty()) capped else choices.toList()
 
         if (targetRatio == null) {
-            return candidates.sortedBy { it.width * it.height }.last()
+            return candidates.maxByOrNull { it.width * it.height }
         }
 
         val normalizedTarget = targetRatio

package/package.json

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