Merge pull request openstf#15 from DeviceFarmer/fix-screen-size

Fix screen size of kotlin minicap
stoefln · May 31, 2021 · 391f6ad · 391f6ad
2 parents 5d0537d + 1624389
commit 391f6ad
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/experimental/app/build.gradle b/experimental/app/build.gradle
@@ -27,8 +27,8 @@ android {
         applicationId "io.devicefarmer.minicap"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "0.3"
+        versionCode 2
+        versionName "0.7"
         archivesBaseName = "minicap"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/experimental/app/src/main/java/io/devicefarmer/minicap/Main.kt b/experimental/app/src/main/java/io/devicefarmer/minicap/Main.kt
@@ -18,8 +18,7 @@ package io.devicefarmer.minicap
 import android.os.Looper
 import android.util.Size
 import io.devicefarmer.minicap.provider.SurfaceProvider
-import org.slf4j.LoggerFactory
-import java.io.PrintStream
+import kotlin.math.roundToInt
 import kotlin.system.exitProcess
 
 
@@ -58,6 +57,7 @@ class Main {
             provider = if (params.projection == null) {
                 SurfaceProvider()
             } else {
+                params.projection.forceAspectRatio()
                 SurfaceProvider(
                     Size(
                         params.projection.targetSize.width,
@@ -106,9 +106,18 @@ class Main {
 }
 
 data class Projection(
-    val realSize: Size, val targetSize: Size,
+    val realSize: Size, var targetSize: Size,
     val orientation: Int
 ) {
+    fun forceAspectRatio() {
+        val aspect = realSize.width.toFloat() / realSize.height.toFloat()
+        targetSize = if (targetSize.height > targetSize.width / aspect) {
+            Size(targetSize.width, ((targetSize.width / aspect)).roundToInt())
+        } else {
+            Size((targetSize.height * aspect).roundToInt(), targetSize.height)
+        }
+    }
+
     override fun toString(): String =
         "${realSize.width}x${realSize.height}@${targetSize.width}x${targetSize.height}/${orientation}"
 }

diff --git a/experimental/app/src/main/java/io/devicefarmer/minicap/provider/BaseProvider.kt b/experimental/app/src/main/java/io/devicefarmer/minicap/provider/BaseProvider.kt
@@ -65,8 +65,8 @@ abstract class BaseProvider(private val targetSize: Size) : SimpleServer.Listene
 
     fun init(out: DisplayOutput) {
         imageReader = ImageReader.newInstance(
-            getScreenSize().width,
-            getScreenSize().height,
+            getTargetSize().width,
+            getTargetSize().height,
             PixelFormat.RGBA_8888,
             2
         )
@@ -111,6 +111,10 @@ abstract class BaseProvider(private val targetSize: Size) : SimpleServer.Listene
                 Bitmap.Config.ARGB_8888
             ).apply {
                 copyPixelsFromBuffer(buffer)
+            }.run {
+                //the image need to be cropped
+                Bitmap.createBitmap(this, 0, 0, getTargetSize().width, getTargetSize().height)
+            }.apply {
                 compress(Bitmap.CompressFormat.JPEG, q, out)
             }
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devicefarmer/minicap-prebuilt",
-  "version": "2.6.1",
+  "version": "2.7.0",
   "description": "Prebuilt binaries of minicap.",
   "keywords": [
     "minicap"