Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix QR code scanner #213

Merged
merged 3 commits into from
Oct 22, 2024
Merged

Fix QR code scanner #213

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d596252
uses QRCodeReader directly
psteniusubi Oct 17, 2024
e49b096
for PlanarYUVLuminanceSource set dataWidth to rowStride
psteniusubi Oct 17, 2024
50e1bce
typo - remove extra colon
psteniusubi Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions ...n-feature/src/main/java/eu/europa/ec/commonfeature/ui/qr_scan/component/QrCodeAnalyzer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ package eu.europa.ec.commonfeature.ui.qr_scan.component
import android.graphics.ImageFormat
import androidx.camera.core.ImageAnalysis
import androidx.camera.core.ImageProxy
import com.google.zxing.BarcodeFormat
import com.google.zxing.BinaryBitmap
import com.google.zxing.DecodeHintType
import com.google.zxing.MultiFormatReader
import com.google.zxing.PlanarYUVLuminanceSource
import com.google.zxing.common.HybridBinarizer
import com.google.zxing.qrcode.QRCodeReader
import java.nio.ByteBuffer

class QrCodeAnalyzer(
Expand All @@ -39,10 +37,11 @@ class QrCodeAnalyzer(

override fun analyze(image: ImageProxy) {
if (image.format in supportedImageFormats) {
val bytes = image.planes.first().buffer.toByteArray()
val plane = image.planes.first();
stzouvaras marked this conversation as resolved.
Show resolved Hide resolved
val bytes = plane.buffer.toByteArray()
val source = PlanarYUVLuminanceSource(
bytes,
image.width,
plane.rowStride,
image.height,
0,
0,
Expand All @@ -52,15 +51,7 @@ class QrCodeAnalyzer(
)
val binaryBmp = BinaryBitmap(HybridBinarizer(source))
try {
val result = MultiFormatReader().apply {
setHints(
mapOf(
DecodeHintType.POSSIBLE_FORMATS to arrayListOf(
BarcodeFormat.QR_CODE
)
)
)
}.decode(binaryBmp)
val result = QRCodeReader().decode(binaryBmp)
onQrCodeScanned(result.text)
} catch (e: Exception) {
e.printStackTrace()
Expand Down
Loading