cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quad detection: drop legacy fallback on live analysis

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2026-01-15 14:29:20 +01:00
parent 6ae87aed15
commit d7870a8116
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ data class LiveAnalysisState(
val inferenceTime: Long = 0L, val inferenceTime: Long = 0L,
val binaryMask: Bitmap? = null, val binaryMask: Bitmap? = null,
val documentQuad: Quad? = null, val documentQuad: Quad? = null,
val timestamp: Long = System.currentTimeMillis(),
) )
data class CameraUiState( data class CameraUiState(

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

@@ -15,7 +15,6 @@
package org.fairscan.app.ui.screens.camera package org.fairscan.app.ui.screens.camera
import android.graphics.Bitmap import android.graphics.Bitmap
import android.util.Log
import androidx.camera.core.ImageProxy import androidx.camera.core.ImageProxy
import androidx.core.graphics.createBitmap import androidx.core.graphics.createBitmap
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
@@ -59,7 +58,6 @@ class CameraViewModel(appContainer: AppContainer): ViewModel() {
private var _liveAnalysisState = MutableStateFlow(LiveAnalysisState()) private var _liveAnalysisState = MutableStateFlow(LiveAnalysisState())
val liveAnalysisState: StateFlow<LiveAnalysisState> = _liveAnalysisState.asStateFlow() val liveAnalysisState: StateFlow<LiveAnalysisState> = _liveAnalysisState.asStateFlow()
private var lastSuccessfulLiveAnalysisState: LiveAnalysisState? = null
private val _captureState = MutableStateFlow<CaptureState>(CaptureState.Idle) private val _captureState = MutableStateFlow<CaptureState>(CaptureState.Idle)
val captureState: StateFlow<CaptureState> = _captureState val captureState: StateFlow<CaptureState> = _captureState
@@ -76,14 +74,10 @@ class CameraViewModel(appContainer: AppContainer): ViewModel() {
inferenceTime = it.inferenceTime, inferenceTime = it.inferenceTime,
binaryMask = binaryMask, binaryMask = binaryMask,
documentQuad = detectDocumentQuad(it.segmentation, isLiveAnalysis = true), documentQuad = detectDocumentQuad(it.segmentation, isLiveAnalysis = true),
timestamp = System.currentTimeMillis(),
) )
} }
.collect { .collect {
_liveAnalysisState.value = it _liveAnalysisState.value = it
if (it.documentQuad != null) {
lastSuccessfulLiveAnalysisState = it
}
} }
} }
} }
@@ -139,22 +133,7 @@ class CameraViewModel(appContainer: AppContainer): ViewModel() {
val segmentation = imageSegmentationService.runSegmentationAndReturn(source, 0) val segmentation = imageSegmentationService.runSegmentationAndReturn(source, 0)
if (segmentation != null) { if (segmentation != null) {
val mask = segmentation.segmentation val mask = segmentation.segmentation
var quad = detectDocumentQuad(mask, isLiveAnalysis = false) val quad = detectDocumentQuad(mask, isLiveAnalysis = false)
if (quad == null) {
val now = System.currentTimeMillis()
lastSuccessfulLiveAnalysisState?.timestamp?.let {
val offset = now - it
Log.i("Quad", "Last successful live analysis was $offset ms ago")
}
val recentLive = lastSuccessfulLiveAnalysisState?.takeIf {
now - it.timestamp <= 1500
}
val rotations = (-rotationDegrees / 90) + 4
quad = recentLive?.documentQuad?.rotate90(rotations, mask.width, mask.height)
if (quad != null) {
Log.i("Quad", "Using quad taken in live analysis; rotations=$rotations")
}
}
if (quad != null) { if (quad != null) {
val resizedQuad = quad.scaledTo(mask.width, mask.height, source.width, source.height) val resizedQuad = quad.scaledTo(mask.width, mask.height, source.width, source.height)
result = extractDocumentFromBitmap(source, resizedQuad, rotationDegrees, mask) result = extractDocumentFromBitmap(source, resizedQuad, rotationDegrees, mask)