react-native-rectangle-doc-scanner 3.207.0 → 3.209.0

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

@@ -48,6 +48,7 @@ class CameraController(
 
     private var cameraId: String? = null
     private var sensorOrientation: Int = 0
+    private var sensorAspectRatio: Float? = null
     private var previewSize: Size? = null
     private var analysisSize: Size? = null
     private var previewChoices: Array<Size> = emptyArray()
@@ -254,6 +255,10 @@ class CameraController(
         cameraId = selected
         val characteristics = cameraManager.getCameraCharacteristics(selected)
         sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION) ?: 0
+        val activeArray = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE)
+        sensorAspectRatio = activeArray?.let { rect ->
+            if (rect.height() != 0) rect.width().toFloat() / rect.height().toFloat() else null
+        }
 
         val streamConfig = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)
         previewChoices = streamConfig?.getOutputSizes(SurfaceTexture::class.java) ?: emptyArray()
@@ -267,15 +272,16 @@ class CameraController(
             null
         }
 
-        logSizeCandidates("preview", previewChoices, targetRatio)
-        logSizeCandidates("analysis", analysisChoices, targetRatio)
+        logSizeCandidates("preview", previewChoices, targetRatio, sensorAspectRatio)
+        logSizeCandidates("analysis", analysisChoices, targetRatio, sensorAspectRatio)
 
-        previewSize = choosePreviewSize(previewChoices, targetRatio)
-        analysisSize = chooseAnalysisSize(analysisChoices, targetRatio)
+        previewSize = choosePreviewSize(previewChoices, targetRatio, sensorAspectRatio)
+        analysisSize = chooseAnalysisSize(analysisChoices, targetRatio, sensorAspectRatio)
         Log.d(
             TAG,
             "[CAMERA2] chooseCamera view=${viewWidth}x${viewHeight} ratio=$targetRatio " +
-                "sensorOrientation=$sensorOrientation preview=$previewSize analysis=$analysisSize"
+                "sensorOrientation=$sensorOrientation sensorRatio=$sensorAspectRatio " +
+                "preview=$previewSize analysis=$analysisSize"
         )
     }
 
@@ -399,8 +405,8 @@ class CameraController(
             null
         }
 
-        val newPreview = choosePreviewSize(previewChoices, targetRatio)
-        val newAnalysis = chooseAnalysisSize(analysisChoices, targetRatio)
+        val newPreview = choosePreviewSize(previewChoices, targetRatio, sensorAspectRatio)
+        val newAnalysis = chooseAnalysisSize(analysisChoices, targetRatio, sensorAspectRatio)
 
         if (newPreview != null && newPreview != previewSize) {
             previewSize = newPreview
@@ -428,39 +434,29 @@ class CameraController(
         }
 
         val rotationDegrees = getRotationDegrees()
-        val bufferWidth = previewSize.width.toFloat()
-        val bufferHeight = previewSize.height.toFloat()
-        val rotatedBufferWidth = if (rotationDegrees == 90 || rotationDegrees == 270) {
-            bufferHeight
-        } else {
-            bufferWidth
-        }
-        val rotatedBufferHeight = if (rotationDegrees == 90 || rotationDegrees == 270) {
-            bufferWidth
+        val bufferRect = if (rotationDegrees == 90 || rotationDegrees == 270) {
+            RectF(0f, 0f, previewSize.height.toFloat(), previewSize.width.toFloat())
         } else {
-            bufferHeight
+            RectF(0f, 0f, previewSize.width.toFloat(), previewSize.height.toFloat())
         }
+        val viewRect = RectF(0f, 0f, viewWidth.toFloat(), viewHeight.toFloat())
+        val centerX = viewRect.centerX()
+        val centerY = viewRect.centerY()
 
-        // Fill the view like the default camera preview (center-crop).
-        val scale = kotlin.math.max(
-            viewWidth.toFloat() / rotatedBufferWidth,
-            viewHeight.toFloat() / rotatedBufferHeight
-        )
+        bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
 
         val matrix = Matrix()
-        // Center buffer at origin, rotate, scale to fit, then move to view center.
-        matrix.postTranslate(-bufferWidth / 2f, -bufferHeight / 2f)
+        // Scale to fill (center-crop) and then apply rotation around center.
+        matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL)
         if (rotationDegrees != 0) {
-            matrix.postRotate(rotationDegrees.toFloat())
+            matrix.postRotate(rotationDegrees.toFloat(), centerX, centerY)
         }
-        matrix.postScale(scale, scale)
-        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"
+            "[CAMERA2] transform view=${viewWidth}x${viewHeight} buffer=${previewSize.width}x${previewSize.height} " +
+                "rotation=$rotationDegrees"
         )
     }
 
@@ -604,25 +600,23 @@ class CameraController(
 
     private fun choosePreviewSize(
         choices: Array<Size>,
-        targetRatio: Float?
+        targetRatio: Float?,
+        sensorRatio: Float?
     ): Size? {
         if (choices.isEmpty()) {
             return null
         }
         val candidates = choices.toList()
 
-        if (targetRatio == null) {
+        val ratioBase = sensorRatio ?: targetRatio
+        if (ratioBase == null) {
             return candidates.maxByOrNull { it.width * it.height }
         }
 
-        val normalizedTarget = targetRatio
+        val normalizedTarget = ratioBase
         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()
-                }
+                val ratio = size.width.toFloat() / size.height.toFloat()
                 kotlin.math.abs(ratio - normalizedTarget)
             }.thenByDescending { size ->
                 size.width * size.height
@@ -633,7 +627,8 @@ class CameraController(
 
     private fun chooseAnalysisSize(
         choices: Array<Size>,
-        targetRatio: Float?
+        targetRatio: Float?,
+        sensorRatio: Float?
     ): Size? {
         if (choices.isEmpty()) {
             return null
@@ -642,18 +637,15 @@ class CameraController(
         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) {
+        val ratioBase = sensorRatio ?: targetRatio
+        if (ratioBase == null) {
             return candidates.maxByOrNull { it.width * it.height }
         }
 
-        val normalizedTarget = targetRatio
+        val normalizedTarget = ratioBase
         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()
-                }
+                val ratio = size.width.toFloat() / size.height.toFloat()
                 kotlin.math.abs(ratio - normalizedTarget)
             }.thenByDescending { size ->
                 size.width * size.height
@@ -665,26 +657,24 @@ class CameraController(
     private fun logSizeCandidates(
         label: String,
         choices: Array<Size>,
-        targetRatio: Float?
+        targetRatio: Float?,
+        sensorRatio: Float?
     ) {
         if (choices.isEmpty()) {
             Log.d(TAG, "[CAMERA2] $label sizes: none")
             return
         }
 
-        if (targetRatio == null) {
-            Log.d(TAG, "[CAMERA2] $label sizes: ${choices.size}, targetRatio=null")
+        val ratioBase = sensorRatio ?: targetRatio
+        if (ratioBase == null) {
+            Log.d(TAG, "[CAMERA2] $label sizes: ${choices.size}, ratioBase=null")
             return
         }
 
-        val normalizedTarget = targetRatio
+        val normalizedTarget = ratioBase
         val sorted = choices.sortedWith(
             compareBy<Size> { size ->
-                val ratio = if (normalizedTarget < 1f) {
-                    size.height.toFloat() / size.width.toFloat()
-                } else {
-                    size.width.toFloat() / size.height.toFloat()
-                }
+                val ratio = size.width.toFloat() / size.height.toFloat()
                 kotlin.math.abs(ratio - normalizedTarget)
             }.thenByDescending { size ->
                 size.width * size.height
@@ -692,16 +682,16 @@ class CameraController(
         )
 
         val top = sorted.take(5).joinToString { size ->
-            val ratio = if (normalizedTarget < 1f) {
-                size.height.toFloat() / size.width.toFloat()
-            } else {
-                size.width.toFloat() / size.height.toFloat()
-            }
+            val ratio = size.width.toFloat() / size.height.toFloat()
             val diff = kotlin.math.abs(ratio - normalizedTarget)
             "${size.width}x${size.height}(r=${"%.3f".format(ratio)},d=${"%.3f".format(diff)})"
         }
 
-        Log.d(TAG, "[CAMERA2] $label sizes: ${choices.size}, target=${"%.3f".format(normalizedTarget)} top=$top")
+        Log.d(
+            TAG,
+            "[CAMERA2] $label sizes: ${choices.size}, ratioBase=${"%.3f".format(normalizedTarget)} " +
+                "sensor=${sensorRatio?.let { "%.3f".format(it) }} target=${targetRatio?.let { "%.3f".format(it) }} top=$top"
+        )
     }
 
     private fun startBackgroundThread() {

package/package.json

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