Display and control your Android device
Skip aspect ratio preservation for flex displays
Romain Vimontf2ee5b3d0646
diff --git a/server/src/main/java/com/genymobile/scrcpy/model/Size.java b/server/src/main/java/com/genymobile/scrcpy/model/Size.javaindex 363d2528..63648a9e 100644--- a/server/src/main/java/com/genymobile/scrcpy/model/Size.java+++ b/server/src/main/java/com/genymobile/scrcpy/model/Size.java@@ -32,6 +32,10 @@ public final class Size {}public Size constrain(VideoConstraints constraints) {+ return constrain(constraints, true);+ }++ public Size constrain(VideoConstraints constraints, boolean preserveAspectRatio) {int maxSize = constraints.getMaxSize();int alignment = constraints.getAlignment();@@ -56,19 +60,27 @@ public final class Size {maxHeight = align(maxHeight, alignment);int w, h;- if (width > maxWidth || height > maxHeight) {- if (width * maxHeight > height * maxWidth) {- w = maxWidth;- h = align(height * maxWidth / width, alignment);+ if (preserveAspectRatio) {+ if (width > maxWidth || height > maxHeight) {+ if (width * maxHeight > height * maxWidth) {+ w = maxWidth;+ h = height * maxWidth / width;+ } else {+ w = width * maxHeight / height;+ h = maxHeight;+ }} else {- w = align(width * maxHeight / height, alignment);- h = maxHeight;+ w = width;+ h = height;}} else {- w = align(width, alignment);- h = align(height, alignment);+ w = Math.min(width, maxWidth);+ h = Math.min(height, maxHeight);}+ w = align(w, alignment);+ h = align(h, alignment);+assert w <= maxWidth : "The width cannot exceed maxWidth";assert h <= maxHeight : "The height cannot exceed maxHeight";diff --git a/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.javaindex 3bbfee95..c1038c93 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java@@ -134,7 +134,7 @@ public class NewDisplayCapture extends SurfaceCapture {if (virtualDisplay == null) {if (flexDisplay) {assert displaySize != null;- displaySize = displaySize.constrain(videoConstraints);+ displaySize = displaySize.constrain(videoConstraints, false);} else {if (displaySize == null) {assert !flexDisplay;@@ -159,7 +159,7 @@ public class NewDisplayCapture extends SurfaceCapture {displayRotation = displayInfo.getRotation();displaySize = displayInfo.getSize();if (flexDisplay) {- displaySize = displaySize.constrain(videoConstraints);+ displaySize = displaySize.constrain(videoConstraints, false);} else {// Align the physical display size to avoid unnecessary mismatches with the output sizedisplaySize = displaySize.align(videoConstraints.getAlignment());@@ -326,7 +326,7 @@ public class NewDisplayCapture extends SurfaceCapture {}VideoConstraints constraints = getVideoConstraints(); // synchronized- Size newSize = new Size(width, height).constrain(constraints);+ Size newSize = new Size(width, height).constrain(constraints, false);if (Ln.isEnabled(Ln.Level.VERBOSE)) {Ln.v(getClass().getSimpleName() + ": requestResize(" + width + ", " + height + ")");Ln.v(getClass().getSimpleName() + ": constrained size = " + newSize);