- fix android image result is not correct orientation and format

 package dev.steenbakker.mobile_scanner
 package dev.steenbakker.mobile_scanner
 
 
 import android.app.Activity
 import android.app.Activity
+import android.graphics.Bitmap
+import android.graphics.Matrix
 import android.graphics.Rect
 import android.graphics.Rect
 import android.net.Uri
 import android.net.Uri
 import android.os.Handler
 import android.os.Handler
@@ -16,9 +18,12 @@ import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.common.InputImage
 import com.google.mlkit.vision.common.InputImage
 import dev.steenbakker.mobile_scanner.objects.DetectionSpeed
 import dev.steenbakker.mobile_scanner.objects.DetectionSpeed
 import dev.steenbakker.mobile_scanner.objects.MobileScannerStartParameters
 import dev.steenbakker.mobile_scanner.objects.MobileScannerStartParameters
+import dev.steenbakker.mobile_scanner.utils.YuvToRgbConverter
 import io.flutter.view.TextureRegistry
 import io.flutter.view.TextureRegistry
+import java.io.ByteArrayOutputStream
 import kotlin.math.roundToInt
 import kotlin.math.roundToInt
 
 
+
 class MobileScanner(
 class MobileScanner(
     private val activity: Activity,
     private val activity: Activity,
     private val textureRegistry: TextureRegistry,
     private val textureRegistry: TextureRegistry,
@@ -82,15 +87,42 @@ class MobileScanner(
                     }
                     }
                 }
                 }
 
 
+
                 if (barcodeMap.isNotEmpty()) {
                 if (barcodeMap.isNotEmpty()) {
+                    if (returnImage) {
+
+                        val bitmap = Bitmap.createBitmap(mediaImage.width, mediaImage.height, Bitmap.Config.ARGB_8888)
+
+                        val imageFormat = YuvToRgbConverter(activity.applicationContext)
+
+                        imageFormat.yuvToRgb(mediaImage, bitmap)
+
+                        val bmResult = rotateBitmap(bitmap, camera!!.cameraInfo.sensorRotationDegrees.toFloat())
+
+                        val stream = ByteArrayOutputStream()
+                        bmResult.compress(Bitmap.CompressFormat.PNG, 100, stream)
+                        val byteArray = stream.toByteArray()
+                        bmResult.recycle()
+
+
+                        mobileScannerCallback(
+                            barcodeMap,
+                            byteArray,
+                            bmResult.width,
+                            bmResult.height
+                        )
+
+                    } else {
+
                         mobileScannerCallback(
                         mobileScannerCallback(
                             barcodeMap,
                             barcodeMap,
-                        if (returnImage) mediaImage.toByteArray() else null,
-                        if (returnImage) mediaImage.width else null,
-                        if (returnImage) mediaImage.height else null
+                            null,
+                            null,
+                            null
                         )
                         )
                     }
                     }
                 }
                 }
+            }
             .addOnFailureListener { e ->
             .addOnFailureListener { e ->
                 mobileScannerErrorCallback(
                 mobileScannerErrorCallback(
                     e.localizedMessage ?: e.toString()
                     e.localizedMessage ?: e.toString()
@@ -106,6 +138,13 @@ class MobileScanner(
         }
         }
     }
     }
 
 
+    fun rotateBitmap(bitmap: Bitmap, degrees: Float): Bitmap {
+        val matrix = Matrix()
+        matrix.postRotate(degrees)
+        return Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
+    }
+
+
     // scales the scanWindow to the provided inputImage and checks if that scaled
     // scales the scanWindow to the provided inputImage and checks if that scaled
     // scanWindow contains the barcode
     // scanWindow contains the barcode
     private fun isBarcodeInScanWindow(
     private fun isBarcodeInScanWindow(
@@ -227,7 +266,6 @@ class MobileScanner(
         }, executor)
         }, executor)
 
 
     }
     }
-
     /**
     /**
      * Stop barcode scanning.
      * Stop barcode scanning.
      */
      */

+package dev.steenbakker.mobile_scanner.utils
+
+import android.graphics.ImageFormat
+import android.media.Image
+import androidx.annotation.IntDef
+import java.nio.ByteBuffer
+
+/*
+This file is converted from part of https://github.com/gordinmitya/yuv2buf.
+Follow the link to find demo app, performance benchmarks and unit tests.
+
+Intro to YUV image formats:
+YUV_420_888 - is a generic format that can be represented as I420, YV12, NV21, and NV12.
+420 means that for each 4 luminosity pixels we have 2 chroma pixels: U and V.
+
+* I420 format represents an image as Y plane followed by U then followed by V plane
+    without chroma channels interleaving.
+    For example:
+    Y Y Y Y
+    Y Y Y Y
+    U U V V
+
+* NV21 format represents an image as Y plane followed by V and U interleaved. First V then U.
+    For example:
+    Y Y Y Y
+    Y Y Y Y
+    V U V U
+
+* YV12 and NV12 are the same as previous formats but with swapped order of V and U. (U then V)
+
+Visualization of these 4 formats:
+https://user-images.githubusercontent.com/9286092/89119601-4f6f8100-d4b8-11ea-9a51-2765f7e513c2.jpg
+
+It's guaranteed that image.getPlanes() always returns planes in order Y U V for YUV_420_888.
+https://developer.android.com/reference/android/graphics/ImageFormat#YUV_420_888
+
+Because I420 and NV21 are more widely supported (RenderScript, OpenCV, MNN)
+the conversion is done into these formats.
+
+More about each format: https://www.fourcc.org/yuv.php
+*/
+
+@kotlin.annotation.Retention(AnnotationRetention.SOURCE)
+@IntDef(ImageFormat.NV21, ImageFormat.YUV_420_888)
+annotation class YuvType
+
+class YuvByteBuffer(image: Image, dstBuffer: ByteBuffer? = null) {
+    @YuvType
+    val type: Int
+    val buffer: ByteBuffer
+
+    init {
+        val wrappedImage = ImageWrapper(image)
+
+        type = if (wrappedImage.u.pixelStride == 1) {
+            ImageFormat.YUV_420_888
+        } else {
+            ImageFormat.NV21
+        }
+        val size = image.width * image.height * 3 / 2
+        buffer = if (
+            dstBuffer == null || dstBuffer.capacity() < size ||
+            dstBuffer.isReadOnly || !dstBuffer.isDirect
+        ) {
+            ByteBuffer.allocateDirect(size) }
+        else {
+            dstBuffer
+        }
+        buffer.rewind()
+
+        removePadding(wrappedImage)
+    }
+
+    // Input buffers are always direct as described in
+    // https://developer.android.com/reference/android/media/Image.Plane#getBuffer()
+    private fun removePadding(image: ImageWrapper) {
+        val sizeLuma = image.y.width * image.y.height
+        val sizeChroma = image.u.width * image.u.height
+        if (image.y.rowStride > image.y.width) {
+            removePaddingCompact(image.y, buffer, 0)
+        } else {
+            buffer.position(0)
+            buffer.put(image.y.buffer)
+        }
+        if (type == ImageFormat.YUV_420_888) {
+            if (image.u.rowStride > image.u.width) {
+                removePaddingCompact(image.u, buffer, sizeLuma)
+                removePaddingCompact(image.v, buffer, sizeLuma + sizeChroma)
+            } else {
+                buffer.position(sizeLuma)
+                buffer.put(image.u.buffer)
+                buffer.position(sizeLuma + sizeChroma)
+                buffer.put(image.v.buffer)
+            }
+        } else {
+            if (image.u.rowStride > image.u.width * 2) {
+                removePaddingNotCompact(image, buffer, sizeLuma)
+            } else {
+                buffer.position(sizeLuma)
+                var uv = image.v.buffer
+                val properUVSize = image.v.height * image.v.rowStride - 1
+                if (uv.capacity() > properUVSize) {
+                    uv = clipBuffer(image.v.buffer, 0, properUVSize)
+                }
+                buffer.put(uv)
+                val lastOne = image.u.buffer[image.u.buffer.capacity() - 1]
+                buffer.put(buffer.capacity() - 1, lastOne)
+            }
+        }
+        buffer.rewind()
+    }
+
+    private fun removePaddingCompact(
+        plane: PlaneWrapper,
+        dst: ByteBuffer,
+        offset: Int
+    ) {
+        require(plane.pixelStride == 1) {
+            "use removePaddingCompact with pixelStride == 1"
+        }
+
+        val src = plane.buffer
+        val rowStride = plane.rowStride
+        var row: ByteBuffer
+        dst.position(offset)
+        for (i in 0 until plane.height) {
+            row = clipBuffer(src, i * rowStride, plane.width)
+            dst.put(row)
+        }
+    }
+
+    private fun removePaddingNotCompact(
+        image: ImageWrapper,
+        dst: ByteBuffer,
+        offset: Int
+    ) {
+        require(image.u.pixelStride == 2) {
+            "use removePaddingNotCompact pixelStride == 2"
+        }
+        val width = image.u.width
+        val height = image.u.height
+        val rowStride = image.u.rowStride
+        var row: ByteBuffer
+        dst.position(offset)
+        for (i in 0 until height - 1) {
+            row = clipBuffer(image.v.buffer, i * rowStride, width * 2)
+            dst.put(row)
+        }
+        row = clipBuffer(image.u.buffer, (height - 1) * rowStride - 1, width * 2)
+        dst.put(row)
+    }
+
+    private fun clipBuffer(buffer: ByteBuffer, start: Int, size: Int): ByteBuffer {
+        val duplicate = buffer.duplicate()
+        duplicate.position(start)
+        duplicate.limit(start + size)
+        return duplicate.slice()
+    }
+
+    private class ImageWrapper(image:Image) {
+        val width= image.width
+        val height = image.height
+        val y = PlaneWrapper(width, height, image.planes[0])
+        val u = PlaneWrapper(width / 2, height / 2, image.planes[1])
+        val v = PlaneWrapper(width / 2, height / 2, image.planes[2])
+
+        // Check this is a supported image format
+        // https://developer.android.com/reference/android/graphics/ImageFormat#YUV_420_888
+        init {
+            require(y.pixelStride == 1) {
+                "Pixel stride for Y plane must be 1 but got ${y.pixelStride} instead."
+            }
+            require(u.pixelStride == v.pixelStride && u.rowStride == v.rowStride) {
+                "U and V planes must have the same pixel and row strides " +
+                        "but got pixel=${u.pixelStride} row=${u.rowStride} for U " +
+                        "and pixel=${v.pixelStride} and row=${v.rowStride} for V"
+            }
+            require(u.pixelStride == 1 || u.pixelStride == 2) {
+                "Supported" + " pixel strides for U and V planes are 1 and 2"
+            }
+        }
+    }
+
+    private class PlaneWrapper(width: Int, height: Int, plane: Image.Plane) {
+        val width = width
+        val height = height
+        val buffer: ByteBuffer = plane.buffer
+        val rowStride = plane.rowStride
+        val pixelStride = plane.pixelStride
+    }
+}

+package dev.steenbakker.mobile_scanner.utils
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.ImageFormat
+import android.media.Image
+import android.os.Build
+import android.renderscript.Allocation
+import android.renderscript.Element
+import android.renderscript.RenderScript
+import android.renderscript.ScriptIntrinsicYuvToRGB
+import android.renderscript.Type
+import androidx.annotation.RequiresApi
+import java.nio.ByteBuffer
+
+
+/**
+ * Helper class used to efficiently convert a [Media.Image] object from
+ * YUV_420_888 format to an RGB [Bitmap] object.
+ *
+ * Copied from https://github.com/owahltinez/camerax-tflite/blob/master/app/src/main/java/com/android/example/camerax/tflite/YuvToRgbConverter.kt
+ *
+ * The [yuvToRgb] method is able to achieve the same FPS as the CameraX image
+ * analysis use case at the default analyzer resolution, which is 30 FPS with
+ * 640x480 on a Pixel 3 XL device.
+ */class YuvToRgbConverter(context: Context) {
+    private val rs = RenderScript.create(context)
+    private val scriptYuvToRgb =
+        ScriptIntrinsicYuvToRGB.create(rs, Element.U8_4(rs))
+
+    // Do not add getters/setters functions to these private variables
+    // because yuvToRgb() assume they won't be modified elsewhere
+    private var yuvBits: ByteBuffer? = null
+    private var bytes: ByteArray = ByteArray(0)
+    private var inputAllocation: Allocation? = null
+    private var outputAllocation: Allocation? = null
+
+    @Synchronized
+    fun yuvToRgb(image: Image, output: Bitmap) {
+        val yuvBuffer = YuvByteBuffer(image, yuvBits)
+        yuvBits = yuvBuffer.buffer
+
+        if (needCreateAllocations(image, yuvBuffer)) {
+            val yuvType = Type.Builder(rs, Element.U8(rs))
+                .setX(image.width)
+                .setY(image.height)
+                .setYuvFormat(yuvBuffer.type)
+            inputAllocation = Allocation.createTyped(
+                rs,
+                yuvType.create(),
+                Allocation.USAGE_SCRIPT
+            )
+            bytes = ByteArray(yuvBuffer.buffer.capacity())
+            val rgbaType = Type.Builder(rs, Element.RGBA_8888(rs))
+                .setX(image.width)
+                .setY(image.height)
+            outputAllocation = Allocation.createTyped(
+                rs,
+                rgbaType.create(),
+                Allocation.USAGE_SCRIPT
+            )
+        }
+
+        yuvBuffer.buffer.get(bytes)
+        inputAllocation!!.copyFrom(bytes)
+
+        // Convert NV21 or YUV_420_888 format to RGB
+        inputAllocation!!.copyFrom(bytes)
+        scriptYuvToRgb.setInput(inputAllocation)
+        scriptYuvToRgb.forEach(outputAllocation)
+        outputAllocation!!.copyTo(output)
+    }
+
+    private fun needCreateAllocations(image: Image, yuvBuffer: YuvByteBuffer): Boolean {
+        return (inputAllocation == null ||               // the very 1st call
+                inputAllocation!!.type.x != image.width ||   // image size changed
+                inputAllocation!!.type.y != image.height ||
+                inputAllocation!!.type.yuv != yuvBuffer.type || // image format changed
+                bytes.size == yuvBuffer.buffer.capacity())
+    }
+}