Simplify code for live analysis

app/src/main/java/org/fairscan/app/domain/ImageSegmentation.kt

@@ -61,7 +61,7 @@ class ImageSegmentationService(private val context: Context, private val logger:
         }
     }
 
-    private fun runSegmentation(interpreter: Interpreter, bitmap: Bitmap, rotationDegrees: Int): SegmentationResult {
+    private fun runSegmentation(interpreter: Interpreter, bitmap: Bitmap): SegmentationResult {
         val startTime = SystemClock.uptimeMillis()
 
         val (_, h, w, _) = interpreter.getOutputTensor(0).shape()
@@ -77,19 +77,15 @@ class ImageSegmentationService(private val context: Context, private val logger:
         val segmentResult = segment(interpreter, processedImage)
 
         val inferenceTime = SystemClock.uptimeMillis() - startTime
-        return SegmentationResult(
-            segmentResult,
-            ImageSize(bitmap.width, bitmap.height),
-            rotationDegrees,
-            inferenceTime)
+        return SegmentationResult(segmentResult, inferenceTime)
     }
 
-    suspend fun runSegmentationAndReturn(bitmap: Bitmap, rotationDegrees: Int): SegmentationResult? {
+    suspend fun runSegmentationAndReturn(bitmap: Bitmap): SegmentationResult? {
         if (interpreter == null) {
             return null
         }
         return inferenceLock.withLock {
-            runSegmentation(interpreter!!, bitmap, rotationDegrees)
+            runSegmentation(interpreter!!, bitmap)
         }
     }
 
@@ -149,8 +145,6 @@ class ImageSegmentationService(private val context: Context, private val logger:
 
     data class SegmentationResult(
         val segmentation: Segmentation,
-        val originalSize: ImageSize,
-        val rotationDegrees: Int,
         val inferenceTime: Long
     )
 }

app/src/main/java/org/fairscan/app/ui/screens/camera/CameraUiState.kt

@@ -24,7 +24,6 @@ data class LiveAnalysisState(
     val inferenceTime: Long = 0L,
     val maskSize: ImageSize? = null,
     val binaryMaskProvider: () -> Bitmap? = { -> null },
-    val documentQuad: Quad? = null,
     val stableQuad: Quad? = null,
 )
 

app/src/main/java/org/fairscan/app/ui/screens/camera/CameraViewModel.kt

@@ -33,6 +33,7 @@ import org.fairscan.app.domain.CapturedPage
 import org.fairscan.app.domain.ExportQuality
 import org.fairscan.app.domain.PageMetadata
 import org.fairscan.app.domain.Rotation
+import org.fairscan.imageprocessing.ImageSize
 import org.fairscan.imageprocessing.Mask
 import org.fairscan.imageprocessing.Quad
 import org.fairscan.imageprocessing.detectDocumentQuad
@@ -100,30 +101,23 @@ class CameraViewModel(appContainer: AppContainer): ViewModel() {
         }
 
         viewModelScope.launch {
+            val rotationDegrees = imageProxy.imageInfo.rotationDegrees
             val result = withContext(Dispatchers.IO) {
-                imageSegmentationService.runSegmentationAndReturn(
-                    imageProxy.toBitmap(),
-                    imageProxy.imageInfo.rotationDegrees,
-                )
+                imageSegmentationService.runSegmentationAndReturn(imageProxy.toBitmap())
             }
 
             result?.let {
+                val segmentation = result.segmentation
+                val maskSize = segmentation.maskSize()
+                val originalSize = ImageSize(imageProxy.width, imageProxy.height)
                 val rawQuad = withContext(Dispatchers.Default) {
-                     detectDocumentQuad(
-                        result.segmentation,
-                        result.originalSize,
-                        isLiveAnalysis = true
-                    )?.rotate90(
-                        result.rotationDegrees / 90,
-                        result.segmentation.width,
-                        result.segmentation.height
-                    )
+                    detectDocumentQuad(segmentation, originalSize, isLiveAnalysis = true)
+                        ?.rotate90(rotationDegrees / 90, maskSize)
                 }
                 val binaryMaskProvider = { ->
-                    var binaryMask: Bitmap = result.segmentation.toBinaryMask()
-                    if (result.rotationDegrees != 0) {
-                        binaryMask =
-                            rotateBitmap(binaryMask, result.rotationDegrees.toFloat())
+                    var binaryMask: Bitmap = segmentation.toBinaryMask()
+                    if (rotationDegrees != 0) {
+                        binaryMask = rotateBitmap(binaryMask, rotationDegrees.toFloat())
                     }
                     binaryMask
                 }
@@ -131,8 +125,7 @@ class CameraViewModel(appContainer: AppContainer): ViewModel() {
                 _liveAnalysisState.value = LiveAnalysisState(
                     inferenceTime = result.inferenceTime,
                     binaryMaskProvider = binaryMaskProvider,
-                    maskSize = result.segmentation.maskSize(),
-                    documentQuad = rawQuad,
+                    maskSize = maskSize,
                     stableQuad = stableQuad,
                 )
             }
@@ -164,10 +157,11 @@ class CameraViewModel(appContainer: AppContainer): ViewModel() {
         rotationDegrees: Int,
     ): CapturedPage? = withContext(Dispatchers.IO) {
         var result: CapturedPage? = null
-        val segmentation = imageSegmentationService.runSegmentationAndReturn(source, 0)
+        val segmentation = imageSegmentationService.runSegmentationAndReturn(source)
         if (segmentation != null) {
             val mask = segmentation.segmentation
-            val quad = detectDocumentQuad(mask, segmentation.originalSize, isLiveAnalysis = false)
+            val originalSize = ImageSize(source.width, source.height)
+            val quad = detectDocumentQuad(mask, originalSize, isLiveAnalysis = false)
             if (quad != null) {
                 val resizedQuad = quad.scaledTo(mask.width, mask.height, source.width, source.height)
                 result = extractDocumentFromBitmap(source, resizedQuad, rotationDegrees, mask)